diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-16 16:24:44 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-16 16:24:44 +1000 |
commit | 7c9e95ff8766d1b2e44f7fef0f40a172f0f009e1 (patch) | |
tree | 6249694d4d43e523dd0c044c3100a0f9d7d448f4 /include | |
parent | 22f458ffccd3edd442d505e79a0c4ec3703af9ca (diff) | |
parent | 597edb10b93886338dd41cd99ee26d4d4ab6eb0a (diff) |
Merge commit 'semaphore/semaphore'
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-alpha/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-arm/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-avr32/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-blackfin/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-cris/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-frv/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-h8300/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-ia64/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-m32r/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-m68knommu/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-mips/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-mn10300/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-parisc/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-powerpc/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-s390/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sh/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sparc/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-sparc64/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-um/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-v850/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-x86/semaphore.h | 1 | ||||
-rw-r--r-- | include/asm-xtensa/semaphore.h | 1 | ||||
-rw-r--r-- | include/linux/semaphore.h | 6 |
24 files changed, 25 insertions, 4 deletions
diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-alpha/semaphore.h +++ b/include/asm-alpha/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-arm/semaphore.h +++ b/include/asm-arm/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-avr32/semaphore.h b/include/asm-avr32/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-avr32/semaphore.h +++ b/include/asm-avr32/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-blackfin/semaphore.h b/include/asm-blackfin/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-blackfin/semaphore.h +++ b/include/asm-blackfin/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-cris/semaphore.h b/include/asm-cris/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-cris/semaphore.h +++ b/include/asm-cris/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-frv/semaphore.h b/include/asm-frv/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-frv/semaphore.h +++ b/include/asm-frv/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-h8300/semaphore.h b/include/asm-h8300/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-h8300/semaphore.h +++ b/include/asm-h8300/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-ia64/semaphore.h b/include/asm-ia64/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-ia64/semaphore.h +++ b/include/asm-ia64/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-m32r/semaphore.h b/include/asm-m32r/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-m32r/semaphore.h +++ b/include/asm-m32r/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-m68k/semaphore.h b/include/asm-m68k/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-m68k/semaphore.h +++ b/include/asm-m68k/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-m68knommu/semaphore.h b/include/asm-m68knommu/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-m68knommu/semaphore.h +++ b/include/asm-m68knommu/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-mips/semaphore.h b/include/asm-mips/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-mips/semaphore.h +++ b/include/asm-mips/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-mn10300/semaphore.h b/include/asm-mn10300/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-mn10300/semaphore.h +++ b/include/asm-mn10300/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-parisc/semaphore.h b/include/asm-parisc/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-parisc/semaphore.h +++ b/include/asm-parisc/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-powerpc/semaphore.h b/include/asm-powerpc/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-powerpc/semaphore.h +++ b/include/asm-powerpc/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-s390/semaphore.h b/include/asm-s390/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-s390/semaphore.h +++ b/include/asm-s390/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-sh/semaphore.h b/include/asm-sh/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-sh/semaphore.h +++ b/include/asm-sh/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-sparc/semaphore.h b/include/asm-sparc/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-sparc/semaphore.h +++ b/include/asm-sparc/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-sparc64/semaphore.h b/include/asm-sparc64/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-sparc64/semaphore.h +++ b/include/asm-sparc64/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-um/semaphore.h b/include/asm-um/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-um/semaphore.h +++ b/include/asm-um/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-v850/semaphore.h b/include/asm-v850/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-v850/semaphore.h +++ b/include/asm-v850/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-x86/semaphore.h b/include/asm-x86/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-x86/semaphore.h +++ b/include/asm-x86/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/asm-xtensa/semaphore.h b/include/asm-xtensa/semaphore.h index d9b2034ed1d2..4c7ea462435b 100644 --- a/include/asm-xtensa/semaphore.h +++ b/include/asm-xtensa/semaphore.h @@ -1 +1,2 @@ +#warning Use linux/semaphore.h, not asm/semaphore.h #include <linux/semaphore.h> diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h index d245e6fade84..6ea742cac203 100644 --- a/include/linux/semaphore.h +++ b/include/linux/semaphore.h @@ -26,10 +26,8 @@ struct semaphore { .wait_list = LIST_HEAD_INIT((name).wait_list), \ } -#define __DECLARE_SEMAPHORE_GENERIC(name, count) \ - struct semaphore name = __SEMAPHORE_INITIALIZER(name, count) - -#define DECLARE_MUTEX(name) __DECLARE_SEMAPHORE_GENERIC(name, 1) +#define DECLARE_MUTEX(name) \ + struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1) static inline void sema_init(struct semaphore *sem, int val) { |