Merge commit 'semaphore/semaphore'

27 files changed, 28 insertions, 5 deletions

diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c
index adbf29f0169d..c0336ff2362b 100644
--- a/drivers/input/keyboard/hil_kbd.c
+++ b/drivers/input/keyboard/hil_kbd.c
@@ -38,7 +38,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci_ids.h>
+#include <linux/semaphore.h>
 
 #define PREFIX "HIL KEYB: "
 #define HIL_GENERIC_NAME "HIL keyboard"
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 45e5d05b01de..fc378ab03380 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -43,6 +43,7 @@
 #include <linux/proc_fs.h>
 #include <linux/poll.h>
 #include <linux/rtc.h>
+#include <linux/semaphore.h>
 
 MODULE_AUTHOR("Brian S. Julin <bri@calyx.com>");
 MODULE_DESCRIPTION("HP i8042 SDC + MSM-58321 RTC Driver");
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index edfedd9a166c..f8080f8f7700 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -67,6 +67,7 @@
 #include <linux/module.h>
 #include <linux/ioport.h>
 #include <linux/time.h>
+#include <linux/semaphore.h>
 #include <linux/slab.h>
 #include <linux/hil.h>
 #include <linux/semaphore.h>
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)
 {