Introduce linux/semaphore.h, which just includes asm/semaphore.h.  Convert 
all instances of asm/semaphore.h to linux/semaphore.h.

Signed-off-by: Benjamin LaHaise <benjamin.c.lahaise@intel.com>

Index: arch/alpha/kernel/alpha_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/alpha/kernel/alpha_ksyms.c  (mode:100644 sha1:fc5ef90c4fc95863653860190f76dc92a647616a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/alpha/kernel/alpha_ksyms.c  (mode:100644 sha1:c94a256c531053114e8c9e5a3c7f3c735877599a)
@@ -31,7 +31,7 @@
 #include <asm/irq.h>
 #include <asm/machvec.h>
 #include <asm/pgalloc.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
 #include <asm/vga.h>
Index: arch/arm/common/rtctime.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm/common/rtctime.c  (mode:100644 sha1:c397e71f938d0f79fbcbf29869fbb1d40cf09306)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm/common/rtctime.c  (mode:100644 sha1:3030811b7a382c4a19eaa5d933024263afe2c4c5)
@@ -18,9 +18,9 @@
 #include <linux/miscdevice.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
+#include <linux/semaphore.h>
 
 #include <asm/rtc.h>
-#include <asm/semaphore.h>
 
 static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);
 static struct fasync_struct *rtc_async_queue;
Index: arch/arm/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm/kernel/semaphore.c  (mode:100644 sha1:ac423e3e224be9d27b5a5dba934f0bb60450a82d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm/kernel/semaphore.c  (mode:100644 sha1:5230acd5735c09139385687507f77949ba1aeecf)
@@ -15,8 +15,7 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -35,7 +34,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/arm/mach-integrator/clock.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm/mach-integrator/clock.c  (mode:100644 sha1:56200594db3c2898255c281960014cbd709f817a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm/mach-integrator/clock.c  (mode:100644 sha1:2101a6ad9609f9144fbf80d70f2d020af5e2b780)
@@ -13,8 +13,8 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/hardware/clock.h>
 #include <asm/hardware/icst525.h>
 
Index: arch/arm/mach-omap/clock.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm/mach-omap/clock.c  (mode:100644 sha1:e91186b5341a339dfdea6944446edada2e96bf36)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm/mach-omap/clock.c  (mode:100644 sha1:62fc6d1aa010965c2f3d4bae626ae121b404689b)
@@ -13,8 +13,8 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/hardware/clock.h>
 #include <asm/arch/board.h>
 #include <asm/arch/usb.h>
Index: arch/arm/mach-versatile/clock.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm/mach-versatile/clock.c  (mode:100644 sha1:48025c2b99873ba1d3b67660081ad0d40546d11c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm/mach-versatile/clock.c  (mode:100644 sha1:bb26e1fbef7f55240f5ed1de6f6c030f94a6bde0)
@@ -13,8 +13,8 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/hardware/clock.h>
 #include <asm/hardware/icst307.h>
 
Index: arch/arm/oprofile/common.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm/oprofile/common.c  (mode:100644 sha1:e57dde88289813d785b332de04be2eaebd98a6dd)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm/oprofile/common.c  (mode:100644 sha1:8c0bc3aa8a6c02b11ab3da73e55b7bcd07174a43)
@@ -10,7 +10,7 @@
 #include <linux/init.h>
 #include <linux/oprofile.h>
 #include <linux/errno.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/sysdev.h>
 
 #include "op_counter.h"
Index: arch/arm26/kernel/armksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm26/kernel/armksyms.c  (mode:100644 sha1:35514b398e2e26ce7f2e52401f39428ce3f284b4)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm26/kernel/armksyms.c  (mode:100644 sha1:c8322e168cbe7d4942c041adfff3ae801062d6a9)
@@ -23,13 +23,13 @@
 #include <linux/vt_kern.h>
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
+#include <linux/semaphore.h>
 
 #include <asm/byteorder.h>
 #include <asm/elf.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/processor.h>
-#include <asm/semaphore.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
Index: arch/arm26/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm26/kernel/semaphore.c  (mode:100644 sha1:3023a53431ff240e09d66e8d024bef0fe922301f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm26/kernel/semaphore.c  (mode:100644 sha1:40c729ddda508e22ff84db62d939ea900eeb96d5)
@@ -17,8 +17,7 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -37,7 +36,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/arm26/kernel/traps.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/arm26/kernel/traps.c  (mode:100644 sha1:f64f59022392894d473722099553afff21fd9d13)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/arm26/kernel/traps.c  (mode:100644 sha1:8b89de251f36f8a1037fa17f4afc5e939071093d)
@@ -27,6 +27,7 @@
 #include <linux/elf.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/semaphore.h>
 
 #include <asm/atomic.h>
 #include <asm/io.h>
@@ -34,7 +35,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-#include <asm/semaphore.h>
 
 #include "ptrace.h"
 
Index: arch/cris/kernel/crisksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/cris/kernel/crisksyms.c  (mode:100644 sha1:7141bbecd7e41a511f0cc7e981111956ce3ff718)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/cris/kernel/crisksyms.c  (mode:100644 sha1:c59a6cc4acd11cc0b0366862a22f8bf2068159f5)
@@ -10,8 +10,8 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/tty.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
Index: arch/cris/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/cris/kernel/semaphore.c  (mode:100644 sha1:b884263d3cd47faf75b207468f4bbe6bbf26c241)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/cris/kernel/semaphore.c  (mode:100644 sha1:cad36299c496aecf1f010ec606903b788bf2185c)
@@ -19,7 +19,7 @@
  * needs to do something only if count was negative before
  * the increment operation.
  *
- * waking_non_zero() (from asm/semaphore.h) must execute
+ * waking_non_zero() (from linux/semaphore.h) must execute
  * atomically.
  *
  * When __up() is called, the count was negative before
@@ -34,7 +34,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
Index: arch/frv/kernel/frv_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/frv/kernel/frv_ksyms.c  (mode:100644 sha1:62cfbd9b4f98d6f2f62c79743cc085557e8af5e2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/frv/kernel/frv_ksyms.c  (mode:100644 sha1:5ba65b0e0260014f16534b8ae166bfc3f3c1024a)
@@ -8,12 +8,12 @@
 #include <linux/in6.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>
+#include <linux/semaphore.h>
 
 #include <asm/setup.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/hardirq.h>
 #include <asm/current.h>
Index: arch/frv/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/frv/kernel/semaphore.c  (mode:100644 sha1:5cba9c1f2b3dcf2c01579528f878f44ce88fbc90)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/frv/kernel/semaphore.c  (mode:100644 sha1:d7b5610911a778fae2522e2fe4e11e747cbf958e)
@@ -13,7 +13,7 @@
 #include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/module.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct sem_waiter {
 	struct list_head	list;
Index: arch/h8300/kernel/h8300_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/h8300/kernel/h8300_ksyms.c  (mode:100644 sha1:5a630233112ff2e77bdb5788a61813bb415eff77)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/h8300/kernel/h8300_ksyms.c  (mode:100644 sha1:e9534b26f352c65adb099183db91450375335dd5)
@@ -8,12 +8,12 @@
 #include <linux/in6.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>
+#include <linux/semaphore.h>
 
 #include <asm/setup.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/current.h>
 #include <asm/gpio.h>
Index: arch/h8300/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/h8300/kernel/semaphore.c  (mode:100644 sha1:1ebb79baaa8c32f839f87de5c3fbc2a834f5749d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/h8300/kernel/semaphore.c  (mode:100644 sha1:da3061aa126bb4a94999c9032960406dc20e42a8)
@@ -24,7 +24,7 @@
  * needs to do something only if count was negative before
  * the increment operation.
  *
- * waking_non_zero() (from asm/semaphore.h) must execute
+ * waking_non_zero() (from linux/semaphore.h) must execute
  * atomically.
  *
  * When __up() is called, the count was negative before
@@ -39,7 +39,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
Index: arch/i386/kernel/cpu/common.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/i386/kernel/cpu/common.c  (mode:100644 sha1:6be0310e3cd3a15fc70bcf4782228cf73d7e161a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/i386/kernel/cpu/common.c  (mode:100644 sha1:0fbb3e2e7a4269899011ecc2ff17f1cb82bf888e)
@@ -4,7 +4,7 @@
 #include <linux/smp.h>
 #include <linux/module.h>
 #include <linux/percpu.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/msr.h>
Index: arch/i386/kernel/cpu/proc.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/i386/kernel/cpu/proc.c  (mode:100644 sha1:4f28eba7fb8a7ada72f1f24082c177f2a8d35dc0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/i386/kernel/cpu/proc.c  (mode:100644 sha1:6223c754c4ff41e0510cd39235625b07c3247fd5)
@@ -1,7 +1,7 @@
 #include <linux/smp.h>
 #include <linux/timex.h>
 #include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/seq_file.h>
 
 /*
Index: arch/i386/kernel/i386_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/i386/kernel/i386_ksyms.c  (mode:100644 sha1:14ec354bec926be79ed9b11a13a9b664aa3ef51a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/i386/kernel/i386_ksyms.c  (mode:100644 sha1:a81c7867e1fc42b8488fc8218c76260bdecdcc7e)
@@ -16,8 +16,8 @@
 #include <linux/tty.h>
 #include <linux/highmem.h>
 #include <linux/time.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/uaccess.h>
Index: arch/i386/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/i386/kernel/semaphore.c  (mode:100644 sha1:469f496e55c0f56787929fa1c387572097c9ddc8)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/i386/kernel/semaphore.c  (mode:100644 sha1:12f8c48463156d6d44b2d300904284263bcc5cdd)
@@ -16,7 +16,7 @@
 #include <linux/sched.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -35,7 +35,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/ia64/ia32/sys_ia32.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ia64/ia32/sys_ia32.c  (mode:100644 sha1:247a21c64aea33bb41ad5aa591323abcfb81aaaf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ia64/ia32/sys_ia32.c  (mode:100644 sha1:c884a2140f4e7f3344ee8976e5719df9cbcabcfc)
@@ -50,9 +50,9 @@
 #include <linux/compat.h>
 #include <linux/vfs.h>
 #include <linux/mman.h>
+#include <linux/semaphore.h>
 
 #include <asm/intrinsics.h>
-#include <asm/semaphore.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
Index: arch/ia64/kernel/ia64_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ia64/kernel/ia64_ksyms.c  (mode:100644 sha1:7bbf019c9867842251b5552bd934274cdd532ee3)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ia64/kernel/ia64_ksyms.c  (mode:100644 sha1:7f1f9b7509dce4e45c42ccc088d6344c2968c7b4)
@@ -31,7 +31,7 @@
 #include <asm/checksum.h>
 EXPORT_SYMBOL(ip_fast_csum);		/* hand-coded assembly */
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 EXPORT_SYMBOL(__down);
 EXPORT_SYMBOL(__down_interruptible);
 EXPORT_SYMBOL(__down_trylock);
Index: arch/ia64/kernel/salinfo.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ia64/kernel/salinfo.c  (mode:100644 sha1:d227fabecd023d741880d4fed93dcec60c012a3f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ia64/kernel/salinfo.c  (mode:100644 sha1:547619ad9a3e6000562ea59680930a6a6966c048)
@@ -31,8 +31,8 @@
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
 #include <linux/vmalloc.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/sal.h>
 #include <asm/uaccess.h>
 
Index: arch/ia64/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ia64/kernel/semaphore.c  (mode:100644 sha1:2724ef3fbae2e78e9d4954c9b7cfe6ba91c37194)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ia64/kernel/semaphore.c  (mode:100644 sha1:df9bc90ee30997aa3c562f37c8abe99c419193e5)
@@ -21,13 +21,13 @@
  * Note that these functions are only called when there is contention
  * on the lock, and as such all this is the "non-critical" part of the
  * whole semaphore business. The critical part is the inline stuff in
- * <asm/semaphore.h> where we want to avoid any extra jumps and calls.
+ * <linux/semaphore.h> where we want to avoid any extra jumps and calls.
  */
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/semaphore.h>
 
 #include <asm/errno.h>
-#include <asm/semaphore.h>
 
 /*
  * Logic:
Index: arch/ia64/sn/kernel/sn2/sn_hwperf.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ia64/sn/kernel/sn2/sn_hwperf.c  (mode:100644 sha1:197356460ee15d57d1665ea9a70618540266ed08)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ia64/sn/kernel/sn2/sn_hwperf.c  (mode:100644 sha1:6c0378a10008d402f09840937292d44ed248c769)
@@ -31,10 +31,10 @@
 #include <linux/cpumask.h>
 #include <linux/smp_lock.h>
 #include <linux/nodemask.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <asm/topology.h>
 #include <asm/smp.h>
-#include <asm/semaphore.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <asm/sal.h>
Index: arch/m32r/kernel/m32r_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m32r/kernel/m32r_ksyms.c  (mode:100644 sha1:e5ec134d81d98baa12ca8c3e6741e75d9e794a95)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m32r/kernel/m32r_ksyms.c  (mode:100644 sha1:575188d1220e1920b6884d597bf6c35d0f4049f0)
@@ -8,8 +8,8 @@
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <linux/string.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
Index: arch/m32r/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m32r/kernel/semaphore.c  (mode:100644 sha1:9a6e6d754ddcf54b3ef31937fda4dc7c69ab5b83)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m32r/kernel/semaphore.c  (mode:100644 sha1:042cb04e3b115cd38cf36ee6d8897b2c102300e7)
@@ -25,7 +25,7 @@
 #include <linux/sched.h>
 #include <linux/err.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -44,7 +44,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/m68k/atari/stram.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m68k/atari/stram.c  (mode:100644 sha1:5a3c106b40c836e2d8d15479b7f2e05cb321e3c4)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m68k/atari/stram.c  (mode:100644 sha1:1f2baf03c62324d3c36e9e7a61f3292cb0ac771b)
@@ -23,6 +23,7 @@
 #include <linux/bootmem.h>
 #include <linux/mount.h>
 #include <linux/blkdev.h>
+#include <linux/semaphore.h>
 
 #include <asm/setup.h>
 #include <asm/machdep.h>
@@ -31,7 +32,6 @@
 #include <asm/atarihw.h>
 #include <asm/atari_stram.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 
 #include <linux/swapops.h>
 
Index: arch/m68k/kernel/m68k_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m68k/kernel/m68k_ksyms.c  (mode:100644 sha1:fe837e31afbf39eeb1208a8488a066e1c90febaf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m68k/kernel/m68k_ksyms.c  (mode:100644 sha1:5878d587a7be83103109f40edb46d1e477590f33)
@@ -8,13 +8,13 @@
 #include <linux/in6.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>
+#include <linux/semaphore.h>
 
 #include <asm/setup.h>
 #include <asm/machdep.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 #include <asm/checksum.h>
 
 asmlinkage long long __ashldi3 (long long, int);
Index: arch/m68k/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m68k/kernel/semaphore.c  (mode:100644 sha1:1ebb79baaa8c32f839f87de5c3fbc2a834f5749d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m68k/kernel/semaphore.c  (mode:100644 sha1:da3061aa126bb4a94999c9032960406dc20e42a8)
@@ -24,7 +24,7 @@
  * needs to do something only if count was negative before
  * the increment operation.
  *
- * waking_non_zero() (from asm/semaphore.h) must execute
+ * waking_non_zero() (from linux/semaphore.h) must execute
  * atomically.
  *
  * When __up() is called, the count was negative before
@@ -39,7 +39,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
Index: arch/m68k/sun3/intersil.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m68k/sun3/intersil.c  (mode:100644 sha1:db359d7402a6e3ef8b2b6dc46a26c6b539f2b958)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m68k/sun3/intersil.c  (mode:100644 sha1:3ded61467439cb75e0dc267d000187a65bfa6939)
@@ -12,10 +12,10 @@
 
 #include <linux/kernel.h>
 #include <linux/rtc.h>
+#include <linux/semaphore.h>
 
 #include <asm/errno.h>
 #include <asm/system.h>
-#include <asm/semaphore.h>
 #include <asm/rtc.h>
 #include <asm/intersil.h>
 
Index: arch/m68knommu/kernel/m68k_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m68knommu/kernel/m68k_ksyms.c  (mode:100644 sha1:e93a5ad56496247bf8e35c0f4da2522f83b550c2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m68knommu/kernel/m68k_ksyms.c  (mode:100644 sha1:9ffe012146d1670d24313d0cd85ed64561124586)
@@ -8,13 +8,13 @@
 #include <linux/in6.h>
 #include <linux/interrupt.h>
 #include <linux/config.h>
+#include <linux/semaphore.h>
 
 #include <asm/setup.h>
 #include <asm/machdep.h>
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/current.h>
 
Index: arch/m68knommu/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/m68knommu/kernel/semaphore.c  (mode:100644 sha1:c083f4772add4d61a5ba41ad04cb8dcd8c5635fb)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/m68knommu/kernel/semaphore.c  (mode:100644 sha1:4a20b692f92f8726898f4f6fc525918f4699741b)
@@ -25,7 +25,7 @@
  * needs to do something only if count was negative before
  * the increment operation.
  *
- * waking_non_zero() (from asm/semaphore.h) must execute
+ * waking_non_zero() (from linux/semaphore.h) must execute
  * atomically.
  *
  * When __up() is called, the count was negative before
@@ -40,7 +40,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
Index: arch/mips/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/mips/kernel/semaphore.c  (mode:100644 sha1:9c40fe5a8e8d28809428f8fc5f5e902e8fc41d3e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/mips/kernel/semaphore.c  (mode:100644 sha1:36847aeec8ecacb78bbd12b46d5219ec5879fe8a)
@@ -18,10 +18,10 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/semaphore.h>
 #include <asm/atomic.h>
 #include <asm/cpu-features.h>
 #include <asm/errno.h>
-#include <asm/semaphore.h>
 #include <asm/war.h>
 /*
  * Atomically update sem->count.
Index: arch/mips/lasat/picvue.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/mips/lasat/picvue.h  (mode:100644 sha1:74a39039135db23c7a2a82ebca22d2c2f3e74bfb)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/mips/lasat/picvue.h  (mode:100644 sha1:1de838995e0a9c21243aacc12b4c7c328e089293)
@@ -4,7 +4,7 @@
  * Brian Murphy <brian.murphy@eicon.com> 
  *
  */
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct pvc_defs {
 	volatile u32 *reg;
Index: arch/mips/sgi-ip27/ip27-console.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/mips/sgi-ip27/ip27-console.c  (mode:100644 sha1:d97f5b5ef844dddc62b9642ba57efd4c74b23152)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/mips/sgi-ip27/ip27-console.c  (mode:100644 sha1:0f265953b79bc6c4929fa273516d5da02d184056)
@@ -12,9 +12,9 @@
 #include <linux/termios.h>
 #include <linux/sched.h>
 #include <linux/tty.h>
+#include <linux/semaphore.h>
 
 #include <asm/page.h>
-#include <asm/semaphore.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/sn0/hub.h>
 #include <asm/sn/klconfig.h>
Index: arch/parisc/kernel/parisc_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/parisc/kernel/parisc_ksyms.c  (mode:100644 sha1:f40a777dd388cc4d8b713e39299dba9c034ab7c2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/parisc/kernel/parisc_ksyms.c  (mode:100644 sha1:5ecd9d7004da2ad5f044507d52e143ab979409cf)
@@ -97,7 +97,7 @@
 EXPORT_SYMBOL(sys_read);
 EXPORT_SYMBOL(sys_write);
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 EXPORT_SYMBOL(__up);
 EXPORT_SYMBOL(__down_interruptible);
 EXPORT_SYMBOL(__down);
Index: arch/parisc/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/parisc/kernel/semaphore.c  (mode:100644 sha1:ee806bcc37261b1fe43fbbd36777aba71ba6496f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/parisc/kernel/semaphore.c  (mode:100644 sha1:896a3ae884f95de44535c2585a3783ac011e9934)
@@ -11,7 +11,7 @@
  * Semaphores are complex as we wish to avoid using two variables.
  * `count' has multiple roles, depending on its value.  If it is positive
  * or zero, there are no waiters.  The functions here will never be
- * called; see <asm/semaphore.h>
+ * called; see <linux/semaphore.h>
  *
  * When count is -1 it indicates there is at least one task waiting
  * for the semaphore.
@@ -22,7 +22,7 @@
  * Note that these functions are only called when there is contention
  * on the lock, and as such all this is the "non-critical" part of the
  * whole semaphore business. The critical part is the inline stuff in
- * <asm/semaphore.h> where we want to avoid any extra jumps and calls.
+ * <linux/semaphore.h> where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
 {
Index: arch/parisc/kernel/sys_parisc32.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/parisc/kernel/sys_parisc32.c  (mode:100644 sha1:61356901841093163f7deb95fa46c045179d0d65)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/parisc/kernel/sys_parisc32.c  (mode:100644 sha1:4612e6efc518c05811e55f3281f1bf158fdcfef3)
@@ -51,7 +51,7 @@
 
 #include <asm/types.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/mmu_context.h>
 
 #include "sys32.h"
Index: arch/ppc/kernel/ppc_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc/kernel/ppc_ksyms.c  (mode:100644 sha1:2ccb58fe4fc3caf391fc914cb496fb6a82f9d741)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc/kernel/ppc_ksyms.c  (mode:100644 sha1:74a0634892d2991067da7b3bf3b58de9989390eb)
@@ -18,7 +18,7 @@
 #include <linux/bitops.h>
 
 #include <asm/page.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
Index: arch/ppc/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc/kernel/semaphore.c  (mode:100644 sha1:2fe429b27c142728c4477bfb8e7f07a7d9b45f62)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc/kernel/semaphore.c  (mode:100644 sha1:91b9fc57e065d65c3c4e7fb31d66da4e04fbf68d)
@@ -17,7 +17,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/errno.h>
 
 /*
Index: arch/ppc/kernel/syscalls.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc/kernel/syscalls.c  (mode:100644 sha1:124313ce3c09055fe8ce73d680bc190196b08033)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc/kernel/syscalls.c  (mode:100644 sha1:cb1d7547f9a6ad3656b988e4a3b876e26fbb4fdd)
@@ -39,7 +39,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 void
 check_bugs(void)
Index: arch/ppc/syslib/ocp.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc/syslib/ocp.c  (mode:100644 sha1:a5156c5179a617ac0ef4baeb109c30170d1d401c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc/syslib/ocp.c  (mode:100644 sha1:9baad6dfc29d7a6fb81f75804b19edb67b35ec93)
@@ -50,7 +50,7 @@
 #include <asm/ocp.h>
 #include <asm/errno.h>
 #include <asm/rwsem.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 //#define DBG(x)	printk x
 #define DBG(x)
Index: arch/ppc64/kernel/rtas.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc64/kernel/rtas.c  (mode:100644 sha1:5575603def277d5ff3360b4c2c14115cb0c7b89c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc64/kernel/rtas.c  (mode:100644 sha1:c1116b436c07aa4fe4853175a43b40e0c91e41b4)
@@ -20,7 +20,7 @@
 
 #include <asm/prom.h>
 #include <asm/rtas.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/machdep.h>
 #include <asm/page.h>
 #include <asm/param.h>
Index: arch/ppc64/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc64/kernel/semaphore.c  (mode:100644 sha1:a1c1db573e9c09c7d63a131a67a2606817a130c3)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc64/kernel/semaphore.c  (mode:100644 sha1:55fdede36b32e09c01ac3e4c3a4ca94a603f3248)
@@ -21,7 +21,7 @@
 #include <linux/module.h>
 
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/errno.h>
 
 /*
Index: arch/ppc64/kernel/sys_ppc32.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc64/kernel/sys_ppc32.c  (mode:100644 sha1:7cf7a9600025bdfeb793fbb43dbb2b11c22ea743)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc64/kernel/sys_ppc32.c  (mode:100644 sha1:2e73faee411bcdb4484939d043c901955e1d1b3e)
@@ -69,7 +69,7 @@
 #include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/ppcdebug.h>
 #include <asm/time.h>
 #include <asm/mmu_context.h>
Index: arch/ppc64/kernel/syscalls.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc64/kernel/syscalls.c  (mode:100644 sha1:f2865ff8d2f93863c1d8eb4416f02a82e9a68ad2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc64/kernel/syscalls.c  (mode:100644 sha1:4e0fa3f7b3261ddfb0854d2f5fea638fd3ea82df)
@@ -40,7 +40,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/time.h>
 #include <asm/unistd.h>
 
Index: arch/ppc64/mm/imalloc.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/ppc64/mm/imalloc.c  (mode:100644 sha1:9d92b0d9cde5dd8e62e68859a41c069b2cb919dd)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/ppc64/mm/imalloc.c  (mode:100644 sha1:4276352df7a916222882ae630e5cbd0b61d5b310)
@@ -13,7 +13,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 static DECLARE_MUTEX(imlist_sem);
 struct vm_struct * imlist = NULL;
Index: arch/s390/kernel/compat_linux.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/s390/kernel/compat_linux.c  (mode:100644 sha1:614056222875f86a6210c9d4b8057894b562131f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/s390/kernel/compat_linux.c  (mode:100644 sha1:1d91b2f0e3e812ef79f8fd4e2e32925cf7c763af)
@@ -62,7 +62,7 @@
 #include <asm/types.h>
 #include <asm/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <net/scm.h>
 #include <net/sock.h>
Index: arch/s390/kernel/debug.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/s390/kernel/debug.c  (mode:100644 sha1:91f8ce5543d3b405287056b562e4d754b987476e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/s390/kernel/debug.c  (mode:100644 sha1:1f1583e307b76358dbb6f47ec7319a26ffd4aae3)
@@ -18,7 +18,7 @@
 #include <linux/ctype.h>
 #include <linux/sysctl.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/module.h>
 #include <linux/init.h>
Index: arch/s390/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/s390/kernel/semaphore.c  (mode:100644 sha1:8dfb690c159f339e0db0fe83d416f6fc82df8ebb)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/s390/kernel/semaphore.c  (mode:100644 sha1:79b362f01c2dc23e713383214d8437baab9db947)
@@ -13,7 +13,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Atomically update sem->count. Equivalent to:
Index: arch/sh/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sh/kernel/semaphore.c  (mode:100644 sha1:a3c24dcbf01ddb947adac9bbd0e23da516a29a30)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sh/kernel/semaphore.c  (mode:100644 sha1:5cedbb2d1b017fd4daf83db0f927db3ed2d8b2ab)
@@ -11,7 +11,7 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/semaphore-helper.h>
 
 spinlock_t semaphore_wake_lock;
@@ -28,7 +28,7 @@
  * needs to do something only if count was negative before
  * the increment operation.
  *
- * waking_non_zero() (from asm/semaphore.h) must execute
+ * waking_non_zero() (from linux/semaphore.h) must execute
  * atomically.
  *
  * When __up() is called, the count was negative before
@@ -43,7 +43,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
Index: arch/sh/kernel/sh_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sh/kernel/sh_ksyms.c  (mode:100644 sha1:6954fd62470ae8ace2c382c4044375151bf8c9c9)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sh/kernel/sh_ksyms.c  (mode:100644 sha1:5591f95aa82ee0b3d480b84b6beaab9a263d17f9)
@@ -11,7 +11,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
Index: arch/sh/mm/pg-dma.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sh/mm/pg-dma.c  (mode:100644 sha1:1406d2e348ca9b802014d3ad3f37cd7d86661a0d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sh/mm/pg-dma.c  (mode:100644 sha1:ab2f5f770b5706c843bceae8ebd3fa204e2e437e)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/mmu_context.h>
 #include <asm/addrspace.h>
 #include <asm/atomic.h>
Index: arch/sh64/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sh64/kernel/semaphore.c  (mode:100644 sha1:72c16533436edeada42b6ab58b3896ff7db36966)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sh64/kernel/semaphore.c  (mode:100644 sha1:17e35269b31fc1a1f3db70e0055878c668881bac)
@@ -12,7 +12,7 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/semaphore-helper.h>
 
 spinlock_t semaphore_wake_lock;
@@ -29,7 +29,7 @@
  * needs to do something only if count was negative before
  * the increment operation.
  *
- * waking_non_zero() (from asm/semaphore.h) must execute
+ * waking_non_zero() (from linux/semaphore.h) must execute
  * atomically.
  *
  * When __up() is called, the count was negative before
@@ -44,7 +44,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 void __up(struct semaphore *sem)
Index: arch/sh64/kernel/sh_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sh64/kernel/sh_ksyms.c  (mode:100644 sha1:0b5497d70bd3766ac40754fad936c53594522c4f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sh64/kernel/sh_ksyms.c  (mode:100644 sha1:b1f2f7314502e5065bb0f271670de874275f6757)
@@ -21,7 +21,7 @@
 #include <linux/smp_lock.h>
 #include <linux/tty.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
Index: arch/sparc/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sparc/kernel/semaphore.c  (mode:100644 sha1:0c37c1a7cd7e552e9a1144a4cb25c1de4b2cbe1a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sparc/kernel/semaphore.c  (mode:100644 sha1:b34be829cc0d2ef4baa8e2a3bba5bea10dcbc7a2)
@@ -6,7 +6,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -25,7 +25,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/sparc64/kernel/sys_sparc32.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/sparc64/kernel/sys_sparc32.c  (mode:100644 sha1:1d3aa588df8a5a8466113947ae3d3102c021c1e1)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/sparc64/kernel/sys_sparc32.c  (mode:100644 sha1:c575e11a7f425cdf207f118046f97c2fa21b532d)
@@ -59,7 +59,7 @@
 #include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/fpumacro.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/mmu_context.h>
 
 asmlinkage long sys32_chown16(const char __user * filename, u16 user, u16 group)
Index: arch/um/drivers/port_kern.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/um/drivers/port_kern.c  (mode:100644 sha1:b5ee07472f79bb266822383c4c57c14a21481f7b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/um/drivers/port_kern.c  (mode:100644 sha1:7d89f5da0e1b7bed1b7a54b545f77f47735cde5c)
@@ -11,7 +11,7 @@
 #include "linux/spinlock.h"
 #include "linux/errno.h"
 #include "asm/atomic.h"
-#include "asm/semaphore.h"
+#include "linux/semaphore.h"
 #include "asm/errno.h"
 #include "kern_util.h"
 #include "kern.h"
Index: arch/um/drivers/xterm_kern.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/um/drivers/xterm_kern.c  (mode:100644 sha1:7917b9d1cec8fa0fde9d4107dd5603862059ff05)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/um/drivers/xterm_kern.c  (mode:100644 sha1:5a8914f32ab197023997b3fc519045ac46a46c96)
@@ -7,7 +7,7 @@
 #include "linux/slab.h"
 #include "linux/signal.h"
 #include "linux/interrupt.h"
-#include "asm/semaphore.h"
+#include "linux/semaphore.h"
 #include "asm/irq.h"
 #include "irq_user.h"
 #include "irq_kern.h"
Index: arch/um/include/line.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/um/include/line.h  (mode:100644 sha1:6d81ecc17be5b5ea6240e56477b390507af444e6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/um/include/line.h  (mode:100644 sha1:3f4f78241395470cfb92733f2cd1fa88c10473d4)
@@ -10,7 +10,7 @@
 #include "linux/workqueue.h"
 #include "linux/tty.h"
 #include "linux/interrupt.h"
-#include "asm/semaphore.h"
+#include "linux/semaphore.h"
 #include "chan_user.h"
 #include "mconsole_kern.h"
 
Index: arch/um/kernel/trap_kern.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/um/kernel/trap_kern.c  (mode:100644 sha1:47e766e6ba102cf436193efb5cdffdcef7a47e45)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/um/kernel/trap_kern.c  (mode:100644 sha1:a103517255b59a4b701afc82f4a09ce09118c4aa)
@@ -11,7 +11,7 @@
 #include "linux/config.h"
 #include "linux/init.h"
 #include "linux/ptrace.h"
-#include "asm/semaphore.h"
+#include "linux/semaphore.h"
 #include "asm/pgtable.h"
 #include "asm/pgalloc.h"
 #include "asm/tlbflush.h"
Index: arch/um/sys-i386/ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/um/sys-i386/ksyms.c  (mode:100644 sha1:74f70a1204587bdccc988df852ba5e35b5b722d9)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/um/sys-i386/ksyms.c  (mode:100644 sha1:4f234dc2b8d3c22479cf99f5e564c49f08a65309)
@@ -2,7 +2,7 @@
 #include "linux/in6.h"
 #include "linux/rwsem.h"
 #include "asm/byteorder.h"
-#include "asm/semaphore.h"
+#include "linux/semaphore.h"
 #include "asm/uaccess.h"
 #include "asm/checksum.h"
 #include "asm/errno.h"
Index: arch/v850/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/v850/kernel/semaphore.c  (mode:100644 sha1:fc89fd661c994f249beb00b11cb02bf4fc31378c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/v850/kernel/semaphore.c  (mode:100644 sha1:496c9291f546cea885c11ad232c21350e02b20ab)
@@ -17,7 +17,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -36,7 +36,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/v850/kernel/syscalls.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/v850/kernel/syscalls.c  (mode:100644 sha1:9224cb65f6ec8e93e2ccfe084af2144e2d421c26)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/v850/kernel/syscalls.c  (mode:100644 sha1:b3578e16d786701a83e74c4073058b3da520d9e9)
@@ -33,7 +33,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
Index: arch/v850/kernel/v850_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/v850/kernel/v850_ksyms.c  (mode:100644 sha1:0ca64900dd913c40ec3682b58d921ed99767453f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/v850/kernel/v850_ksyms.c  (mode:100644 sha1:919b8e5f67ef9dce0d6cbab27cbc974529486181)
@@ -12,7 +12,7 @@
 #include <asm/pgalloc.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/checksum.h>
 #include <asm/current.h>
 
Index: arch/x86_64/ia32/sys_ia32.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/x86_64/ia32/sys_ia32.c  (mode:100644 sha1:68a9ab06ee7c21cfe59c23b0910e6a3f7e151683)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/x86_64/ia32/sys_ia32.c  (mode:100644 sha1:a3cebfd8df62cc373ca53d885d583cd42870e4e6)
@@ -64,7 +64,7 @@
 #include <asm/mman.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/atomic.h>
 #include <asm/ldt.h>
 
Index: arch/x86_64/kernel/semaphore.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/x86_64/kernel/semaphore.c  (mode:100644 sha1:48f7c18172b9990d17c6c00fac7940835a8afe0f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/x86_64/kernel/semaphore.c  (mode:100644 sha1:4dfff128c659398712d9ae7d7b16cf952dc92200)
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <asm/errno.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Semaphores are implemented using a two-way counter:
@@ -36,7 +36,7 @@
  * Note that these functions are only called when there is
  * contention on the lock, and as such all this is the
  * "non-critical" part of the whole semaphore business. The
- * critical part is the inline stuff in <asm/semaphore.h>
+ * critical part is the inline stuff in <linux/semaphore.h>
  * where we want to avoid any extra jumps and calls.
  */
 
Index: arch/x86_64/kernel/x8664_ksyms.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/arch/x86_64/kernel/x8664_ksyms.c  (mode:100644 sha1:88626e626886e60a51a23834721a31617f060d68)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/arch/x86_64/kernel/x8664_ksyms.c  (mode:100644 sha1:cbc57855ced58665caf4473d705ddcc9ccb1b321)
@@ -15,7 +15,7 @@
 #include <linux/tty.h>
 #include <linux/ioctl32.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <asm/i387.h>
 #include <asm/uaccess.h>
Index: drivers/atm/idt77252.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/atm/idt77252.c  (mode:100644 sha1:baaf1a3d2242ffa145d3a53a33877389e019a397)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/atm/idt77252.c  (mode:100644 sha1:e630ed03530bf8f5e5ea78aabeca9bd17793b38a)
@@ -46,7 +46,7 @@
 #include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/wait.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
Index: drivers/base/core.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/base/core.c  (mode:100644 sha1:a7cedd8cefe5385a8d2eb6f334c8661454c443d7)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/base/core.c  (mode:100644 sha1:4a61c492ddc51c7aeb4464e3114cd9d94cba586b)
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "base.h"
 #include "power/power.h"
Index: drivers/base/firmware_class.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/base/firmware_class.c  (mode:100644 sha1:97fe13f7f07c85d6fa2d07efd3f04afab932ec46)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/base/firmware_class.c  (mode:100644 sha1:0646773f2a58e6fa0f92fc6f0a94f7dbe9579696)
@@ -14,7 +14,7 @@
 #include <linux/vmalloc.h>
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/firmware.h>
 #include "base.h"
Index: drivers/base/power/shutdown.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/base/power/shutdown.c  (mode:100644 sha1:d1e023fbe16939051739c8424dc7515d9f965f42)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/base/power/shutdown.c  (mode:100644 sha1:668621ee0276a2680c77670c048771b3b6473756)
@@ -10,7 +10,7 @@
 
 #include <linux/config.h>
 #include <linux/device.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "power.h"
 
Index: drivers/block/cryptoloop.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/block/cryptoloop.c  (mode:100644 sha1:5be6f998d8c56e0b2f1134624f115c89783a65e3)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/block/cryptoloop.c  (mode:100644 sha1:af67d776a6a582b179b22d57b3f8f7f85f0f5b45)
@@ -26,7 +26,7 @@
 #include <linux/crypto.h>
 #include <linux/blkdev.h>
 #include <linux/loop.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 MODULE_LICENSE("GPL");
Index: drivers/block/sx8.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/block/sx8.c  (mode:100644 sha1:797f5988c2b574fb06b4b6005ae8a01afccbe78c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/block/sx8.c  (mode:100644 sha1:bd9eed077bd12f7102d1ada131bb515683e10988)
@@ -27,7 +27,7 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 MODULE_AUTHOR("Jeff Garzik");
Index: drivers/char/generic_serial.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/generic_serial.c  (mode:100644 sha1:204a7302a4a9597e13fcfda676d53f00cb7a79af)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/generic_serial.c  (mode:100644 sha1:adac5ccbc1038e9c700e016ed2e481c17d41c330)
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/tty_flip.h>
 #include <linux/delay.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #define DEBUG 
Index: drivers/char/ipmi/ipmi_devintf.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/ipmi/ipmi_devintf.c  (mode:100644 sha1:49d67f5384a2c2d9a0a5b97ad0cbd4c40c500b2b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/ipmi/ipmi_devintf.c  (mode:100644 sha1:1560de3b14ba7059a140d4fb43ae8d26275e3fd9)
@@ -42,7 +42,7 @@
 #include <linux/slab.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/ipmi.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/init.h>
 
 #define IPMI_DEVINTF_VERSION "v33"
Index: drivers/char/ipmi/ipmi_poweroff.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/ipmi/ipmi_poweroff.c  (mode:100644 sha1:cb5cdc6f14bf021a43fe9af5996f22f2e84601a2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/ipmi/ipmi_poweroff.c  (mode:100644 sha1:081183f425a2a8f47612227aede66035656de742)
@@ -31,7 +31,7 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/kdev_t.h>
 #include <linux/module.h>
 #include <linux/string.h>
Index: drivers/char/rio/rioboot.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/rioboot.c  (mode:100644 sha1:a8be11dfcba3c8bf162901a48e6ce128013908f6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/rioboot.c  (mode:100644 sha1:de06799bad3bb4d410d6081fadb7fb5d5434144a)
@@ -41,7 +41,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 
 #include <linux/termios.h>
Index: drivers/char/rio/riocmd.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/riocmd.c  (mode:100644 sha1:533085ec6f1bb3fb05aff76f35cb39d74b8d5140)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/riocmd.c  (mode:100644 sha1:e48c1bf929260c9a67ed6662f25bb55fe3957c40)
@@ -41,7 +41,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/termios.h>
 #include <linux/serial.h>
Index: drivers/char/rio/rioctrl.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/rioctrl.c  (mode:100644 sha1:b4d1a23e27e454304941f0794c9e3c5f1604b6c0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/rioctrl.c  (mode:100644 sha1:8646a76b1eb4651f18187d1525d144c82fc48a4b)
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rio/rioinit.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/rioinit.c  (mode:100644 sha1:dca941ed10cfb7e007ae7119b2d4330d086e9a16)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/rioinit.c  (mode:100644 sha1:5bfa0d2a2d85b3614f57301688b5fdacebd7fef4)
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rio/riointr.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/riointr.c  (mode:100644 sha1:e42e7b50bf6bf50184ca1e16e4588b442ea2add5)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/riointr.c  (mode:100644 sha1:954ecdf7f72f181d8e6441eb8eed687e887462b7)
@@ -41,7 +41,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rio/rioparam.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/rioparam.c  (mode:100644 sha1:f10916326ecc45510c8ba23179fa197b7e98ab54)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/rioparam.c  (mode:100644 sha1:31871cabd3fb8d380e5421cdcb38cd00d18fa38d)
@@ -41,7 +41,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rio/rioroute.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/rioroute.c  (mode:100644 sha1:106b31f48a217176f69ce4770107bd7b632da025)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/rioroute.c  (mode:100644 sha1:97c4532cd9466d2577f2effe672647dd762d0ace)
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rio/riotable.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/riotable.c  (mode:100644 sha1:8fb26ad2aa120b5527d2af6c7f579d71c0318842)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/riotable.c  (mode:100644 sha1:2c4cd54ba04990ce1112e12d7c8e410a56fe909f)
@@ -42,7 +42,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rio/riotty.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rio/riotty.c  (mode:100644 sha1:db655002671f3e0d11139563aeb9ad7adc004b28)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rio/riotty.c  (mode:100644 sha1:ba96d646f122ec41a4296d212e9053169a1e0799)
@@ -44,7 +44,7 @@
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
Index: drivers/char/rocket.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/rocket.c  (mode:100644 sha1:5bcbeb0cb9ae8988f09174821ad246d287a1d609)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/rocket.c  (mode:100644 sha1:811bcc43154c454ed699707f55a1cd2cc18d501e)
@@ -93,7 +93,7 @@
 #include <asm/atomic.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/init.h>
 
 /****** RocketPort includes ******/
Index: drivers/char/ser_a2232.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/ser_a2232.c  (mode:100644 sha1:6b4e9d155f5053bdd154f8b5434810d69d0da2d1)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/ser_a2232.c  (mode:100644 sha1:29d05b8895b025acba78686fd27564c5ff6b0e8a)
@@ -97,7 +97,7 @@
 #include <asm/amigahw.h>
 #include <linux/zorro.h>
 #include <asm/irq.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/delay.h>
 
Index: drivers/char/snsc.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/snsc.h  (mode:100644 sha1:c22c6c55e25451753e12e93ab34ec7062be9fa76)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/snsc.h  (mode:100644 sha1:c6efe1da560449d0a9f672012b5524995f35cc13)
@@ -23,7 +23,7 @@
 #include <linux/fs.h>
 #include <linux/cdev.h>
 #include <asm/sn/types.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #define CHUNKSIZE 127
 
Index: drivers/char/watchdog/sc1200wdt.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/char/watchdog/sc1200wdt.c  (mode:100644 sha1:24401e84729e7a5eec5216ca87cf26659073e7af)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/char/watchdog/sc1200wdt.c  (mode:100644 sha1:335308373f7f74749c05876a6d0cb45047b829e7)
@@ -41,7 +41,7 @@
 #include <linux/fs.h>
 #include <linux/pci.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
Index: drivers/fc4/fc.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/fc4/fc.c  (mode:100644 sha1:1fbb219aa9baa1fbc7a57927636881e127a00e02)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/fc4/fc.c  (mode:100644 sha1:c192598d71f346a82fa14edcadb22ce0f5a7f8f4)
@@ -36,7 +36,7 @@
 
 #include <asm/pgtable.h>
 #include <asm/irq.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include "fcp_impl.h"
 #include <scsi/scsi_host.h>
 
Index: drivers/i2c/busses/i2c-ali1535.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/i2c/busses/i2c-ali1535.c  (mode:100644 sha1:b00cd409822192ce6766aa68be4e5bb7637685dd)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/i2c/busses/i2c-ali1535.c  (mode:100644 sha1:aa417f3bfcac083dbb40e355361ca1db9ab9392a)
@@ -64,7 +64,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 
 /* ALI1535 SMBus address offsets */
Index: drivers/ieee1394/eth1394.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/ieee1394/eth1394.c  (mode:100644 sha1:654da76bf81146edcc0c2c4d4fb52a2dbfbf4e2b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/ieee1394/eth1394.c  (mode:100644 sha1:fdf9d38df598fa22f1e1a22ce4e10a0933ecaa3c)
@@ -64,7 +64,7 @@
 #include <linux/ethtool.h>
 #include <asm/uaccess.h>
 #include <asm/delay.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <net/arp.h>
 
 #include "csr1212.h"
Index: drivers/ieee1394/hosts.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/ieee1394/hosts.h  (mode:100644 sha1:739e76840d5106716be264d4f025c9a1b351b496)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/ieee1394/hosts.h  (mode:100644 sha1:f4be41873b757ed7e17a24c9d9a8269df21b8fe2)
@@ -7,7 +7,7 @@
 #include <linux/timer.h>
 #include <linux/skbuff.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "ieee1394_types.h"
 #include "csr.h"
Index: drivers/ieee1394/ieee1394_core.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/ieee1394/ieee1394_core.c  (mode:100644 sha1:1c5845f7e4ab3103675db0a54edb04c4a4adf6cb)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/ieee1394/ieee1394_core.c  (mode:100644 sha1:881297a284f43fba168c0a84ab0ffc1d47979500)
@@ -35,7 +35,7 @@
 #include <linux/suspend.h>
 
 #include <asm/byteorder.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "ieee1394_types.h"
 #include "ieee1394.h"
Index: drivers/ieee1394/ieee1394_core.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/ieee1394/ieee1394_core.h  (mode:100644 sha1:c4b4408e2e0506f1f21acb23402934de0af65f79)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/ieee1394/ieee1394_core.h  (mode:100644 sha1:230620e2e185ccc949c169c258408aea6f22f7cb)
@@ -5,7 +5,7 @@
 #include <linux/slab.h>
 #include <linux/devfs_fs_kernel.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include "hosts.h"
 
 
Index: drivers/ieee1394/ieee1394_types.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/ieee1394/ieee1394_types.h  (mode:100644 sha1:3165609ec1ec3019a03f19fa8e0ff7775466bc7d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/ieee1394/ieee1394_types.h  (mode:100644 sha1:bb46e8bed52cb17197e1321a0e5e18c52007fca6)
@@ -9,7 +9,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 
 
Index: drivers/infiniband/core/device.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/infiniband/core/device.c  (mode:100644 sha1:9197e92d708a1208230edcfb2750bdec9caf7214)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/infiniband/core/device.c  (mode:100644 sha1:18e6d767d19ee234b1491413a49b03df7ff175c4)
@@ -38,7 +38,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "core_priv.h"
 
Index: drivers/infiniband/core/user_mad.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/infiniband/core/user_mad.c  (mode:100644 sha1:56b9c2fa2ecccbf99399a6015a1e6f1ee3f7e650)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/infiniband/core/user_mad.c  (mode:100644 sha1:c1d7cbd31921c8eacacb94ddc100421a7e234ec0)
@@ -45,7 +45,7 @@
 #include <linux/kref.h>
 
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <ib_mad.h>
 #include <ib_user_mad.h>
Index: drivers/infiniband/hw/mthca/mthca_dev.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/infiniband/hw/mthca/mthca_dev.h  (mode:100644 sha1:e3d79e267dc9ef6e4d9a772decbb158c7ddda208)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/infiniband/hw/mthca/mthca_dev.h  (mode:100644 sha1:062899a7d4988f275421b68541b3d223269fac9e)
@@ -39,7 +39,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "mthca_provider.h"
 #include "mthca_doorbell.h"
Index: drivers/infiniband/hw/mthca/mthca_memfree.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/infiniband/hw/mthca/mthca_memfree.h  (mode:100644 sha1:fe7be2a6bc4a80c56cc8ae4a8eadb4ef290e6570)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/infiniband/hw/mthca/mthca_memfree.h  (mode:100644 sha1:731808aa00d32ccbd79db1c82941b3ebd00476ce)
@@ -38,7 +38,7 @@
 #include <linux/list.h>
 #include <linux/pci.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #define MTHCA_ICM_CHUNK_LEN \
 	((256 - sizeof (struct list_head) - 2 * sizeof (int)) /		\
Index: drivers/infiniband/ulp/ipoib/ipoib.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/infiniband/ulp/ipoib/ipoib.h  (mode:100644 sha1:04c98f54e9c4dbc4740fc724a571a0978670c834)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/infiniband/ulp/ipoib/ipoib.h  (mode:100644 sha1:dc027ee8bf5004344986f75535e8c6bae430d536)
@@ -47,7 +47,7 @@
 #include <net/neighbour.h>
 
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <ib_verbs.h>
 #include <ib_pack.h>
Index: drivers/input/joystick/iforce/iforce.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/input/joystick/iforce/iforce.h  (mode:100644 sha1:bce247bc300b0255e99ebdad7295c728e4216e9d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/input/joystick/iforce/iforce.h  (mode:100644 sha1:69725d3c20504a0aea12c8cebc72da82ddb8ca7b)
@@ -37,7 +37,7 @@
 #include <linux/serio.h>
 #include <linux/config.h>
 #include <linux/circ_buf.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* This module provides arbitrary resource management routines.
  * I use it to manage the device's memory.
Index: drivers/macintosh/adb.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/macintosh/adb.c  (mode:100644 sha1:7297c77f99cfbc15b3b8b03d3c36a39b93578328)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/macintosh/adb.c  (mode:100644 sha1:e6372d01c12514eb29f2e43b7e2fdc41390b3d35)
@@ -39,7 +39,7 @@
 #include <linux/devfs_fs_kernel.h>
 
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #ifdef CONFIG_PPC
 #include <asm/prom.h>
 #endif
Index: drivers/media/dvb/dvb-core/dmxdev.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/dvb/dvb-core/dmxdev.h  (mode:100644 sha1:395a9cd75012c148bb0142adcaeb2e9dd67b1931)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/dvb/dvb-core/dmxdev.h  (mode:100644 sha1:8f3bb4bc40a24590abe7ab06fd818f1060e8ec59)
@@ -30,7 +30,7 @@
 #include <linux/wait.h>
 #include <linux/fs.h>
 #include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/dvb/dmx.h>
 
Index: drivers/media/dvb/dvb-core/dvb_demux.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/dvb/dvb-core/dvb_demux.h  (mode:100644 sha1:c09beb3916225066263db57a198500f5b03aa997)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/dvb/dvb-core/dvb_demux.h  (mode:100644 sha1:c3dec0382b398e638987086698e0c0804e8319f7)
@@ -27,7 +27,7 @@
 #include <linux/time.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "demux.h"
 
Index: drivers/media/dvb/dvb-core/dvb_frontend.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/dvb/dvb-core/dvb_frontend.c  (mode:100644 sha1:59a9adfae1ebc909120ea148f3f5593671f7862f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/dvb/dvb-core/dvb_frontend.c  (mode:100644 sha1:527fad39ef12c597d43a8550a02cde4a75685c71)
@@ -36,7 +36,7 @@
 #include <linux/list.h>
 #include <linux/suspend.h>
 #include <asm/processor.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "dvb_frontend.h"
 #include "dvbdev.h"
Index: drivers/media/dvb/ttpci/av7110.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/dvb/ttpci/av7110.c  (mode:100644 sha1:922c205a265227fdf1f5919566174ec83e7f2f50)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/dvb/ttpci/av7110.c  (mode:100644 sha1:52ba7b6bdb2edbf9d9d4aa25be246953a56cc09d)
@@ -54,7 +54,7 @@
 #include <linux/i2c.h>
 
 #include <asm/system.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/dvb/frontend.h>
 
Index: drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c  (mode:100644 sha1:4c046ece883a8978c49033934bd1c5b3a39fd1e6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c  (mode:100644 sha1:ba7eaeed440e87d67b93e1b30d7da49fe6e9f61e)
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 #include <linux/time.h>
 #include <linux/errno.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "dvb_frontend.h"
 #include "dmxdev.h"
Index: drivers/media/dvb/ttusb-dec/ttusb_dec.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/dvb/ttusb-dec/ttusb_dec.c  (mode:100644 sha1:64e771bd890782f51fb836ec29f902d49f651597)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/dvb/ttusb-dec/ttusb_dec.c  (mode:100644 sha1:fef91446f792aaddf9d13e99540efc9e1c9d9240)
@@ -20,7 +20,7 @@
  *
  */
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
Index: drivers/media/radio/miropcm20-rds-core.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/radio/miropcm20-rds-core.c  (mode:100644 sha1:a917a90cb5dc8cd3a4154621605b7404bb95f67b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/radio/miropcm20-rds-core.c  (mode:100644 sha1:94a6b6b542667be0130ca872ce5d20a301f2c4b1)
@@ -18,7 +18,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>
 #include "../../../sound/oss/aci.h"
 #include "miropcm20-rds-core.h"
Index: drivers/media/radio/radio-aimslab.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/radio/radio-aimslab.c  (mode:100644 sha1:8b4ad70dd1b2f30e197564a90df10cef1252a3fc)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/radio/radio-aimslab.c  (mode:100644 sha1:13f9aadd8fb15451983dd26891d40c36e6897f8d)
@@ -35,7 +35,7 @@
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
 #include <linux/config.h>	/* CONFIG_RADIO_RTRACK_PORT 	*/
-#include <asm/semaphore.h>	/* Lock for the I/O 		*/
+#include <linux/semaphore.h>	/* Lock for the I/O 		*/
 
 #ifndef CONFIG_RADIO_RTRACK_PORT
 #define CONFIG_RADIO_RTRACK_PORT -1
Index: drivers/media/radio/radio-maestro.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/radio/radio-maestro.c  (mode:100644 sha1:e62147e4ed1baf2b12ca5587423d6d2113635d89)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/radio/radio-maestro.c  (mode:100644 sha1:b8ee6fb4656f23b05a025ca83dc7cc356e5c2531)
@@ -23,7 +23,7 @@
 #include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/pci.h>
 #include <linux/videodev.h>
 
Index: drivers/media/radio/radio-maxiradio.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/radio/radio-maxiradio.c  (mode:100644 sha1:5b748a48ce721f15b05d8b834739a9ca55d7d095)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/radio/radio-maxiradio.c  (mode:100644 sha1:66096d819895bc9dd2f31eafb312250bdf3e3d30)
@@ -37,7 +37,7 @@
 #include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/pci.h>
 #include <linux/videodev.h>
 
Index: drivers/media/radio/radio-sf16fmi.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/radio/radio-sf16fmi.c  (mode:100644 sha1:3a464a09221f959c7287ecd8847301c3e24dd798)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/radio/radio-sf16fmi.c  (mode:100644 sha1:075ad220e2da83740ca91d3347d47baf226fe61e)
@@ -24,7 +24,7 @@
 #include <linux/isapnp.h>
 #include <asm/io.h>		/* outb, outb_p			*/
 #include <asm/uaccess.h>	/* copy to/from user		*/
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct fmi_device
 {
Index: drivers/media/radio/radio-sf16fmr2.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/radio/radio-sf16fmr2.c  (mode:100644 sha1:0732efda6a9831da4f6862acdacf5b3befcd2dad)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/radio/radio-sf16fmr2.c  (mode:100644 sha1:ebdf5c67519b7114e5038d33a6dd1eb0cf1b3cc4)
@@ -19,7 +19,7 @@
 #include <asm/io.h>		/* outb, outb_p			*/
 #include <asm/uaccess.h>	/* copy to/from user		*/
 #include <linux/videodev.h>	/* kernel radio structs		*/
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 static struct semaphore lock;
 
Index: drivers/media/video/arv.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/arv.c  (mode:100644 sha1:87fd3a7bb392cfc9a4bb7b9fc0a01cc79c677f8c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/arv.c  (mode:100644 sha1:d677c6f1e54f33af8ab83caab9593024ce5e1c55)
@@ -33,7 +33,7 @@
 #include <linux/sched.h>
 #include <linux/videodev.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/m32r.h>
 #include <asm/io.h>
Index: drivers/media/video/bw-qcam.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/bw-qcam.c  (mode:100644 sha1:0065d0c240d1465f5d93251430a1a8aa07f0e939)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/bw-qcam.c  (mode:100644 sha1:dd73fc740ef0e7f139e860c15e7990f73983dec4)
@@ -73,7 +73,7 @@
 #include <linux/parport.h>
 #include <linux/sched.h>
 #include <linux/videodev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "bw-qcam.h"
Index: drivers/media/video/c-qcam.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/c-qcam.c  (mode:100644 sha1:75442ec49f352b0a4e9c2cbf245abc3a930b71f7)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/c-qcam.c  (mode:100644 sha1:0949c41d4b122a9d3edea6dd986d34134a6606ea)
@@ -34,7 +34,7 @@
 #include <linux/parport.h>
 #include <linux/sched.h>
 #include <linux/videodev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 struct qcam_device {
Index: drivers/media/video/cpia.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/cpia.c  (mode:100644 sha1:8c08b7f1ad233389cb4377bdf04c154f1f7ed6f2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/cpia.c  (mode:100644 sha1:3f95b688fc25cf4e06ae0ab4846b5366d4dcd03a)
@@ -39,7 +39,7 @@
 #include <linux/pagemap.h>
 #include <linux/delay.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #ifdef CONFIG_KMOD
 #include <linux/kmod.h>
Index: drivers/media/video/ir-kbd-i2c.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/ir-kbd-i2c.c  (mode:100644 sha1:92664f75d327bb3afc9a855eda7d3b3b93354f30)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/ir-kbd-i2c.c  (mode:100644 sha1:d2b36899b253fd147473ae6473cfedd950b98acb)
@@ -39,7 +39,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <media/ir-common.h>
 
Index: drivers/media/video/msp3400.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/msp3400.c  (mode:100644 sha1:c97df705df5eae1c5af45e4e7aac86f4a9224e70)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/msp3400.c  (mode:100644 sha1:07f42fee796422d1a3f3e7110c4a6e34c1bb3f6a)
@@ -50,7 +50,7 @@
 #include <linux/smp_lock.h>
 #include <linux/kthread.h>
 #include <linux/suspend.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/pgtable.h>
 
 #include <media/audiochip.h>
Index: drivers/media/video/planb.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/planb.c  (mode:100644 sha1:b19c33434eaf834e6fb24b87d8c27eb3eed05b90)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/planb.c  (mode:100644 sha1:a86ed3e776dd20a1eb23e8b0e311c9f09d2dd245)
@@ -48,7 +48,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/irq.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "planb.h"
 #include "saa7196.h"
Index: drivers/media/video/tvmixer.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/tvmixer.c  (mode:100644 sha1:eafd7061b310327c5dbfd401aceae302fe5309a6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/tvmixer.c  (mode:100644 sha1:493f2557c48bc9ab28fdcd1c6b8493cc2de9903b)
@@ -14,7 +14,7 @@
 #include <linux/sound.h>
 #include <linux/soundcard.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 
Index: drivers/media/video/videodev.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/media/video/videodev.c  (mode:100644 sha1:06df15f75de94d2fdf34268fd799737e99d7c5d1)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/media/video/videodev.c  (mode:100644 sha1:726fefa777728c75e62a416a408c71c2e2c5431a)
@@ -29,7 +29,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/videodev.h>
 
Index: drivers/mtd/mtd_blkdevs.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/mtd/mtd_blkdevs.c  (mode:100644 sha1:f8d2185819e7e2e17348b0c3fd8b0c2b41208d44)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/mtd/mtd_blkdevs.c  (mode:100644 sha1:cec4383e4654c3a5d3d16be5817106a6d204d2b6)
@@ -19,7 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/hdreg.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 #include <linux/devfs_fs_kernel.h>
 
Index: drivers/net/3c527.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/net/3c527.c  (mode:100644 sha1:6db3301e7965adfbc53281405ac6220c0204a696)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/net/3c527.c  (mode:100644 sha1:2b3760655b895548849b468fac58eeabe59579d6)
@@ -104,7 +104,7 @@
 #include <linux/completion.h>
 #include <linux/bitops.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
Index: drivers/net/hamradio/6pack.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/net/hamradio/6pack.c  (mode:100644 sha1:89454915b857dcf72b6b64be822108adc14eb377)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/net/hamradio/6pack.c  (mode:100644 sha1:e60fbecc823672d68de7ed7435dfcce8901e96ca)
@@ -34,7 +34,7 @@
 #include <linux/init.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/atomic.h>
 
 #define SIXPACK_VERSION    "Revision: 0.3.0"
Index: drivers/net/ibmveth.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/net/ibmveth.c  (mode:100644 sha1:c39b0609742a3394754b2cf70e2841305bc2a8c8)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/net/ibmveth.c  (mode:100644 sha1:280f4510e5ed0b5fc320c8718994251cbcaf9cf6)
@@ -49,7 +49,7 @@
 #include <linux/mm.h>
 #include <linux/ethtool.h>
 #include <linux/proc_fs.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/hvcall.h>
 #include <asm/atomic.h>
 #include <asm/iommu.h>
Index: drivers/net/plip.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/net/plip.c  (mode:100644 sha1:f4b62405d2e5997a2639e53424481d136e776961)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/net/plip.c  (mode:100644 sha1:3f2d6b88be28a3f33b22a4f01021c19c80ab22c3)
@@ -116,7 +116,7 @@
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/byteorder.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* Maximum number of devices to support. */
 #define PLIP_MAX  8
Index: drivers/net/ppp_synctty.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/net/ppp_synctty.c  (mode:100644 sha1:7d0150b4c629c089ae0f39e57ae4eb91eb475592)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/net/ppp_synctty.c  (mode:100644 sha1:c22a88837488413df4c3862b48f3d2e4fa264418)
@@ -44,7 +44,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #define PPP_VERSION	"2.4.2"
 
Index: drivers/oprofile/event_buffer.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/oprofile/event_buffer.h  (mode:100644 sha1:442aaad391e08ac7963693111cd5b1bbf20fce8d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/oprofile/event_buffer.h  (mode:100644 sha1:5e0315dc76afb3e3cff951c7e4f713578cd7401f)
@@ -11,7 +11,7 @@
 #define EVENT_BUFFER_H
 
 #include <linux/types.h> 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
  
 int alloc_event_buffer(void);
 
Index: drivers/oprofile/oprof.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/oprofile/oprof.c  (mode:100644 sha1:b3f1cd6a24c151943691e074d0d693bc4d4c88f3)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/oprofile/oprof.c  (mode:100644 sha1:db44380a8c30dfb0d6dba43f09089bad86453c80)
@@ -12,7 +12,7 @@
 #include <linux/init.h>
 #include <linux/oprofile.h>
 #include <linux/moduleparam.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "oprof.h"
 #include "event_buffer.h"
Index: drivers/pci/hotplug/acpiphp_glue.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/pci/hotplug/acpiphp_glue.c  (mode:100644 sha1:e7f41294f81130bf65f90b6448f1bd4121df04dc)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/pci/hotplug/acpiphp_glue.c  (mode:100644 sha1:08cd4f30b223b8a5950e9e888b4c565a03907760)
@@ -32,7 +32,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "../pci.h"
 #include "pci_hotplug.h"
Index: drivers/pci/hotplug/pciehp.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/pci/hotplug/pciehp.h  (mode:100644 sha1:f313121d51414d9a3f12bf26bea28a6bfe0b2bcc)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/pci/hotplug/pciehp.h  (mode:100644 sha1:ba2fa50fb0f671450dad43bcb6df73838c9b801d)
@@ -32,7 +32,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>		
 #include <linux/pcieport_if.h>
 #include "pci_hotplug.h"
Index: drivers/pci/hotplug/rpadlpar_core.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/pci/hotplug/rpadlpar_core.c  (mode:100644 sha1:86b384e427178e91a59911df426f60342343f808)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/pci/hotplug/rpadlpar_core.c  (mode:100644 sha1:83cbc75f53492a2d6b0c6861d39ae7b73d925823)
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/pci-bridge.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/rtas.h>
 #include "../pci.h"
 #include "rpaphp.h"
Index: drivers/pci/hotplug/shpchp.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/pci/hotplug/shpchp.h  (mode:100644 sha1:67b6a3370ceba60697bd7da6c16be669e64f69e0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/pci/hotplug/shpchp.h  (mode:100644 sha1:42a769bf90a654467843845d88094a2480639790)
@@ -32,7 +32,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>		
 #include "pci_hotplug.h"
 
Index: drivers/s390/char/sclp_cpi.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/s390/char/sclp_cpi.c  (mode:100644 sha1:5a6cef2dfa130c203830a6eb9648baa5186261af)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/s390/char/sclp_cpi.c  (mode:100644 sha1:483ead638cec7a2984828b747c565d47d0b60abd)
@@ -16,7 +16,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <asm/ebcdic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "sclp.h"
 #include "sclp_rw.h"
Index: drivers/s390/cio/ccwgroup.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/s390/cio/ccwgroup.c  (mode:100644 sha1:21a75ee28b80e0a4a4c6dea1130e5b9d25b9391a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/s390/cio/ccwgroup.c  (mode:100644 sha1:547d0404a661bf710616a889bdf451c019084895)
@@ -17,7 +17,7 @@
 #include <linux/ctype.h>
 #include <linux/dcache.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
 
Index: drivers/s390/cio/qdio.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/s390/cio/qdio.c  (mode:100644 sha1:bbe9f45d1438e3b7a0c868af5cf76765dcbbb862)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/s390/cio/qdio.c  (mode:100644 sha1:b84b0ca316670e249bf67b7ce4357a150f8bb292)
@@ -42,7 +42,7 @@
 #include <asm/ccwdev.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/timex.h>
 
 #include <asm/debug.h>
Index: drivers/s390/net/qeth_main.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/s390/net/qeth_main.c  (mode:100644 sha1:607b92542df6c3924cc5d7f8740928776661eb34)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/s390/net/qeth_main.c  (mode:100644 sha1:ba514624455adc988f98dea729359294c6b7ab13)
@@ -71,7 +71,7 @@
 #include <asm/io.h>
 #include <asm/qeth.h>
 #include <asm/timex.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "qeth.h"
Index: drivers/scsi/aacraid/aachba.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/aachba.c  (mode:100644 sha1:f3fc35386060c7a3ecce277a4942c45d9c62fec7)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/aachba.c  (mode:100644 sha1:8f4d61305e5e79d1ee0b6a51ca75925209f1e50d)
@@ -32,7 +32,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <scsi/scsi.h>
Index: drivers/scsi/aacraid/commctrl.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/commctrl.c  (mode:100644 sha1:30dd1f7120f4b53dc10de359a6ca81a9bc363598)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/commctrl.c  (mode:100644 sha1:0c6b7e978d762992ff07cf80bd5daf7720186af9)
@@ -38,7 +38,7 @@
 #include <linux/completion.h>
 #include <linux/dma-mapping.h>
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "aacraid.h"
Index: drivers/scsi/aacraid/comminit.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/comminit.c  (mode:100644 sha1:6832a55ca907bd6501945dfac15eab4cbbf2c4de)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/comminit.c  (mode:100644 sha1:905d5f6491116a5bbdf2cd50d5183319f74410a0)
@@ -39,7 +39,7 @@
 #include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/mm.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "aacraid.h"
 
Index: drivers/scsi/aacraid/commsup.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/commsup.c  (mode:100644 sha1:3f36dbaa2bb32b1452ee2267dd4d2cc7eb83f584)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/commsup.c  (mode:100644 sha1:2a332b2c64b18479403628fce4a93de64c8539b1)
@@ -38,7 +38,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "aacraid.h"
 
Index: drivers/scsi/aacraid/dpcsup.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/dpcsup.c  (mode:100644 sha1:8480b427a6d9398162c289eb164696d489203080)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/dpcsup.c  (mode:100644 sha1:f769e6ed3b4abd345a6870aed97a687be1f62bde)
@@ -38,7 +38,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "aacraid.h"
 
Index: drivers/scsi/aacraid/linit.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/linit.c  (mode:100644 sha1:c9b82687ba1aa5c59bd3bfd2d5fda40d7d3ea762)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/linit.c  (mode:100644 sha1:6fb40de3c2a60c8446bf524612b0e90006775eef)
@@ -46,7 +46,7 @@
 #include <linux/ioctl32.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
Index: drivers/scsi/aacraid/rkt.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/rkt.c  (mode:100644 sha1:1b8ed47cfe30be3a7137141ff37da7140a48f336)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/rkt.c  (mode:100644 sha1:6c50cd19d34b80859b83d5152d96658a6cde41df)
@@ -40,7 +40,7 @@
 #include <linux/completion.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <scsi/scsi_host.h>
 
Index: drivers/scsi/aacraid/rx.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/rx.c  (mode:100644 sha1:630b99e1fe83c41f2f18f2aadcd7e3c486e259d0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/rx.c  (mode:100644 sha1:e7e782eb7ac27f4ca8687f7137f713279279a0ea)
@@ -40,7 +40,7 @@
 #include <linux/completion.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <scsi/scsi_host.h>
 
Index: drivers/scsi/aacraid/sa.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aacraid/sa.c  (mode:100644 sha1:bd6c30723fbaa233d82b762f49496a624928a1bf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aacraid/sa.c  (mode:100644 sha1:469a2745cf7a819809198436e604340673d0ea08)
@@ -40,7 +40,7 @@
 #include <linux/completion.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <scsi/scsi_host.h>
 
Index: drivers/scsi/aha152x.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/aha152x.c  (mode:100644 sha1:88d119f4b97070d221a9f496625f676401d70401)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/aha152x.c  (mode:100644 sha1:c9238b8c2f1a5a06fca4e9bc4afaaa7ded67d152)
@@ -253,7 +253,7 @@
 #include <linux/isapnp.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
Index: drivers/scsi/dpt/dpti_i2o.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/dpt/dpti_i2o.h  (mode:100644 sha1:a9585f5235d92a63b184ffa54c46dfcef6d31d24)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/dpt/dpti_i2o.h  (mode:100644 sha1:f68849920b7dbba190295aa0d869362f3bebab10)
@@ -21,7 +21,7 @@
 
 #include <linux/i2o-dev.h>
 
-#include <asm/semaphore.h> /* Needed for MUTEX init macros */
+#include <linux/semaphore.h> /* Needed for MUTEX init macros */
 #include <linux/version.h>
 #include <linux/config.h>
 #include <linux/notifier.h>
Index: drivers/scsi/libata-core.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/libata-core.c  (mode:100644 sha1:0b5d3a5b7edab5ce17889a0e698805ce346b4d1a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/libata-core.c  (mode:100644 sha1:2943f55cb3304ef94cd26d51588628b793ae93eb)
@@ -44,7 +44,7 @@
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 
 #include "libata.h"
Index: drivers/scsi/megaraid/mega_common.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/megaraid/mega_common.h  (mode:100644 sha1:18969a4946b752a88ba61cd4dc0eb088c41ebac9)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/megaraid/mega_common.h  (mode:100644 sha1:25d81aa09cf3b4a1d4a596541ae0d41c900a2b8d)
@@ -27,7 +27,7 @@
 #include <linux/list.h>
 #include <linux/version.h>
 #include <linux/moduleparam.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
Index: drivers/scsi/megaraid/megaraid_ioctl.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/megaraid/megaraid_ioctl.h  (mode:100644 sha1:bdaee144a1c3f98e5e0c7d2599b32649f81c462d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/megaraid/megaraid_ioctl.h  (mode:100644 sha1:0e888f9a8773e3ce55d948c3ba853e127416008b)
@@ -18,7 +18,7 @@
 #define _MEGARAID_IOCTL_H_
 
 #include <linux/types.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "mbox_defs.h"
 
Index: drivers/scsi/qla2xxx/qla_def.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/qla2xxx/qla_def.h  (mode:100644 sha1:7d47b8d9204716ad22e7c0d2a2263e45884b3c1c)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/qla2xxx/qla_def.h  (mode:100644 sha1:a7c18582bc6988dd726c1b4eebaf8b71832d6539)
@@ -33,7 +33,7 @@
 #include <linux/mempool.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
Index: drivers/scsi/scsi_scan.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/scsi_scan.c  (mode:100644 sha1:cca772624ae701ea8278ce770c10c8617e710c5e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/scsi_scan.c  (mode:100644 sha1:e657afb4f8c917f63caaeafb45e5f1584470c295)
@@ -30,7 +30,7 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
Index: drivers/scsi/scsi_transport_spi.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/scsi/scsi_transport_spi.c  (mode:100644 sha1:303d7656f71021fa592ab0924212a03361f9a445)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/scsi/scsi_transport_spi.c  (mode:100644 sha1:d4c3de4e8a600f432775599ddce72c67c428fcde)
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/workqueue.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <scsi/scsi.h>
 #include "scsi_priv.h"
 #include <scsi/scsi_device.h>
Index: drivers/serial/mcfserial.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/serial/mcfserial.c  (mode:100644 sha1:8c40167778dea949e077954a10445736f9f6ea21)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/serial/mcfserial.c  (mode:100644 sha1:bbc80f2cc4d0973cd5628611390f0556fe1dd219)
@@ -41,7 +41,7 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/segment.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/delay.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
Index: drivers/serial/pmac_zilog.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/serial/pmac_zilog.c  (mode:100644 sha1:85abd8a045e088cf2c6414aa52cf91fa1c22dba6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/serial/pmac_zilog.c  (mode:100644 sha1:afe64856695b76b81e48f20f8d4e9f32bb89ab82)
@@ -68,7 +68,7 @@
 #include <asm/pmac_feature.h>
 #include <asm/dbdma.h>
 #include <asm/macio.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #if defined (CONFIG_SERIAL_PMACZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
 #define SUPPORT_SYSRQ
Index: drivers/usb/atm/usb_atm.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/atm/usb_atm.h  (mode:100644 sha1:cf8c532835306df41fddb0631399bc67e5caa52d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/atm/usb_atm.h  (mode:100644 sha1:39ff8a5ad04f97ce0b274e9022a4dcb55ac11a76)
@@ -26,7 +26,7 @@
 #include <linux/kref.h>
 #include <linux/atm.h>
 #include <linux/atmdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
 #define DEBUG
Index: drivers/usb/class/usb-midi.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/class/usb-midi.c  (mode:100644 sha1:5f8af35e763306ee3d2778b0a4faf8459b8af931)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/class/usb-midi.c  (mode:100644 sha1:ce2464127ba5dc54bd3fec4d1cd27cb0fb6dfd93)
@@ -37,7 +37,7 @@
 #include <linux/poll.h>
 #include <linux/sound.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "usb-midi.h"
 
Index: drivers/usb/core/hub.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/core/hub.c  (mode:100644 sha1:d2d648ee864009cc028d2ce539ffede88f9bf17f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/core/hub.c  (mode:100644 sha1:b893d1ca6809087791e84839a8fa7e588e1c5991)
@@ -27,7 +27,7 @@
 #include <linux/usb.h>
 #include <linux/usbdevice_fs.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/byteorder.h>
 
Index: drivers/usb/media/ov511.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/media/ov511.c  (mode:100644 sha1:d6051822416e0a4601828e41545125fe25f9819b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/media/ov511.c  (mode:100644 sha1:60a801c6d6c475594266d53a5d5da27d97b80405)
@@ -42,7 +42,7 @@
 #include <linux/slab.h>
 #include <linux/ctype.h>
 #include <linux/pagemap.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/processor.h>
 #include <linux/mm.h>
 #include <linux/device.h>
Index: drivers/usb/media/pwc/pwc.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/media/pwc/pwc.h  (mode:100644 sha1:53b516d29cf56980e56ee1c2180607b10b72a9af)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/media/pwc/pwc.h  (mode:100644 sha1:dcf465a1f534c8e5a2625d757842ff92e3461d63)
@@ -34,7 +34,7 @@
 #include <linux/videodev.h>
 #include <linux/wait.h>
 #include <linux/smp_lock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/errno.h>
 
 #include "pwc-uncompress.h"
Index: drivers/usb/media/sn9c102.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/media/sn9c102.h  (mode:100644 sha1:8b8a4c8743f88032142a13f6b7fe63152da6a2f8)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/media/sn9c102.h  (mode:100644 sha1:4a6cbf7184f9df124c36cc3efd1350d7037305bb)
@@ -32,7 +32,7 @@
 #include <linux/types.h>
 #include <linux/param.h>
 #include <linux/rwsem.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "sn9c102_sensor.h"
 
Index: drivers/usb/media/w9968cf.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/media/w9968cf.h  (mode:100644 sha1:8acbfe205bc760632397e9d1b32ab057129bb951)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/media/w9968cf.h  (mode:100644 sha1:9a127a3db7ae85e29a6b474a0ed42a690fd6972d)
@@ -32,7 +32,7 @@
 #include <linux/param.h>
 #include <linux/types.h>
 #include <linux/rwsem.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <media/ovcamchip.h>
 
Index: drivers/usb/net/kaweth.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/net/kaweth.c  (mode:100644 sha1:a9a7cf4a38ebd2035cbaf5f1c842f259953583aa)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/net/kaweth.c  (mode:100644 sha1:48bbcc39ba37364ca19b202da50aa005054144dd)
@@ -60,7 +60,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 
 #undef DEBUG
Index: drivers/usb/serial/io_ti.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/serial/io_ti.c  (mode:100644 sha1:ebf9967f7c86f3e76998e3fb8a3b348a0eeef2c1)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/serial/io_ti.c  (mode:100644 sha1:2b86b11e324c6437a0252a455c158022c9034be2)
@@ -38,7 +38,7 @@
 #include <linux/serial.h>
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/usb.h>
 
 #include "usb-serial.h"
Index: drivers/usb/serial/ti_usb_3410_5052.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/usb/serial/ti_usb_3410_5052.c  (mode:100644 sha1:59c88de3e7ae337459ea7cea7262639fe28d5e5e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/usb/serial/ti_usb_3410_5052.c  (mode:100644 sha1:22b816cdd3d4ba4377e02fb0689d4243010f2d34)
@@ -82,7 +82,7 @@
 #include <linux/serial.h>
 #include <linux/circ_buf.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/usb.h>
 
 #include "usb-serial.h"
Index: drivers/w1/w1.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/drivers/w1/w1.h  (mode:100644 sha1:abbddaf3f8e287eb3329eb6c6b58360980103bf1)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/drivers/w1/w1.h  (mode:100644 sha1:195d729c3cfa4a46720e8a61d8ba8eeaff620fde)
@@ -44,7 +44,7 @@
 
 #include <net/sock.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "w1_family.h"
 
Index: fs/cramfs/inode.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/cramfs/inode.c  (mode:100644 sha1:6c285efa20043cb8dbb4692d7a53f5ff9455bac0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/cramfs/inode.c  (mode:100644 sha1:6613cb23df013c4e9d0b7afde4e3a857bd826341)
@@ -22,7 +22,7 @@
 #include <linux/cramfs_fs_sb.h>
 #include <linux/buffer_head.h>
 #include <linux/vfs.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <asm/uaccess.h>
 
Index: fs/eventpoll.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/eventpoll.c  (mode:100644 sha1:05b966cd6f7696144268d5cac92e30bea3f89c34)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/eventpoll.c  (mode:100644 sha1:217dd5a7b6e90cc1e75488e4c33c475d01d10fd0)
@@ -34,12 +34,12 @@
 #include <linux/eventpoll.h>
 #include <linux/mount.h>
 #include <linux/bitops.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/mman.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 
 
 /*
Index: fs/isofs/compress.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/isofs/compress.c  (mode:100644 sha1:fb42c3f3bf0db39f314fcc89e9f060d6d8022f92)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/isofs/compress.c  (mode:100644 sha1:c7704377b9cf8a89fca5031611fcb4428eff7683)
@@ -39,7 +39,7 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "zisofs.h"
 
Index: fs/jffs/inode-v23.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/jffs/inode-v23.c  (mode:100644 sha1:bfbeb4c86e03af70713b00b55e846b7dde0fc8cf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/jffs/inode-v23.c  (mode:100644 sha1:9ce715a47cce8ade0d8f21689dd44e05c38eefe2)
@@ -42,7 +42,7 @@
 #include <linux/quotaops.h>
 #include <linux/highmem.h>
 #include <linux/vfs.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 
Index: fs/jffs/intrep.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/jffs/intrep.c  (mode:100644 sha1:8cc6893fc56cd61a44015313e3cc5a907dff1115)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/jffs/intrep.c  (mode:100644 sha1:66f245cf0709c86b9263ebc4967ebac15e4110da)
@@ -62,7 +62,7 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/pagemap.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 #include <linux/smp_lock.h>
 #include <linux/time.h>
Index: fs/jffs2/compr_zlib.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/jffs2/compr_zlib.c  (mode:100644 sha1:9f9932c22adbdd675c22b6545595d749797977c2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/jffs2/compr_zlib.c  (mode:100644 sha1:471bdfa9a98feb0282eea69fe5dd272fdd2e2a20)
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 #include <linux/zlib.h>
 #include <linux/zutil.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include "nodelist.h"
 #include "compr.h"
 
Index: fs/locks.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/locks.c  (mode:100644 sha1:1792ce547af7b0b6517bd2779600f4dfe03514a5)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/locks.c  (mode:100644 sha1:1b050cce025cb6fdbe8331767fcc56826cb98245)
@@ -124,8 +124,8 @@
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/time.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #define IS_POSIX(fl)	(fl->fl_flags & FL_POSIX)
Index: fs/ntfs/inode.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/ntfs/inode.h  (mode:100644 sha1:99580455f2ed0f2474ff70fd90c1615831917480)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/ntfs/inode.h  (mode:100644 sha1:094de3650e517ad72e714c982200f08b56a9a427)
@@ -29,7 +29,7 @@
 #include <linux/seq_file.h>
 #include <linux/list.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "layout.h"
 #include "volume.h"
Index: fs/partitions/devfs.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/partitions/devfs.c  (mode:100644 sha1:87f50444fd3932bcfe93550e51ac3f8ba265d52a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/partitions/devfs.c  (mode:100644 sha1:879d5fa345c1f6028538f6421328d50a32afc4d2)
@@ -6,7 +6,7 @@
 #include <linux/vmalloc.h>
 #include <linux/genhd.h>
 #include <linux/bitops.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 
 struct unique_numspace {
Index: fs/reiserfs/journal.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/reiserfs/journal.c  (mode:100644 sha1:c9ad3a7849f413838cbd2465be4fdcf291411e5e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/reiserfs/journal.c  (mode:100644 sha1:f0bb2f00d5d5d653c8f05d8340e786e404fb8d35)
@@ -39,7 +39,7 @@
 #include <asm/system.h>
 
 #include <linux/time.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/vmalloc.h>
 #include <linux/reiserfs_fs.h>
Index: fs/reiserfs/xattr.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/reiserfs/xattr.c  (mode:100644 sha1:45582fe8b466b5ef9f01f066cb2d1f73b2d26508)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/reiserfs/xattr.c  (mode:100644 sha1:dae6f4daddaec29f3daefd7f66a902c4cd88bc5f)
@@ -44,7 +44,7 @@
 #include <asm/checksum.h>
 #include <linux/smp_lock.h>
 #include <linux/stat.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #define FL_READONLY 128
 #define FL_DIR_SEM_HELD 256
Index: fs/sysfs/file.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/sysfs/file.c  (mode:100644 sha1:da25aeb0e062093c242778d38b95bafe2a168c81)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/sysfs/file.c  (mode:100644 sha1:c129c88295062431a348a61d18b04332eabd7b4c)
@@ -6,7 +6,7 @@
 #include <linux/dnotify.h>
 #include <linux/kobject.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "sysfs.h"
 
Index: fs/xfs/linux-2.6/mutex.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/xfs/linux-2.6/mutex.h  (mode:100644 sha1:0b296bb944cbeeed390c4df27d718b393c9eb5a6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/xfs/linux-2.6/mutex.h  (mode:100644 sha1:eacb71d16e983b5c701369a88ea0c5c5fc613c24)
@@ -33,7 +33,7 @@
 #define __XFS_SUPPORT_MUTEX_H__
 
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * Map the mutex'es from IRIX to Linux semaphores.
Index: fs/xfs/linux-2.6/sema.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/fs/xfs/linux-2.6/sema.h  (mode:100644 sha1:30b67b4e1cbfb4cba1846babe8640148943e0c14)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/fs/xfs/linux-2.6/sema.h  (mode:100644 sha1:a7ee6e75a34596b63c6b3844a20c46ada830575c)
@@ -35,7 +35,7 @@
 #include <linux/time.h>
 #include <linux/wait.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * sema_t structure just maps to struct semaphore in Linux kernel.
Index: include/asm-i386/mmu.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/asm-i386/mmu.h  (mode:100644 sha1:f431a0b86d4c46669e49b0fe4811a64017a27385)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/asm-i386/mmu.h  (mode:100644 sha1:a1b41f89bd863b847a95c3fbbb653a74d366e980)
@@ -1,7 +1,7 @@
 #ifndef __i386_MMU_H
 #define __i386_MMU_H
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 /*
  * The i386 doesn't have a mmu context, but
  * we put the segment information here.
Index: include/asm-ia64/sn/nodepda.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/asm-ia64/sn/nodepda.h  (mode:100644 sha1:2fbde33656e64a9679f1e37d269f14c84ed46f69)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/asm-ia64/sn/nodepda.h  (mode:100644 sha1:5dd6f73435fa6b205d116bd90b88bd9273c4036e)
@@ -9,7 +9,7 @@
 #define _ASM_IA64_SN_NODEPDA_H
 
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/irq.h>
 #include <asm/sn/arch.h>
 #include <asm/sn/intr.h>
Index: include/asm-ppc/ocp.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/asm-ppc/ocp.h  (mode:100644 sha1:b98db3cdae83c3505c51fa386ed526a3f8e3b1de)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/asm-ppc/ocp.h  (mode:100644 sha1:0294d9e089d5f6dac9e250db9900645218e0e6df)
@@ -33,7 +33,7 @@
 #include <asm/mmu.h>
 #include <asm/ocp_ids.h>
 #include <asm/rwsem.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #ifdef CONFIG_PPC_OCP
 
Index: include/asm-sh/dma.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/asm-sh/dma.h  (mode:100644 sha1:8e9436093ca826adb2bf7db5df254d8413c0f7cc)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/asm-sh/dma.h  (mode:100644 sha1:3ca1879f4de52751520ba19691cac51ee5804f5d)
@@ -15,8 +15,8 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/sysdev.h>
+#include <linux/semaphore.h>
 #include <asm/cpu/dma.h>
-#include <asm/semaphore.h>
 
 /* The maximum address that we can perform a DMA transfer to on this platform */
 /* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any
Index: include/asm-x86_64/mmu.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/asm-x86_64/mmu.h  (mode:100644 sha1:5dc6ed79859a5ca8397e9f6130c4f5d2b205eb87)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/asm-x86_64/mmu.h  (mode:100644 sha1:09a9ae51689ef43a0efb0d7c059eb530b29edb32)
@@ -2,7 +2,7 @@
 #define __x86_64_MMU_H
 
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * The x86_64 doesn't have a mmu context, but
Index: include/linux/cpu.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/cpu.h  (mode:100644 sha1:fe0298e5dae1563b165f60aac60164cf13766121)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/cpu.h  (mode:100644 sha1:32c37c0842c3e91ad7b34ec370e9455568d73c9d)
@@ -23,7 +23,7 @@
 #include <linux/node.h>
 #include <linux/compiler.h>
 #include <linux/cpumask.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct cpu {
 	int node_id;		/* The node which contains the CPU */
Index: include/linux/devfs_fs_kernel.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/devfs_fs_kernel.h  (mode:100644 sha1:89810e73d2569a066b5680dd015c10a98626c030)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/devfs_fs_kernel.h  (mode:100644 sha1:823ea5aee3dbfa27ba4f86686bd553f31a16d32a)
@@ -6,8 +6,6 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 
-#include <asm/semaphore.h>
-
 #define DEVFS_SUPER_MAGIC                0x1373
 
 #ifdef CONFIG_DEVFS_FS
Index: include/linux/device.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/device.h  (mode:100644 sha1:cf470459fa691985be0b4c79fb86a7c2945f534a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/device.h  (mode:100644 sha1:11896fba2f62b6115413ac4e97a8164db6204a4f)
@@ -18,7 +18,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pm.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/atomic.h>
 
 #define DEVICE_NAME_SIZE	50
Index: include/linux/fs.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/fs.h  (mode:100644 sha1:5df687d940fa1141760bf52b5557008930ce7f1b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/fs.h  (mode:100644 sha1:77378d5a088b7271e0439e2f22809105bf4e0025)
@@ -213,9 +213,9 @@
 #include <linux/radix-tree.h>
 #include <linux/prio_tree.h>
 #include <linux/init.h>
+#include <linux/semaphore.h>
 
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <asm/byteorder.h>
 
 struct iovec;
Index: include/linux/i2c.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/i2c.h  (mode:100644 sha1:ebcd745f4cd6f730702b5f00821d5d6448ce12e6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/i2c.h  (mode:100644 sha1:ae3f25c754d8fe5305fdbfa0e485407b8c526c76)
@@ -32,7 +32,7 @@
 #include <linux/types.h>
 #include <linux/i2c-id.h>
 #include <linux/device.h>	/* for struct device */
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* --- General options ------------------------------------------------	*/
 
Index: include/linux/i2o.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/i2o.h  (mode:100644 sha1:ea9a3ad4b67fc2296eeba96bddca8294032ac8bf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/i2o.h  (mode:100644 sha1:8adb4bc7053f7812c108be159e6dcf9342d5eede)
@@ -26,7 +26,7 @@
 #define I2O_MAX_DRIVERS		8
 
 #include <asm/io.h>
-#include <asm/semaphore.h>	/* Needed for MUTEX init macros */
+#include <linux/semaphore.h>	/* Needed for MUTEX init macros */
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 
Index: include/linux/ide.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/ide.h  (mode:100644 sha1:9cfc0999becba75c452cda6fe3deeb03ac4b502b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/ide.h  (mode:100644 sha1:1bb2a10a479b8635a164115b23b52ffbc8fd81a6)
@@ -18,10 +18,10 @@
 #include <linux/bio.h>
 #include <linux/device.h>
 #include <linux/pci.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 
 /*
  * This is the multiple IDE interface driver, as evolved from hd.c.
Index: include/linux/if_pppox.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/if_pppox.h  (mode:100644 sha1:e677f73f13dd7f5a6db8455152c7f90faabf8f50)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/if_pppox.h  (mode:100644 sha1:77c78c2e49bf9dc7f9f10688691fab3c91fcb133)
@@ -24,7 +24,7 @@
 #include <linux/if_ether.h>
 #include <linux/if.h>
 #include <linux/netdevice.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/ppp_channel.h>
 #endif /* __KERNEL__ */
 
Index: include/linux/jbd.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/jbd.h  (mode:100644 sha1:593407e865b1b0ce543f3bee6059b71452b32ede)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/jbd.h  (mode:100644 sha1:8c8d4a39411a7658f839043b35924a5dcf5ea6e8)
@@ -28,7 +28,7 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #endif
 
 #define journal_oom_retry 1
Index: include/linux/jffs2_fs_i.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/jffs2_fs_i.h  (mode:100644 sha1:6dbb1cce66460504deeb0bd15245eadfe3ed64ec)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/jffs2_fs_i.h  (mode:100644 sha1:ffe6e363d9fdb35377dae7359e4890aba464bb18)
@@ -5,7 +5,7 @@
 
 #include <linux/version.h>
 #include <linux/rbtree.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct jffs2_inode_info {
 	/* We need an internal semaphore similar to inode->i_sem.
Index: include/linux/jffs2_fs_sb.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/jffs2_fs_sb.h  (mode:100644 sha1:4afc8d8c2e9e11d0e57ea176989ce30783c9ed78)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/jffs2_fs_sb.h  (mode:100644 sha1:c2a919c2affb9e7033694c288853a27d2babcbeb)
@@ -7,7 +7,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/completion.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/list.h>
Index: include/linux/lp.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/lp.h  (mode:100644 sha1:7059b6b9878a196d0619ab8f200285767752a897)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/lp.h  (mode:100644 sha1:12997ef8cf5339730b0a26e43b09d5fd8c022a00)
@@ -99,7 +99,7 @@
 #ifdef __KERNEL__
 
 #include <linux/wait.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* Magic numbers for defining port-device mappings */
 #define LP_PARPORT_UNSPEC -4
Index: include/linux/mtd/blktrans.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/mtd/blktrans.h  (mode:100644 sha1:4ebc2e5a16e28463a5894345affa226b659c5b96)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/mtd/blktrans.h  (mode:100644 sha1:58f7d44249917e6f945acf13ed2cbafab08861c2)
@@ -10,7 +10,7 @@
 #ifndef __MTD_TRANS_H__
 #define __MTD_TRANS_H__
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct hd_geometry;
 struct mtd_info;
Index: include/linux/mtd/doc2000.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/mtd/doc2000.h  (mode:100644 sha1:953e64fb8ac5d7193cb680a289428c1d67ab12bf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/mtd/doc2000.h  (mode:100644 sha1:fb514a8688772f50124d278fbb29a7a6612dea22)
@@ -15,7 +15,7 @@
 #define __MTD_DOC2000_H__
 
 #include <linux/mtd/mtd.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #define DoC_Sig1 0
 #define DoC_Sig2 1
Index: include/linux/parport.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/parport.h  (mode:100644 sha1:d2a4d9e1e6d13386aa342abceb725ab7343e7bb0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/parport.h  (mode:100644 sha1:3841ed8f71ce6c79dd47297b2c64b1963e96f703)
@@ -101,9 +101,9 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/semaphore.h>
 #include <asm/system.h>
 #include <asm/ptrace.h>
-#include <asm/semaphore.h>
 
 /* Define this later. */
 struct parport;
Index: include/linux/raid/md.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/raid/md.h  (mode:100644 sha1:a6a67d102bfa67e1a49c4d875889f40bf2a167bf)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/raid/md.h  (mode:100644 sha1:dde5d71f4d742dafcd700ab6c3d486977bc9645d)
@@ -19,7 +19,7 @@
 #define _MD_H
 
 #include <linux/blkdev.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/major.h>
 #include <linux/ioctl.h>
 #include <linux/types.h>
Index: include/linux/sched.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/sched.h  (mode:100644 sha1:1cced971232c6fae4cbfd5148d491a7e75caf01f)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/sched.h  (mode:100644 sha1:2897ba7ae3a4569f9272514542125cdc02607d1e)
@@ -15,9 +15,9 @@
 #include <linux/cpumask.h>
 #include <linux/errno.h>
 #include <linux/nodemask.h>
+#include <linux/semaphore.h>
 
 #include <asm/system.h>
-#include <asm/semaphore.h>
 #include <asm/page.h>
 #include <asm/ptrace.h>
 #include <asm/mmu.h>
Index: include/linux/seq_file.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/seq_file.h  (mode:100644 sha1:850a974ee505e614060bd48d2cd9ee1958405a55)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/seq_file.h  (mode:100644 sha1:cfd7ee40eb9933b4414b5fa23487a03954e734aa)
@@ -4,7 +4,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct seq_operations;
 struct file;
Index: include/linux/syscalls.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/syscalls.h  (mode:100644 sha1:757cd9be7743c481607bdd5ff8fbee001b02da4d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/syscalls.h  (mode:100644 sha1:68277bef6882de53a500e972c195927f6775dcb8)
@@ -57,7 +57,7 @@
 #include <linux/capability.h>
 #include <linux/list.h>
 #include <linux/sem.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/siginfo.h>
 #include <asm/signal.h>
 #include <linux/quota.h>
Index: include/linux/udf_fs_sb.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/linux/udf_fs_sb.h  (mode:100644 sha1:1966a6dbb4b6f70301470e381d845d7efe4b824e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/linux/udf_fs_sb.h  (mode:100644 sha1:86a6b20191fa4d428359a4a134fea2670cb02c09)
@@ -18,7 +18,7 @@
 #ifndef _UDF_FS_SB_H
 #define _UDF_FS_SB_H 1
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #pragma pack(1)
 
Index: include/sound/core.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/sound/core.h  (mode:100644 sha1:9117c23e3a01b9b885eb97f18c06efd79f677347)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/sound/core.h  (mode:100644 sha1:ce5a5ed29b05f1da6490b13857ccaddd976529ed)
@@ -23,7 +23,7 @@
  */
 
 #include <linux/sched.h>		/* wake_up() */
-#include <asm/semaphore.h>		/* struct semaphore */
+#include <linux/semaphore.h>		/* struct semaphore */
 #include <linux/rwsem.h>		/* struct rw_semaphore */
 #include <linux/workqueue.h>		/* struct workqueue_struct */
 #include <linux/pm.h>			/* pm_message_t */
Index: include/sound/rawmidi.h
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/include/sound/rawmidi.h  (mode:100644 sha1:3f9db510dee33391888d4da37dc506045c5221be)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/include/sound/rawmidi.h  (mode:100644 sha1:64290016a23866e731166b4c90b9a107b9fb0025)
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
 #include "seq_device.h"
Index: ipc/compat.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/ipc/compat.c  (mode:100644 sha1:70e4e4e10fd184002fad4dab2a3c5056f6f08036)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/ipc/compat.c  (mode:100644 sha1:d2d9afa9ff6359a745ffcacf470cec75c64e9c0c)
@@ -29,8 +29,8 @@
 #include <linux/shm.h>
 #include <linux/slab.h>
 #include <linux/syscalls.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include "util.h"
Index: kernel/cpu.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/cpu.c  (mode:100644 sha1:628f4ccda12790da9663a4bde4ac897607a8ebd2)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/cpu.c  (mode:100644 sha1:ab4e8fa89e1d7700e563440327b64a058066eb6b)
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/kthread.h>
 #include <linux/stop_machine.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* This protects CPUs going up and down... */
 DECLARE_MUTEX(cpucontrol);
Index: kernel/cpuset.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/cpuset.c  (mode:100644 sha1:961d74044deb0b08f8ce237e4f86c700da5e768a)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/cpuset.c  (mode:100644 sha1:3f6457456c42d411caf7c17396376ff7d0b95040)
@@ -48,10 +48,10 @@
 #include <linux/time.h>
 #include <linux/backing-dev.h>
 #include <linux/sort.h>
+#include <linux/semaphore.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 
 #define CPUSET_SUPER_MAGIC 		0x27e0eb
 
Index: kernel/kthread.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/kthread.c  (mode:100644 sha1:e377e2244103b28e383e7fc4c4bee120427c1e68)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/kthread.c  (mode:100644 sha1:affe9166161e0ae729f6ad57940dfe1b7ee8d3cf)
@@ -12,7 +12,7 @@
 #include <linux/unistd.h>
 #include <linux/file.h>
 #include <linux/module.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /*
  * We dont want to execute off keventd since it might
Index: kernel/module.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/module.c  (mode:100644 sha1:2dbfa0773faf331286f71d523aff771de6c2ea87)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/module.c  (mode:100644 sha1:da6c7759febd17cea3d3e3156783079f67ef2301)
@@ -35,8 +35,8 @@
 #include <linux/notifier.h>
 #include <linux/stop_machine.h>
 #include <linux/device.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
 #include <asm/cacheflush.h>
 
 #if 0
Index: kernel/posix-timers.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/posix-timers.c  (mode:100644 sha1:fd316c2722604a866b359548db9659aa5c1eefbc)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/posix-timers.c  (mode:100644 sha1:9a7a4cf561544f03be8e89016ccf0da5f2a4133a)
@@ -37,7 +37,7 @@
 #include <linux/time.h>
 
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/compiler.h>
Index: kernel/profile.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/profile.c  (mode:100644 sha1:a38fa70075fe410941fc48dbdf6dcee5768fbf7b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/profile.c  (mode:100644 sha1:f09c986f5b374f31fa7818be3aab3819014ff167)
@@ -23,8 +23,8 @@
 #include <linux/cpu.h>
 #include <linux/profile.h>
 #include <linux/highmem.h>
+#include <linux/semaphore.h>
 #include <asm/sections.h>
-#include <asm/semaphore.h>
 
 struct profile_hit {
 	u32 pc, hits;
Index: kernel/stop_machine.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/kernel/stop_machine.c  (mode:100644 sha1:c39ed70af1740e79f0d0032b711d40516013c650)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/kernel/stop_machine.c  (mode:100644 sha1:855116e4b7d49e1ed6526054853ca9fd61ba0e3b)
@@ -4,8 +4,8 @@
 #include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/syscalls.h>
+#include <linux/semaphore.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 /* Since we effect priority and affinity (both of which are visible
Index: lib/reed_solomon/reed_solomon.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/lib/reed_solomon/reed_solomon.c  (mode:100644 sha1:6604e3b1940c191cde247723e5bb436450f549ce)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/lib/reed_solomon/reed_solomon.c  (mode:100644 sha1:2b886579ef8bf8a848ffd5e83bc11a16756b0986)
@@ -44,7 +44,7 @@
 #include <linux/module.h>
 #include <linux/rslib.h>
 #include <linux/slab.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* This list holds all currently allocated rs control structures */
 static LIST_HEAD (rslist);
Index: net/core/flow.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/net/core/flow.c  (mode:100644 sha1:f289570b15a3b3e3ba442d14ca6e133a8dff575e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/net/core/flow.c  (mode:100644 sha1:8c4b42cc7094aa72626c0c9f2b8a910ccc29ba24)
@@ -22,7 +22,7 @@
 #include <linux/cpumask.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct flow_cache_entry {
 	struct flow_cache_entry	*next;
Index: net/ipv4/ipcomp.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/net/ipv4/ipcomp.c  (mode:100644 sha1:1a23c5263b993a9004aea0518216de263178f63b)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/net/ipv4/ipcomp.c  (mode:100644 sha1:b224521f6e7afbd4ddb999d440b85c7cba5e1e7a)
@@ -16,7 +16,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <asm/scatterlist.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/crypto.h>
 #include <linux/pfkeyv2.h>
 #include <linux/percpu.h>
Index: net/ipv4/netfilter/arp_tables.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/net/ipv4/netfilter/arp_tables.c  (mode:100644 sha1:df79f5ed6a0a3e73e5e2b8361ff36ffe54044aaa)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/net/ipv4/netfilter/arp_tables.c  (mode:100644 sha1:66853d7a545f1fed0012ec82df2b80cb1d645a06)
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include <linux/netfilter_arp/arp_tables.h>
 
Index: net/ipv4/netfilter/ip_tables.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/net/ipv4/netfilter/ip_tables.c  (mode:100644 sha1:8a54f92b8496a4218a243c35ab2b55ec659e7d18)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/net/ipv4/netfilter/ip_tables.c  (mode:100644 sha1:c4b62f16f37124cbdaded3d27ce5a0f34a1b3898)
@@ -24,7 +24,7 @@
 #include <linux/icmp.h>
 #include <net/ip.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/proc_fs.h>
 #include <linux/err.h>
 
Index: net/ipv6/ipcomp6.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/net/ipv6/ipcomp6.c  (mode:100644 sha1:6cde5310cd76b195264b6829725288d91c6d995d)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/net/ipv6/ipcomp6.c  (mode:100644 sha1:7a1b06b28fcf4ca78663db9d811ea836d8c697d2)
@@ -36,7 +36,7 @@
 #include <net/xfrm.h>
 #include <net/ipcomp.h>
 #include <asm/scatterlist.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/crypto.h>
 #include <linux/pfkeyv2.h>
 #include <linux/random.h>
Index: net/ipv6/netfilter/ip6_tables.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/net/ipv6/netfilter/ip6_tables.c  (mode:100644 sha1:c735276fdd5fbcd6c31f040d470bb79cd5998032)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/net/ipv6/netfilter/ip6_tables.c  (mode:100644 sha1:2f51583997cd930ef73c2bcc9e517e67485f020c)
@@ -26,7 +26,7 @@
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/proc_fs.h>
 
 #include <linux/netfilter_ipv6/ip6_tables.h>
Index: security/selinux/hooks.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/security/selinux/hooks.c  (mode:100644 sha1:0d378141c95acea1d3471aafc1c9ceda135da8de)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/security/selinux/hooks.c  (mode:100644 sha1:6228111bfd39acee3e17cd0a3e7bcedb9b225824)
@@ -50,7 +50,7 @@
 #include <net/ip.h>		/* for sysctl_local_port_range[] */
 #include <net/tcp.h>		/* struct or_callable used in sock_rcv_skb */
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/ioctls.h>
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
Index: security/selinux/selinuxfs.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/security/selinux/selinuxfs.c  (mode:100644 sha1:07221568b5059dac724b8a2c19cae9ccee6982d8)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/security/selinux/selinuxfs.c  (mode:100644 sha1:fd236f2fe5efb0307c7b2cc6e42afc5674548606)
@@ -22,7 +22,7 @@
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 /* selinuxfs pseudo filesystem for exporting the security policy API.
    Based on the proc code and the fs/nfsd/nfsctl.c code. */
Index: security/selinux/ss/conditional.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/security/selinux/ss/conditional.c  (mode:100644 sha1:b53441184aca727a5a2ba15c14969004cc6c9a15)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/security/selinux/ss/conditional.c  (mode:100644 sha1:899ab14f65f92d702c287faa4d4e479e482f2110)
@@ -11,7 +11,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/spinlock.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/slab.h>
 
 #include "security.h"
Index: security/selinux/ss/services.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/security/selinux/ss/services.c  (mode:100644 sha1:5a820cf88c9c985be9108eaf01936f32bd7bf8ce)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/security/selinux/ss/services.c  (mode:100644 sha1:b77a6517a3154d012edd087c58905c608852afd1)
@@ -27,7 +27,7 @@
 #include <linux/in.h>
 #include <linux/sched.h>
 #include <linux/audit.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include "flask.h"
 #include "avc.h"
 #include "avc_ss.h"
Index: sound/arm/sa11xx-uda1341.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/arm/sa11xx-uda1341.c  (mode:100644 sha1:174bc032d1ad5e988875fe95e9f1a71ad96f97ee)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/arm/sa11xx-uda1341.c  (mode:100644 sha1:59e72323c74cc6f2b8317c57efe49a9fe7085aa0)
@@ -79,7 +79,7 @@
 #include <asm/dma.h>
 
 #ifdef CONFIG_H3600_HAL
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/arch/h3600_hal.h>
 #endif
Index: sound/core/memalloc.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/core/memalloc.c  (mode:100644 sha1:344a83fd7c2e6b884cc318cad9518dfa733def8e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/core/memalloc.c  (mode:100644 sha1:068f633e826790df3ba9e07eb323cefd6ae4e705)
@@ -30,7 +30,7 @@
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <sound/memalloc.h>
 #ifdef CONFIG_SBUS
 #include <asm/sbus.h>
Index: sound/core/seq/seq_midi.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/core/seq/seq_midi.c  (mode:100644 sha1:18247db45db65d501040eacb4dcf74c2a6b76e6e)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/core/seq/seq_midi.c  (mode:100644 sha1:217714854590a6c2ab80cf5b12d0a5fb56ed4c44)
@@ -32,7 +32,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/moduleparam.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
 #include <sound/seq_kernel.h>
Index: sound/oss/aci.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/oss/aci.c  (mode:100644 sha1:3928c2802cc43bd974d3865631e533cc607636cc)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/oss/aci.c  (mode:100644 sha1:f997eb73c61d3eaca746640744cb9840746122b0)
@@ -56,7 +56,7 @@
 #include <linux/module.h> 
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include "sound_config.h"
Index: sound/oss/dmasound/dmasound_awacs.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/oss/dmasound/dmasound_awacs.c  (mode:100644 sha1:5281b88987f35bc30f56c0bbe3b5633f24ec2116)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/oss/dmasound/dmasound_awacs.c  (mode:100644 sha1:203f62bb7a3aa3b0e27e5a36c30dc3fb90f33ec9)
@@ -80,7 +80,7 @@
 #include <linux/kmod.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #ifdef CONFIG_ADB_CUDA
 #include <linux/cuda.h>
 #endif
Index: sound/oss/via82cxxx_audio.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/oss/via82cxxx_audio.c  (mode:100644 sha1:b387e1e524859ce38a8c1dddf2a247d3a6381ed0)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/oss/via82cxxx_audio.c  (mode:100644 sha1:46debe6238c57fdb59c8584d8a39ff11f91b8cc3)
@@ -35,9 +35,9 @@
 #include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
+#include <linux/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
 #include "sound_config.h"
 #include "dev_table.h"
 #include "mpu401.h"
Index: sound/oss/vwsnd.c
===================================================================
--- 5b6486ded5188e41ac9bc81ad4a5e2bd746f7ede/sound/oss/vwsnd.c  (mode:100644 sha1:265423054cafdee5f715615ddaaf219177b14ef6)
+++ 948b9c0bd3218b468df9333f59340c08db5a2c69/sound/oss/vwsnd.c  (mode:100644 sha1:bdcc27a5f7061814dc37483186db3d9e7ecbac31)
@@ -148,7 +148,7 @@
 #include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <linux/interrupt.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/mach-visws/cobalt.h>
 
 #include "sound_config.h"