Introduce linux/semaphore.h.  Convert all users of asm/semaphore.h over 
to linux/semaphore.h.

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

diff -purN v2.6.12-rc3/arch/alpha/kernel/alpha_ksyms.c sem-10/arch/alpha/kernel/alpha_ksyms.c
--- v2.6.12-rc3/arch/alpha/kernel/alpha_ksyms.c	2005-04-28 11:01:43.000000000 -0400
+++ sem-10/arch/alpha/kernel/alpha_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/arm/common/rtctime.c sem-10/arch/arm/common/rtctime.c
--- v2.6.12-rc3/arch/arm/common/rtctime.c	2005-04-28 11:01:43.000000000 -0400
+++ sem-10/arch/arm/common/rtctime.c	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/arch/arm/kernel/semaphore.c sem-10/arch/arm/kernel/semaphore.c
--- v2.6.12-rc3/arch/arm/kernel/semaphore.c	2005-04-06 17:27:54.000000000 -0400
+++ sem-10/arch/arm/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/arm/mach-integrator/clock.c sem-10/arch/arm/mach-integrator/clock.c
--- v2.6.12-rc3/arch/arm/mach-integrator/clock.c	2004-12-24 16:35:39.000000000 -0500
+++ sem-10/arch/arm/mach-integrator/clock.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/arm/mach-omap/clock.c sem-10/arch/arm/mach-omap/clock.c
--- v2.6.12-rc3/arch/arm/mach-omap/clock.c	2005-04-28 11:01:43.000000000 -0400
+++ sem-10/arch/arm/mach-omap/clock.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/arm/mach-versatile/clock.c sem-10/arch/arm/mach-versatile/clock.c
--- v2.6.12-rc3/arch/arm/mach-versatile/clock.c	2004-12-24 16:33:52.000000000 -0500
+++ sem-10/arch/arm/mach-versatile/clock.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/arm/oprofile/common.c sem-10/arch/arm/oprofile/common.c
--- v2.6.12-rc3/arch/arm/oprofile/common.c	2005-04-28 11:01:43.000000000 -0400
+++ sem-10/arch/arm/oprofile/common.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/arch/arm26/kernel/armksyms.c sem-10/arch/arm26/kernel/armksyms.c
--- v2.6.12-rc3/arch/arm26/kernel/armksyms.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/arm26/kernel/armksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/arm26/kernel/semaphore.c sem-10/arch/arm26/kernel/semaphore.c
--- v2.6.12-rc3/arch/arm26/kernel/semaphore.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/arm26/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/arm26/kernel/traps.c sem-10/arch/arm26/kernel/traps.c
--- v2.6.12-rc3/arch/arm26/kernel/traps.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/arm26/kernel/traps.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/arch/cris/kernel/crisksyms.c sem-10/arch/cris/kernel/crisksyms.c
--- v2.6.12-rc3/arch/cris/kernel/crisksyms.c	2004-12-24 16:35:23.000000000 -0500
+++ sem-10/arch/cris/kernel/crisksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/cris/kernel/semaphore.c sem-10/arch/cris/kernel/semaphore.c
--- v2.6.12-rc3/arch/cris/kernel/semaphore.c	2004-12-24 16:34:30.000000000 -0500
+++ sem-10/arch/cris/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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)
diff -purN v2.6.12-rc3/arch/frv/kernel/frv_ksyms.c sem-10/arch/frv/kernel/frv_ksyms.c
--- v2.6.12-rc3/arch/frv/kernel/frv_ksyms.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/frv/kernel/frv_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/frv/kernel/semaphore.c sem-10/arch/frv/kernel/semaphore.c
--- v2.6.12-rc3/arch/frv/kernel/semaphore.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/frv/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/arch/h8300/kernel/h8300_ksyms.c sem-10/arch/h8300/kernel/h8300_ksyms.c
--- v2.6.12-rc3/arch/h8300/kernel/h8300_ksyms.c	2004-12-24 16:35:28.000000000 -0500
+++ sem-10/arch/h8300/kernel/h8300_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/h8300/kernel/semaphore.c sem-10/arch/h8300/kernel/semaphore.c
--- v2.6.12-rc3/arch/h8300/kernel/semaphore.c	2004-12-24 16:34:58.000000000 -0500
+++ sem-10/arch/h8300/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -24,7 +24,7 @@ spinlock_t semaphore_wake_lock;
  * 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 @@ spinlock_t semaphore_wake_lock;
  * 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)
diff -purN v2.6.12-rc3/arch/i386/kernel/cpu/common.c sem-10/arch/i386/kernel/cpu/common.c
--- v2.6.12-rc3/arch/i386/kernel/cpu/common.c	2005-04-28 11:01:43.000000000 -0400
+++ sem-10/arch/i386/kernel/cpu/common.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/i386/kernel/cpu/proc.c sem-10/arch/i386/kernel/cpu/proc.c
--- v2.6.12-rc3/arch/i386/kernel/cpu/proc.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/i386/kernel/cpu/proc.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
 /*
diff -purN v2.6.12-rc3/arch/i386/kernel/i386_ksyms.c sem-10/arch/i386/kernel/i386_ksyms.c
--- v2.6.12-rc3/arch/i386/kernel/i386_ksyms.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/i386/kernel/i386_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/i386/kernel/semaphore.c sem-10/arch/i386/kernel/semaphore.c
--- v2.6.12-rc3/arch/i386/kernel/semaphore.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/i386/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/ia64/ia32/sys_ia32.c sem-10/arch/ia64/ia32/sys_ia32.c
--- v2.6.12-rc3/arch/ia64/ia32/sys_ia32.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/ia64/ia32/sys_ia32.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/ia64/kernel/ia64_ksyms.c sem-10/arch/ia64/kernel/ia64_ksyms.c
--- v2.6.12-rc3/arch/ia64/kernel/ia64_ksyms.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/ia64/kernel/ia64_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -31,7 +31,7 @@ EXPORT_SYMBOL(strpbrk);
 #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);
diff -purN v2.6.12-rc3/arch/ia64/kernel/salinfo.c sem-10/arch/ia64/kernel/salinfo.c
--- v2.6.12-rc3/arch/ia64/kernel/salinfo.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/ia64/kernel/salinfo.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/ia64/kernel/semaphore.c sem-10/arch/ia64/kernel/semaphore.c
--- v2.6.12-rc3/arch/ia64/kernel/semaphore.c	2004-12-24 16:34:32.000000000 -0500
+++ sem-10/arch/ia64/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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:
diff -purN v2.6.12-rc3/arch/ia64/sn/kernel/sn2/sn_hwperf.c sem-10/arch/ia64/sn/kernel/sn2/sn_hwperf.c
--- v2.6.12-rc3/arch/ia64/sn/kernel/sn2/sn_hwperf.c	2005-04-06 17:27:55.000000000 -0400
+++ sem-10/arch/ia64/sn/kernel/sn2/sn_hwperf.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/m32r/kernel/m32r_ksyms.c sem-10/arch/m32r/kernel/m32r_ksyms.c
--- v2.6.12-rc3/arch/m32r/kernel/m32r_ksyms.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/m32r/kernel/m32r_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/m32r/kernel/semaphore.c sem-10/arch/m32r/kernel/semaphore.c
--- v2.6.12-rc3/arch/m32r/kernel/semaphore.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/m32r/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/m68k/atari/stram.c sem-10/arch/m68k/atari/stram.c
--- v2.6.12-rc3/arch/m68k/atari/stram.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/m68k/atari/stram.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/m68k/kernel/m68k_ksyms.c sem-10/arch/m68k/kernel/m68k_ksyms.c
--- v2.6.12-rc3/arch/m68k/kernel/m68k_ksyms.c	2004-12-24 16:35:25.000000000 -0500
+++ sem-10/arch/m68k/kernel/m68k_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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);
diff -purN v2.6.12-rc3/arch/m68k/kernel/semaphore.c sem-10/arch/m68k/kernel/semaphore.c
--- v2.6.12-rc3/arch/m68k/kernel/semaphore.c	2004-12-24 16:35:23.000000000 -0500
+++ sem-10/arch/m68k/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -24,7 +24,7 @@ spinlock_t semaphore_wake_lock;
  * 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 @@ spinlock_t semaphore_wake_lock;
  * 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)
diff -purN v2.6.12-rc3/arch/m68k/sun3/intersil.c sem-10/arch/m68k/sun3/intersil.c
--- v2.6.12-rc3/arch/m68k/sun3/intersil.c	2004-12-24 16:33:49.000000000 -0500
+++ sem-10/arch/m68k/sun3/intersil.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/m68knommu/kernel/m68k_ksyms.c sem-10/arch/m68knommu/kernel/m68k_ksyms.c
--- v2.6.12-rc3/arch/m68knommu/kernel/m68k_ksyms.c	2004-12-24 16:35:27.000000000 -0500
+++ sem-10/arch/m68knommu/kernel/m68k_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/m68knommu/kernel/semaphore.c sem-10/arch/m68knommu/kernel/semaphore.c
--- v2.6.12-rc3/arch/m68knommu/kernel/semaphore.c	2004-12-24 16:35:49.000000000 -0500
+++ sem-10/arch/m68knommu/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -25,7 +25,7 @@ spinlock_t semaphore_wake_lock;
  * 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 @@ spinlock_t semaphore_wake_lock;
  * 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)
diff -purN v2.6.12-rc3/arch/mips/kernel/semaphore.c sem-10/arch/mips/kernel/semaphore.c
--- v2.6.12-rc3/arch/mips/kernel/semaphore.c	2005-04-06 17:27:56.000000000 -0400
+++ sem-10/arch/mips/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/arch/mips/lasat/picvue.h sem-10/arch/mips/lasat/picvue.h
--- v2.6.12-rc3/arch/mips/lasat/picvue.h	2004-12-24 16:34:00.000000000 -0500
+++ sem-10/arch/mips/lasat/picvue.h	2005-04-28 11:16:50.000000000 -0400
@@ -4,7 +4,7 @@
  * Brian Murphy <brian.murphy@eicon.com> 
  *
  */
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 struct pvc_defs {
 	volatile u32 *reg;
diff -purN v2.6.12-rc3/arch/mips/sgi-ip27/ip27-console.c sem-10/arch/mips/sgi-ip27/ip27-console.c
--- v2.6.12-rc3/arch/mips/sgi-ip27/ip27-console.c	2004-12-24 16:35:22.000000000 -0500
+++ sem-10/arch/mips/sgi-ip27/ip27-console.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/parisc/kernel/parisc_ksyms.c sem-10/arch/parisc/kernel/parisc_ksyms.c
--- v2.6.12-rc3/arch/parisc/kernel/parisc_ksyms.c	2005-04-06 17:27:56.000000000 -0400
+++ sem-10/arch/parisc/kernel/parisc_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(sys_lseek);
 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);
diff -purN v2.6.12-rc3/arch/parisc/kernel/semaphore.c sem-10/arch/parisc/kernel/semaphore.c
--- v2.6.12-rc3/arch/parisc/kernel/semaphore.c	2004-12-24 16:35:23.000000000 -0500
+++ sem-10/arch/parisc/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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)
 {
diff -purN v2.6.12-rc3/arch/parisc/kernel/sys_parisc32.c sem-10/arch/parisc/kernel/sys_parisc32.c
--- v2.6.12-rc3/arch/parisc/kernel/sys_parisc32.c	2005-04-28 11:01:44.000000000 -0400
+++ sem-10/arch/parisc/kernel/sys_parisc32.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/arch/ppc/kernel/ppc_ksyms.c sem-10/arch/ppc/kernel/ppc_ksyms.c
--- v2.6.12-rc3/arch/ppc/kernel/ppc_ksyms.c	2005-04-28 11:01:45.000000000 -0400
+++ sem-10/arch/ppc/kernel/ppc_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/ppc/kernel/semaphore.c sem-10/arch/ppc/kernel/semaphore.c
--- v2.6.12-rc3/arch/ppc/kernel/semaphore.c	2004-12-24 16:35:24.000000000 -0500
+++ sem-10/arch/ppc/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
 /*
diff -purN v2.6.12-rc3/arch/ppc/kernel/syscalls.c sem-10/arch/ppc/kernel/syscalls.c
--- v2.6.12-rc3/arch/ppc/kernel/syscalls.c	2005-04-28 11:01:45.000000000 -0400
+++ sem-10/arch/ppc/kernel/syscalls.c	2005-04-28 11:16:50.000000000 -0400
@@ -39,7 +39,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 void
 check_bugs(void)
diff -purN v2.6.12-rc3/arch/ppc/syslib/ocp.c sem-10/arch/ppc/syslib/ocp.c
--- v2.6.12-rc3/arch/ppc/syslib/ocp.c	2004-12-24 16:35:23.000000000 -0500
+++ sem-10/arch/ppc/syslib/ocp.c	2005-04-28 11:16:50.000000000 -0400
@@ -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)
diff -purN v2.6.12-rc3/arch/ppc64/kernel/rtas.c sem-10/arch/ppc64/kernel/rtas.c
--- v2.6.12-rc3/arch/ppc64/kernel/rtas.c	2005-04-28 11:01:45.000000000 -0400
+++ sem-10/arch/ppc64/kernel/rtas.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/ppc64/kernel/semaphore.c sem-10/arch/ppc64/kernel/semaphore.c
--- v2.6.12-rc3/arch/ppc64/kernel/semaphore.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/ppc64/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -21,7 +21,7 @@
 #include <linux/module.h>
 
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/errno.h>
 
 /*
diff -purN v2.6.12-rc3/arch/ppc64/kernel/syscalls.c sem-10/arch/ppc64/kernel/syscalls.c
--- v2.6.12-rc3/arch/ppc64/kernel/syscalls.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/ppc64/kernel/syscalls.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/ppc64/kernel/sys_ppc32.c sem-10/arch/ppc64/kernel/sys_ppc32.c
--- v2.6.12-rc3/arch/ppc64/kernel/sys_ppc32.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/ppc64/kernel/sys_ppc32.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/ppc64/mm/imalloc.c sem-10/arch/ppc64/mm/imalloc.c
--- v2.6.12-rc3/arch/ppc64/mm/imalloc.c	2004-12-24 16:34:27.000000000 -0500
+++ sem-10/arch/ppc64/mm/imalloc.c	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/arch/s390/kernel/compat_linux.c sem-10/arch/s390/kernel/compat_linux.c
--- v2.6.12-rc3/arch/s390/kernel/compat_linux.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/s390/kernel/compat_linux.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/s390/kernel/debug.c sem-10/arch/s390/kernel/debug.c
--- v2.6.12-rc3/arch/s390/kernel/debug.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/s390/kernel/debug.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/s390/kernel/semaphore.c sem-10/arch/s390/kernel/semaphore.c
--- v2.6.12-rc3/arch/s390/kernel/semaphore.c	2004-12-24 16:35:28.000000000 -0500
+++ sem-10/arch/s390/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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:
diff -purN v2.6.12-rc3/arch/sh/kernel/semaphore.c sem-10/arch/sh/kernel/semaphore.c
--- v2.6.12-rc3/arch/sh/kernel/semaphore.c	2004-12-24 16:35:24.000000000 -0500
+++ sem-10/arch/sh/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 @@ spinlock_t semaphore_wake_lock;
  * 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 @@ spinlock_t semaphore_wake_lock;
  * 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)
diff -purN v2.6.12-rc3/arch/sh/kernel/sh_ksyms.c sem-10/arch/sh/kernel/sh_ksyms.c
--- v2.6.12-rc3/arch/sh/kernel/sh_ksyms.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/sh/kernel/sh_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/sh/mm/pg-dma.c sem-10/arch/sh/mm/pg-dma.c
--- v2.6.12-rc3/arch/sh/mm/pg-dma.c	2004-12-24 16:35:00.000000000 -0500
+++ sem-10/arch/sh/mm/pg-dma.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/sh64/kernel/semaphore.c sem-10/arch/sh64/kernel/semaphore.c
--- v2.6.12-rc3/arch/sh64/kernel/semaphore.c	2004-12-24 16:34:31.000000000 -0500
+++ sem-10/arch/sh64/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 @@ spinlock_t semaphore_wake_lock;
  * 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 @@ spinlock_t semaphore_wake_lock;
  * 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)
diff -purN v2.6.12-rc3/arch/sh64/kernel/sh_ksyms.c sem-10/arch/sh64/kernel/sh_ksyms.c
--- v2.6.12-rc3/arch/sh64/kernel/sh_ksyms.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/sh64/kernel/sh_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/arch/sparc/kernel/semaphore.c sem-10/arch/sparc/kernel/semaphore.c
--- v2.6.12-rc3/arch/sparc/kernel/semaphore.c	2005-04-06 17:27:57.000000000 -0400
+++ sem-10/arch/sparc/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/sparc64/kernel/sys_sparc32.c sem-10/arch/sparc64/kernel/sys_sparc32.c
--- v2.6.12-rc3/arch/sparc64/kernel/sys_sparc32.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/sparc64/kernel/sys_sparc32.c	2005-04-28 11:16:50.000000000 -0400
@@ -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)
diff -purN v2.6.12-rc3/arch/um/drivers/port_kern.c sem-10/arch/um/drivers/port_kern.c
--- v2.6.12-rc3/arch/um/drivers/port_kern.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/um/drivers/port_kern.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/arch/um/drivers/xterm_kern.c sem-10/arch/um/drivers/xterm_kern.c
--- v2.6.12-rc3/arch/um/drivers/xterm_kern.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/um/drivers/xterm_kern.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/arch/um/include/line.h sem-10/arch/um/include/line.h
--- v2.6.12-rc3/arch/um/include/line.h	2005-04-06 17:27:58.000000000 -0400
+++ sem-10/arch/um/include/line.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/arch/um/kernel/trap_kern.c sem-10/arch/um/kernel/trap_kern.c
--- v2.6.12-rc3/arch/um/kernel/trap_kern.c	2005-04-06 17:27:58.000000000 -0400
+++ sem-10/arch/um/kernel/trap_kern.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/arch/um/sys-i386/ksyms.c sem-10/arch/um/sys-i386/ksyms.c
--- v2.6.12-rc3/arch/um/sys-i386/ksyms.c	2004-12-24 16:35:24.000000000 -0500
+++ sem-10/arch/um/sys-i386/ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/arch/v850/kernel/semaphore.c sem-10/arch/v850/kernel/semaphore.c
--- v2.6.12-rc3/arch/v850/kernel/semaphore.c	2005-04-06 17:27:58.000000000 -0400
+++ sem-10/arch/v850/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/v850/kernel/syscalls.c sem-10/arch/v850/kernel/syscalls.c
--- v2.6.12-rc3/arch/v850/kernel/syscalls.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/v850/kernel/syscalls.c	2005-04-28 11:16:50.000000000 -0400
@@ -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..
diff -purN v2.6.12-rc3/arch/v850/kernel/v850_ksyms.c sem-10/arch/v850/kernel/v850_ksyms.c
--- v2.6.12-rc3/arch/v850/kernel/v850_ksyms.c	2004-12-24 16:34:58.000000000 -0500
+++ sem-10/arch/v850/kernel/v850_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/x86_64/ia32/sys_ia32.c sem-10/arch/x86_64/ia32/sys_ia32.c
--- v2.6.12-rc3/arch/x86_64/ia32/sys_ia32.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/x86_64/ia32/sys_ia32.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/arch/x86_64/kernel/semaphore.c sem-10/arch/x86_64/kernel/semaphore.c
--- v2.6.12-rc3/arch/x86_64/kernel/semaphore.c	2005-04-28 11:01:46.000000000 -0400
+++ sem-10/arch/x86_64/kernel/semaphore.c	2005-04-28 11:16:50.000000000 -0400
@@ -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.
  */
 
diff -purN v2.6.12-rc3/arch/x86_64/kernel/x8664_ksyms.c sem-10/arch/x86_64/kernel/x8664_ksyms.c
--- v2.6.12-rc3/arch/x86_64/kernel/x8664_ksyms.c	2005-04-28 11:01:47.000000000 -0400
+++ sem-10/arch/x86_64/kernel/x8664_ksyms.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/atm/idt77252.c sem-10/drivers/atm/idt77252.c
--- v2.6.12-rc3/drivers/atm/idt77252.c	2005-04-28 11:01:47.000000000 -0400
+++ sem-10/drivers/atm/idt77252.c	2005-04-28 11:16:50.000000000 -0400
@@ -46,7 +46,7 @@ static char const rcsid[] =
 #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>
diff -purN v2.6.12-rc3/drivers/base/core.c sem-10/drivers/base/core.c
--- v2.6.12-rc3/drivers/base/core.c	2005-04-28 11:01:47.000000000 -0400
+++ sem-10/drivers/base/core.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/base/firmware_class.c sem-10/drivers/base/firmware_class.c
--- v2.6.12-rc3/drivers/base/firmware_class.c	2005-04-28 11:01:47.000000000 -0400
+++ sem-10/drivers/base/firmware_class.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/base/power/shutdown.c sem-10/drivers/base/power/shutdown.c
--- v2.6.12-rc3/drivers/base/power/shutdown.c	2004-12-24 16:35:01.000000000 -0500
+++ sem-10/drivers/base/power/shutdown.c	2005-04-28 11:16:50.000000000 -0400
@@ -10,7 +10,7 @@
 
 #include <linux/config.h>
 #include <linux/device.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "power.h"
 
diff -purN v2.6.12-rc3/drivers/block/cryptoloop.c sem-10/drivers/block/cryptoloop.c
--- v2.6.12-rc3/drivers/block/cryptoloop.c	2004-12-24 16:35:00.000000000 -0500
+++ sem-10/drivers/block/cryptoloop.c	2005-04-28 11:16:50.000000000 -0400
@@ -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");
diff -purN v2.6.12-rc3/drivers/block/sx8.c sem-10/drivers/block/sx8.c
--- v2.6.12-rc3/drivers/block/sx8.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/block/sx8.c	2005-04-28 11:16:50.000000000 -0400
@@ -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");
diff -purN v2.6.12-rc3/drivers/char/generic_serial.c sem-10/drivers/char/generic_serial.c
--- v2.6.12-rc3/drivers/char/generic_serial.c	2005-04-28 11:01:48.000000000 -0400
+++ sem-10/drivers/char/generic_serial.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 
diff -purN v2.6.12-rc3/drivers/char/ipmi/ipmi_devintf.c sem-10/drivers/char/ipmi/ipmi_devintf.c
--- v2.6.12-rc3/drivers/char/ipmi/ipmi_devintf.c	2004-12-24 16:35:25.000000000 -0500
+++ sem-10/drivers/char/ipmi/ipmi_devintf.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/char/ipmi/ipmi_poweroff.c sem-10/drivers/char/ipmi/ipmi_poweroff.c
--- v2.6.12-rc3/drivers/char/ipmi/ipmi_poweroff.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/ipmi/ipmi_poweroff.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/char/rio/rioboot.c sem-10/drivers/char/rio/rioboot.c
--- v2.6.12-rc3/drivers/char/rio/rioboot.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/rioboot.c	2005-04-28 11:16:50.000000000 -0400
@@ -41,7 +41,7 @@ static char *_rioboot_c_sccs_ = "@(#)rio
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 
 #include <linux/termios.h>
diff -purN v2.6.12-rc3/drivers/char/rio/riocmd.c sem-10/drivers/char/rio/riocmd.c
--- v2.6.12-rc3/drivers/char/rio/riocmd.c	2005-04-28 11:01:48.000000000 -0400
+++ sem-10/drivers/char/rio/riocmd.c	2005-04-28 11:16:50.000000000 -0400
@@ -41,7 +41,7 @@ static char *_riocmd_c_sccs_ = "@(#)rioc
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/rioctrl.c sem-10/drivers/char/rio/rioctrl.c
--- v2.6.12-rc3/drivers/char/rio/rioctrl.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/rioctrl.c	2005-04-28 11:16:50.000000000 -0400
@@ -40,7 +40,7 @@ static char *_rioctrl_c_sccs_ = "@(#)rio
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/rioinit.c sem-10/drivers/char/rio/rioinit.c
--- v2.6.12-rc3/drivers/char/rio/rioinit.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/rioinit.c	2005-04-28 11:16:50.000000000 -0400
@@ -40,7 +40,7 @@ static char *_rioinit_c_sccs_ = "@(#)rio
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/riointr.c sem-10/drivers/char/rio/riointr.c
--- v2.6.12-rc3/drivers/char/rio/riointr.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/riointr.c	2005-04-28 11:16:50.000000000 -0400
@@ -41,7 +41,7 @@ static char *_riointr_c_sccs_ = "@(#)rio
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/rioparam.c sem-10/drivers/char/rio/rioparam.c
--- v2.6.12-rc3/drivers/char/rio/rioparam.c	2004-12-24 16:35:50.000000000 -0500
+++ sem-10/drivers/char/rio/rioparam.c	2005-04-28 11:16:50.000000000 -0400
@@ -41,7 +41,7 @@ static char *_rioparam_c_sccs_ = "@(#)ri
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/rioroute.c sem-10/drivers/char/rio/rioroute.c
--- v2.6.12-rc3/drivers/char/rio/rioroute.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/rioroute.c	2005-04-28 11:16:50.000000000 -0400
@@ -39,7 +39,7 @@ static char *_rioroute_c_sccs_ = "@(#)ri
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/riotable.c sem-10/drivers/char/rio/riotable.c
--- v2.6.12-rc3/drivers/char/rio/riotable.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/riotable.c	2005-04-28 11:16:50.000000000 -0400
@@ -42,7 +42,7 @@ static char *_riotable_c_sccs_ = "@(#)ri
 #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>
diff -purN v2.6.12-rc3/drivers/char/rio/riotty.c sem-10/drivers/char/rio/riotty.c
--- v2.6.12-rc3/drivers/char/rio/riotty.c	2005-04-06 17:27:59.000000000 -0400
+++ sem-10/drivers/char/rio/riotty.c	2005-04-28 11:16:50.000000000 -0400
@@ -44,7 +44,7 @@ static char *_riotty_c_sccs_ = "@(#)riot
 #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>
diff -purN v2.6.12-rc3/drivers/char/rocket.c sem-10/drivers/char/rocket.c
--- v2.6.12-rc3/drivers/char/rocket.c	2004-12-24 16:35:21.000000000 -0500
+++ sem-10/drivers/char/rocket.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 ******/
diff -purN v2.6.12-rc3/drivers/char/ser_a2232.c sem-10/drivers/char/ser_a2232.c
--- v2.6.12-rc3/drivers/char/ser_a2232.c	2004-12-24 16:34:29.000000000 -0500
+++ sem-10/drivers/char/ser_a2232.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/char/snsc.h sem-10/drivers/char/snsc.h
--- v2.6.12-rc3/drivers/char/snsc.h	2004-12-24 16:35:50.000000000 -0500
+++ sem-10/drivers/char/snsc.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
 
diff -purN v2.6.12-rc3/drivers/char/watchdog/sc1200wdt.c sem-10/drivers/char/watchdog/sc1200wdt.c
--- v2.6.12-rc3/drivers/char/watchdog/sc1200wdt.c	2005-04-28 11:01:48.000000000 -0400
+++ sem-10/drivers/char/watchdog/sc1200wdt.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/fc4/fc.c sem-10/drivers/fc4/fc.c
--- v2.6.12-rc3/drivers/fc4/fc.c	2004-12-24 16:34:58.000000000 -0500
+++ sem-10/drivers/fc4/fc.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/i2c/busses/i2c-ali1535.c sem-10/drivers/i2c/busses/i2c-ali1535.c
--- v2.6.12-rc3/drivers/i2c/busses/i2c-ali1535.c	2005-04-06 17:28:00.000000000 -0400
+++ sem-10/drivers/i2c/busses/i2c-ali1535.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 */
diff -purN v2.6.12-rc3/drivers/ieee1394/eth1394.c sem-10/drivers/ieee1394/eth1394.c
--- v2.6.12-rc3/drivers/ieee1394/eth1394.c	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/ieee1394/eth1394.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/ieee1394/hosts.h sem-10/drivers/ieee1394/hosts.h
--- v2.6.12-rc3/drivers/ieee1394/hosts.h	2004-12-24 16:34:26.000000000 -0500
+++ sem-10/drivers/ieee1394/hosts.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/ieee1394/ieee1394_core.c sem-10/drivers/ieee1394/ieee1394_core.c
--- v2.6.12-rc3/drivers/ieee1394/ieee1394_core.c	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/ieee1394/ieee1394_core.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/ieee1394/ieee1394_core.h sem-10/drivers/ieee1394/ieee1394_core.h
--- v2.6.12-rc3/drivers/ieee1394/ieee1394_core.h	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/ieee1394/ieee1394_core.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
 
diff -purN v2.6.12-rc3/drivers/ieee1394/ieee1394_types.h sem-10/drivers/ieee1394/ieee1394_types.h
--- v2.6.12-rc3/drivers/ieee1394/ieee1394_types.h	2004-12-24 16:35:23.000000000 -0500
+++ sem-10/drivers/ieee1394/ieee1394_types.h	2005-04-28 11:16:50.000000000 -0400
@@ -9,7 +9,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/byteorder.h>
 
 
diff -purN v2.6.12-rc3/drivers/infiniband/core/device.c sem-10/drivers/infiniband/core/device.c
--- v2.6.12-rc3/drivers/infiniband/core/device.c	2005-04-06 17:28:00.000000000 -0400
+++ sem-10/drivers/infiniband/core/device.c	2005-04-28 11:16:50.000000000 -0400
@@ -38,7 +38,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "core_priv.h"
 
diff -purN v2.6.12-rc3/drivers/infiniband/core/user_mad.c sem-10/drivers/infiniband/core/user_mad.c
--- v2.6.12-rc3/drivers/infiniband/core/user_mad.c	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/infiniband/core/user_mad.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/infiniband/hw/mthca/mthca_dev.h sem-10/drivers/infiniband/hw/mthca/mthca_dev.h
--- v2.6.12-rc3/drivers/infiniband/hw/mthca/mthca_dev.h	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/infiniband/hw/mthca/mthca_dev.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/infiniband/hw/mthca/mthca_memfree.h sem-10/drivers/infiniband/hw/mthca/mthca_memfree.h
--- v2.6.12-rc3/drivers/infiniband/hw/mthca/mthca_memfree.h	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/infiniband/hw/mthca/mthca_memfree.h	2005-04-28 11:16:50.000000000 -0400
@@ -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)) /		\
diff -purN v2.6.12-rc3/drivers/infiniband/ulp/ipoib/ipoib.h sem-10/drivers/infiniband/ulp/ipoib/ipoib.h
--- v2.6.12-rc3/drivers/infiniband/ulp/ipoib/ipoib.h	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/infiniband/ulp/ipoib/ipoib.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/input/joystick/iforce/iforce.h sem-10/drivers/input/joystick/iforce/iforce.h
--- v2.6.12-rc3/drivers/input/joystick/iforce/iforce.h	2004-12-24 16:35:50.000000000 -0500
+++ sem-10/drivers/input/joystick/iforce/iforce.h	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/drivers/macintosh/adb.c sem-10/drivers/macintosh/adb.c
--- v2.6.12-rc3/drivers/macintosh/adb.c	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/macintosh/adb.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/drivers/media/dvb/dvb-core/dmxdev.h sem-10/drivers/media/dvb/dvb-core/dmxdev.h
--- v2.6.12-rc3/drivers/media/dvb/dvb-core/dmxdev.h	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/media/dvb/dvb-core/dmxdev.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/media/dvb/dvb-core/dvb_demux.h sem-10/drivers/media/dvb/dvb-core/dvb_demux.h
--- v2.6.12-rc3/drivers/media/dvb/dvb-core/dvb_demux.h	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/media/dvb/dvb-core/dvb_demux.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/media/dvb/dvb-core/dvb_frontend.c sem-10/drivers/media/dvb/dvb-core/dvb_frontend.c
--- v2.6.12-rc3/drivers/media/dvb/dvb-core/dvb_frontend.c	2005-04-28 11:01:49.000000000 -0400
+++ sem-10/drivers/media/dvb/dvb-core/dvb_frontend.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/media/dvb/ttpci/av7110.c sem-10/drivers/media/dvb/ttpci/av7110.c
--- v2.6.12-rc3/drivers/media/dvb/ttpci/av7110.c	2005-04-28 11:01:50.000000000 -0400
+++ sem-10/drivers/media/dvb/ttpci/av7110.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c sem-10/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
--- v2.6.12-rc3/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2005-04-28 11:01:50.000000000 -0400
+++ sem-10/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/media/dvb/ttusb-dec/ttusb_dec.c sem-10/drivers/media/dvb/ttusb-dec/ttusb_dec.c
--- v2.6.12-rc3/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2005-04-28 11:01:50.000000000 -0400
+++ sem-10/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2005-04-28 11:16:50.000000000 -0400
@@ -20,7 +20,7 @@
  *
  */
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff -purN v2.6.12-rc3/drivers/media/radio/miropcm20-rds-core.c sem-10/drivers/media/radio/miropcm20-rds-core.c
--- v2.6.12-rc3/drivers/media/radio/miropcm20-rds-core.c	2004-12-24 16:35:28.000000000 -0500
+++ sem-10/drivers/media/radio/miropcm20-rds-core.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/media/radio/radio-aimslab.c sem-10/drivers/media/radio/radio-aimslab.c
--- v2.6.12-rc3/drivers/media/radio/radio-aimslab.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/radio/radio-aimslab.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/drivers/media/radio/radio-maestro.c sem-10/drivers/media/radio/radio-maestro.c
--- v2.6.12-rc3/drivers/media/radio/radio-maestro.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/radio/radio-maestro.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/media/radio/radio-maxiradio.c sem-10/drivers/media/radio/radio-maxiradio.c
--- v2.6.12-rc3/drivers/media/radio/radio-maxiradio.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/radio/radio-maxiradio.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/media/radio/radio-sf16fmi.c sem-10/drivers/media/radio/radio-sf16fmi.c
--- v2.6.12-rc3/drivers/media/radio/radio-sf16fmi.c	2005-04-28 11:01:51.000000000 -0400
+++ sem-10/drivers/media/radio/radio-sf16fmi.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
 {
diff -purN v2.6.12-rc3/drivers/media/radio/radio-sf16fmr2.c sem-10/drivers/media/radio/radio-sf16fmr2.c
--- v2.6.12-rc3/drivers/media/radio/radio-sf16fmr2.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/radio/radio-sf16fmr2.c	2005-04-28 11:16:50.000000000 -0400
@@ -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;
 
diff -purN v2.6.12-rc3/drivers/media/video/arv.c sem-10/drivers/media/video/arv.c
--- v2.6.12-rc3/drivers/media/video/arv.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/video/arv.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/media/video/bw-qcam.c sem-10/drivers/media/video/bw-qcam.c
--- v2.6.12-rc3/drivers/media/video/bw-qcam.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/video/bw-qcam.c	2005-04-28 11:16:50.000000000 -0400
@@ -73,7 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #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"
diff -purN v2.6.12-rc3/drivers/media/video/cpia.c sem-10/drivers/media/video/cpia.c
--- v2.6.12-rc3/drivers/media/video/cpia.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/video/cpia.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/media/video/c-qcam.c sem-10/drivers/media/video/c-qcam.c
--- v2.6.12-rc3/drivers/media/video/c-qcam.c	2005-04-28 11:01:51.000000000 -0400
+++ sem-10/drivers/media/video/c-qcam.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 {
diff -purN v2.6.12-rc3/drivers/media/video/ir-kbd-i2c.c sem-10/drivers/media/video/ir-kbd-i2c.c
--- v2.6.12-rc3/drivers/media/video/ir-kbd-i2c.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/video/ir-kbd-i2c.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/media/video/msp3400.c sem-10/drivers/media/video/msp3400.c
--- v2.6.12-rc3/drivers/media/video/msp3400.c	2005-04-28 11:01:51.000000000 -0400
+++ sem-10/drivers/media/video/msp3400.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/media/video/planb.c sem-10/drivers/media/video/planb.c
--- v2.6.12-rc3/drivers/media/video/planb.c	2005-04-28 11:01:51.000000000 -0400
+++ sem-10/drivers/media/video/planb.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/media/video/tvmixer.c sem-10/drivers/media/video/tvmixer.c
--- v2.6.12-rc3/drivers/media/video/tvmixer.c	2005-04-06 17:28:01.000000000 -0400
+++ sem-10/drivers/media/video/tvmixer.c	2005-04-28 11:16:50.000000000 -0400
@@ -14,7 +14,7 @@
 #include <linux/sound.h>
 #include <linux/soundcard.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/uaccess.h>
 
 
diff -purN v2.6.12-rc3/drivers/media/video/videodev.c sem-10/drivers/media/video/videodev.c
--- v2.6.12-rc3/drivers/media/video/videodev.c	2005-04-28 11:01:51.000000000 -0400
+++ sem-10/drivers/media/video/videodev.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/mtd/mtd_blkdevs.c sem-10/drivers/mtd/mtd_blkdevs.c
--- v2.6.12-rc3/drivers/mtd/mtd_blkdevs.c	2004-12-24 16:33:49.000000000 -0500
+++ sem-10/drivers/mtd/mtd_blkdevs.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/net/3c527.c sem-10/drivers/net/3c527.c
--- v2.6.12-rc3/drivers/net/3c527.c	2005-04-28 11:01:52.000000000 -0400
+++ sem-10/drivers/net/3c527.c	2005-04-28 11:16:50.000000000 -0400
@@ -104,7 +104,7 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD
 #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>
diff -purN v2.6.12-rc3/drivers/net/hamradio/6pack.c sem-10/drivers/net/hamradio/6pack.c
--- v2.6.12-rc3/drivers/net/hamradio/6pack.c	2005-04-28 11:01:52.000000000 -0400
+++ sem-10/drivers/net/hamradio/6pack.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/net/ibmveth.c sem-10/drivers/net/ibmveth.c
--- v2.6.12-rc3/drivers/net/ibmveth.c	2005-04-06 17:28:02.000000000 -0400
+++ sem-10/drivers/net/ibmveth.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/net/plip.c sem-10/drivers/net/plip.c
--- v2.6.12-rc3/drivers/net/plip.c	2005-04-06 17:28:03.000000000 -0400
+++ sem-10/drivers/net/plip.c	2005-04-28 11:16:50.000000000 -0400
@@ -116,7 +116,7 @@ static const char version[] = "NET3 PLIP
 #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
diff -purN v2.6.12-rc3/drivers/net/ppp_synctty.c sem-10/drivers/net/ppp_synctty.c
--- v2.6.12-rc3/drivers/net/ppp_synctty.c	2005-04-06 17:28:03.000000000 -0400
+++ sem-10/drivers/net/ppp_synctty.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/oprofile/event_buffer.h sem-10/drivers/oprofile/event_buffer.h
--- v2.6.12-rc3/drivers/oprofile/event_buffer.h	2005-04-06 17:28:03.000000000 -0400
+++ sem-10/drivers/oprofile/event_buffer.h	2005-04-28 11:16:50.000000000 -0400
@@ -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);
 
diff -purN v2.6.12-rc3/drivers/oprofile/oprof.c sem-10/drivers/oprofile/oprof.c
--- v2.6.12-rc3/drivers/oprofile/oprof.c	2005-04-06 17:28:03.000000000 -0400
+++ sem-10/drivers/oprofile/oprof.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/pci/hotplug/acpiphp_glue.c sem-10/drivers/pci/hotplug/acpiphp_glue.c
--- v2.6.12-rc3/drivers/pci/hotplug/acpiphp_glue.c	2004-12-24 16:34:30.000000000 -0500
+++ sem-10/drivers/pci/hotplug/acpiphp_glue.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/pci/hotplug/pciehp.h sem-10/drivers/pci/hotplug/pciehp.h
--- v2.6.12-rc3/drivers/pci/hotplug/pciehp.h	2005-04-06 17:28:03.000000000 -0400
+++ sem-10/drivers/pci/hotplug/pciehp.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/pci/hotplug/rpadlpar_core.c sem-10/drivers/pci/hotplug/rpadlpar_core.c
--- v2.6.12-rc3/drivers/pci/hotplug/rpadlpar_core.c	2005-04-28 11:01:53.000000000 -0400
+++ sem-10/drivers/pci/hotplug/rpadlpar_core.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/pci/hotplug/shpchp.h sem-10/drivers/pci/hotplug/shpchp.h
--- v2.6.12-rc3/drivers/pci/hotplug/shpchp.h	2005-04-06 17:28:03.000000000 -0400
+++ sem-10/drivers/pci/hotplug/shpchp.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/s390/char/sclp_cpi.c sem-10/drivers/s390/char/sclp_cpi.c
--- v2.6.12-rc3/drivers/s390/char/sclp_cpi.c	2005-04-06 17:28:04.000000000 -0400
+++ sem-10/drivers/s390/char/sclp_cpi.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/s390/cio/ccwgroup.c sem-10/drivers/s390/cio/ccwgroup.c
--- v2.6.12-rc3/drivers/s390/cio/ccwgroup.c	2004-12-24 16:34:58.000000000 -0500
+++ sem-10/drivers/s390/cio/ccwgroup.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/s390/cio/qdio.c sem-10/drivers/s390/cio/qdio.c
--- v2.6.12-rc3/drivers/s390/cio/qdio.c	2005-04-06 17:28:04.000000000 -0400
+++ sem-10/drivers/s390/cio/qdio.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/s390/net/qeth_main.c sem-10/drivers/s390/net/qeth_main.c
--- v2.6.12-rc3/drivers/s390/net/qeth_main.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/s390/net/qeth_main.c	2005-04-28 11:16:50.000000000 -0400
@@ -71,7 +71,7 @@ qeth_eyecatcher(void)
 #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"
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/aachba.c sem-10/drivers/scsi/aacraid/aachba.c
--- v2.6.12-rc3/drivers/scsi/aacraid/aachba.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/aachba.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/commctrl.c sem-10/drivers/scsi/aacraid/commctrl.c
--- v2.6.12-rc3/drivers/scsi/aacraid/commctrl.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/commctrl.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/comminit.c sem-10/drivers/scsi/aacraid/comminit.c
--- v2.6.12-rc3/drivers/scsi/aacraid/comminit.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/comminit.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/commsup.c sem-10/drivers/scsi/aacraid/commsup.c
--- v2.6.12-rc3/drivers/scsi/aacraid/commsup.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/commsup.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/dpcsup.c sem-10/drivers/scsi/aacraid/dpcsup.c
--- v2.6.12-rc3/drivers/scsi/aacraid/dpcsup.c	2004-12-24 16:34:44.000000000 -0500
+++ sem-10/drivers/scsi/aacraid/dpcsup.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/linit.c sem-10/drivers/scsi/aacraid/linit.c
--- v2.6.12-rc3/drivers/scsi/aacraid/linit.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/linit.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/rkt.c sem-10/drivers/scsi/aacraid/rkt.c
--- v2.6.12-rc3/drivers/scsi/aacraid/rkt.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/rkt.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/rx.c sem-10/drivers/scsi/aacraid/rx.c
--- v2.6.12-rc3/drivers/scsi/aacraid/rx.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/rx.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/scsi/aacraid/sa.c sem-10/drivers/scsi/aacraid/sa.c
--- v2.6.12-rc3/drivers/scsi/aacraid/sa.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aacraid/sa.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/scsi/aha152x.c sem-10/drivers/scsi/aha152x.c
--- v2.6.12-rc3/drivers/scsi/aha152x.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/aha152x.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/scsi/dpt/dpti_i2o.h sem-10/drivers/scsi/dpt/dpti_i2o.h
--- v2.6.12-rc3/drivers/scsi/dpt/dpti_i2o.h	2004-12-24 16:34:45.000000000 -0500
+++ sem-10/drivers/scsi/dpt/dpti_i2o.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/scsi/libata-core.c sem-10/drivers/scsi/libata-core.c
--- v2.6.12-rc3/drivers/scsi/libata-core.c	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/libata-core.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/scsi/megaraid/mega_common.h sem-10/drivers/scsi/megaraid/mega_common.h
--- v2.6.12-rc3/drivers/scsi/megaraid/mega_common.h	2005-04-06 17:28:04.000000000 -0400
+++ sem-10/drivers/scsi/megaraid/mega_common.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/scsi/megaraid/megaraid_ioctl.h sem-10/drivers/scsi/megaraid/megaraid_ioctl.h
--- v2.6.12-rc3/drivers/scsi/megaraid/megaraid_ioctl.h	2005-04-06 17:28:04.000000000 -0400
+++ sem-10/drivers/scsi/megaraid/megaraid_ioctl.h	2005-04-28 11:16:50.000000000 -0400
@@ -18,7 +18,7 @@
 #define _MEGARAID_IOCTL_H_
 
 #include <linux/types.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "mbox_defs.h"
 
diff -purN v2.6.12-rc3/drivers/scsi/qla2xxx/qla_def.h sem-10/drivers/scsi/qla2xxx/qla_def.h
--- v2.6.12-rc3/drivers/scsi/qla2xxx/qla_def.h	2005-04-28 11:01:54.000000000 -0400
+++ sem-10/drivers/scsi/qla2xxx/qla_def.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/scsi/scsi_scan.c sem-10/drivers/scsi/scsi_scan.c
--- v2.6.12-rc3/drivers/scsi/scsi_scan.c	2005-04-28 11:01:55.000000000 -0400
+++ sem-10/drivers/scsi/scsi_scan.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/scsi/scsi_transport_spi.c sem-10/drivers/scsi/scsi_transport_spi.c
--- v2.6.12-rc3/drivers/scsi/scsi_transport_spi.c	2005-04-28 11:01:55.000000000 -0400
+++ sem-10/drivers/scsi/scsi_transport_spi.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/serial/mcfserial.c sem-10/drivers/serial/mcfserial.c
--- v2.6.12-rc3/drivers/serial/mcfserial.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/serial/mcfserial.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/serial/pmac_zilog.c sem-10/drivers/serial/pmac_zilog.c
--- v2.6.12-rc3/drivers/serial/pmac_zilog.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/serial/pmac_zilog.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/drivers/usb/atm/usb_atm.h sem-10/drivers/usb/atm/usb_atm.h
--- v2.6.12-rc3/drivers/usb/atm/usb_atm.h	2005-04-06 17:28:05.000000000 -0400
+++ sem-10/drivers/usb/atm/usb_atm.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/drivers/usb/class/usb-midi.c sem-10/drivers/usb/class/usb-midi.c
--- v2.6.12-rc3/drivers/usb/class/usb-midi.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/class/usb-midi.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/usb/core/hub.c sem-10/drivers/usb/core/hub.c
--- v2.6.12-rc3/drivers/usb/core/hub.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/core/hub.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/usb/media/ov511.c sem-10/drivers/usb/media/ov511.c
--- v2.6.12-rc3/drivers/usb/media/ov511.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/media/ov511.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/drivers/usb/media/pwc/pwc.h sem-10/drivers/usb/media/pwc/pwc.h
--- v2.6.12-rc3/drivers/usb/media/pwc/pwc.h	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/media/pwc/pwc.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/usb/media/sn9c102.h sem-10/drivers/usb/media/sn9c102.h
--- v2.6.12-rc3/drivers/usb/media/sn9c102.h	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/media/sn9c102.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/drivers/usb/media/w9968cf.h sem-10/drivers/usb/media/w9968cf.h
--- v2.6.12-rc3/drivers/usb/media/w9968cf.h	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/media/w9968cf.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/drivers/usb/net/kaweth.c sem-10/drivers/usb/net/kaweth.c
--- v2.6.12-rc3/drivers/usb/net/kaweth.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/net/kaweth.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/drivers/usb/serial/io_ti.c sem-10/drivers/usb/serial/io_ti.c
--- v2.6.12-rc3/drivers/usb/serial/io_ti.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/serial/io_ti.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/usb/serial/ti_usb_3410_5052.c sem-10/drivers/usb/serial/ti_usb_3410_5052.c
--- v2.6.12-rc3/drivers/usb/serial/ti_usb_3410_5052.c	2005-04-28 11:01:56.000000000 -0400
+++ sem-10/drivers/usb/serial/ti_usb_3410_5052.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/drivers/w1/w1.h sem-10/drivers/w1/w1.h
--- v2.6.12-rc3/drivers/w1/w1.h	2005-04-28 11:01:57.000000000 -0400
+++ sem-10/drivers/w1/w1.h	2005-04-28 11:16:50.000000000 -0400
@@ -44,7 +44,7 @@ struct w1_reg_num
 
 #include <net/sock.h>
 
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "w1_family.h"
 
diff -purN v2.6.12-rc3/fs/cramfs/inode.c sem-10/fs/cramfs/inode.c
--- v2.6.12-rc3/fs/cramfs/inode.c	2005-04-28 11:01:57.000000000 -0400
+++ sem-10/fs/cramfs/inode.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/fs/eventpoll.c sem-10/fs/eventpoll.c
--- v2.6.12-rc3/fs/eventpoll.c	2005-04-28 11:01:57.000000000 -0400
+++ sem-10/fs/eventpoll.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
 
 /*
diff -purN v2.6.12-rc3/fs/isofs/compress.c sem-10/fs/isofs/compress.c
--- v2.6.12-rc3/fs/isofs/compress.c	2005-04-06 17:28:07.000000000 -0400
+++ sem-10/fs/isofs/compress.c	2005-04-28 11:16:50.000000000 -0400
@@ -39,7 +39,7 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 
 #include "zisofs.h"
 
diff -purN v2.6.12-rc3/fs/jffs/inode-v23.c sem-10/fs/jffs/inode-v23.c
--- v2.6.12-rc3/fs/jffs/inode-v23.c	2005-04-28 11:01:58.000000000 -0400
+++ sem-10/fs/jffs/inode-v23.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/fs/jffs/intrep.c sem-10/fs/jffs/intrep.c
--- v2.6.12-rc3/fs/jffs/intrep.c	2005-04-28 11:01:58.000000000 -0400
+++ sem-10/fs/jffs/intrep.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/fs/jffs2/compr_zlib.c sem-10/fs/jffs2/compr_zlib.c
--- v2.6.12-rc3/fs/jffs2/compr_zlib.c	2005-04-06 17:28:07.000000000 -0400
+++ sem-10/fs/jffs2/compr_zlib.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/fs/locks.c sem-10/fs/locks.c
--- v2.6.12-rc3/fs/locks.c	2005-04-28 11:01:58.000000000 -0400
+++ sem-10/fs/locks.c	2005-04-28 11:16:50.000000000 -0400
@@ -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)
diff -purN v2.6.12-rc3/fs/ntfs/inode.h sem-10/fs/ntfs/inode.h
--- v2.6.12-rc3/fs/ntfs/inode.h	2004-12-24 16:35:24.000000000 -0500
+++ sem-10/fs/ntfs/inode.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/fs/partitions/devfs.c sem-10/fs/partitions/devfs.c
--- v2.6.12-rc3/fs/partitions/devfs.c	2004-12-24 16:35:49.000000000 -0500
+++ sem-10/fs/partitions/devfs.c	2005-04-28 11:16:50.000000000 -0400
@@ -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 {
diff -purN v2.6.12-rc3/fs/reiserfs/journal.c sem-10/fs/reiserfs/journal.c
--- v2.6.12-rc3/fs/reiserfs/journal.c	2005-04-28 11:01:58.000000000 -0400
+++ sem-10/fs/reiserfs/journal.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/fs/reiserfs/xattr.c sem-10/fs/reiserfs/xattr.c
--- v2.6.12-rc3/fs/reiserfs/xattr.c	2005-04-28 11:01:58.000000000 -0400
+++ sem-10/fs/reiserfs/xattr.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/fs/sysfs/file.c sem-10/fs/sysfs/file.c
--- v2.6.12-rc3/fs/sysfs/file.c	2005-04-28 11:01:58.000000000 -0400
+++ sem-10/fs/sysfs/file.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
 
diff -purN v2.6.12-rc3/fs/xfs/linux-2.6/mutex.h sem-10/fs/xfs/linux-2.6/mutex.h
--- v2.6.12-rc3/fs/xfs/linux-2.6/mutex.h	2004-12-24 16:35:50.000000000 -0500
+++ sem-10/fs/xfs/linux-2.6/mutex.h	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/fs/xfs/linux-2.6/sema.h sem-10/fs/xfs/linux-2.6/sema.h
--- v2.6.12-rc3/fs/xfs/linux-2.6/sema.h	2004-12-24 16:35:49.000000000 -0500
+++ sem-10/fs/xfs/linux-2.6/sema.h	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/include/asm-i386/mmu.h sem-10/include/asm-i386/mmu.h
--- v2.6.12-rc3/include/asm-i386/mmu.h	2004-12-24 16:35:00.000000000 -0500
+++ sem-10/include/asm-i386/mmu.h	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/include/asm-ia64/sn/nodepda.h sem-10/include/asm-ia64/sn/nodepda.h
--- v2.6.12-rc3/include/asm-ia64/sn/nodepda.h	2005-04-06 17:28:09.000000000 -0400
+++ sem-10/include/asm-ia64/sn/nodepda.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/include/asm-ppc/ocp.h sem-10/include/asm-ppc/ocp.h
--- v2.6.12-rc3/include/asm-ppc/ocp.h	2005-04-28 11:01:59.000000000 -0400
+++ sem-10/include/asm-ppc/ocp.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
 
diff -purN v2.6.12-rc3/include/asm-sh/dma.h sem-10/include/asm-sh/dma.h
--- v2.6.12-rc3/include/asm-sh/dma.h	2004-12-24 16:33:51.000000000 -0500
+++ sem-10/include/asm-sh/dma.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/asm-x86_64/mmu.h sem-10/include/asm-x86_64/mmu.h
--- v2.6.12-rc3/include/asm-x86_64/mmu.h	2004-12-24 16:35:25.000000000 -0500
+++ sem-10/include/asm-x86_64/mmu.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/linux/cpu.h sem-10/include/linux/cpu.h
--- v2.6.12-rc3/include/linux/cpu.h	2005-04-06 17:28:10.000000000 -0400
+++ sem-10/include/linux/cpu.h	2005-04-28 11:16:50.000000000 -0400
@@ -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 */
diff -purN v2.6.12-rc3/include/linux/devfs_fs_kernel.h sem-10/include/linux/devfs_fs_kernel.h
--- v2.6.12-rc3/include/linux/devfs_fs_kernel.h	2004-12-24 16:35:23.000000000 -0500
+++ sem-10/include/linux/devfs_fs_kernel.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/linux/device.h sem-10/include/linux/device.h
--- v2.6.12-rc3/include/linux/device.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/device.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/linux/fs.h sem-10/include/linux/fs.h
--- v2.6.12-rc3/include/linux/fs.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/fs.h	2005-04-28 11:16:50.000000000 -0400
@@ -213,9 +213,9 @@ extern int dir_notify_enable;
 #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;
diff -purN v2.6.12-rc3/include/linux/i2c.h sem-10/include/linux/i2c.h
--- v2.6.12-rc3/include/linux/i2c.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/i2c.h	2005-04-28 11:16:50.000000000 -0400
@@ -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 ------------------------------------------------	*/
 
diff -purN v2.6.12-rc3/include/linux/i2o.h sem-10/include/linux/i2o.h
--- v2.6.12-rc3/include/linux/i2o.h	2005-04-06 17:28:10.000000000 -0400
+++ sem-10/include/linux/i2o.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/include/linux/ide.h sem-10/include/linux/ide.h
--- v2.6.12-rc3/include/linux/ide.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/ide.h	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/include/linux/if_pppox.h sem-10/include/linux/if_pppox.h
--- v2.6.12-rc3/include/linux/if_pppox.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/if_pppox.h	2005-04-28 11:16:50.000000000 -0400
@@ -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__ */
 
diff -purN v2.6.12-rc3/include/linux/jbd.h sem-10/include/linux/jbd.h
--- v2.6.12-rc3/include/linux/jbd.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/jbd.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/linux/jffs2_fs_i.h sem-10/include/linux/jffs2_fs_i.h
--- v2.6.12-rc3/include/linux/jffs2_fs_i.h	2004-12-24 16:35:14.000000000 -0500
+++ sem-10/include/linux/jffs2_fs_i.h	2005-04-28 11:16:50.000000000 -0400
@@ -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.
diff -purN v2.6.12-rc3/include/linux/jffs2_fs_sb.h sem-10/include/linux/jffs2_fs_sb.h
--- v2.6.12-rc3/include/linux/jffs2_fs_sb.h	2005-04-06 17:28:10.000000000 -0400
+++ sem-10/include/linux/jffs2_fs_sb.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/include/linux/lp.h sem-10/include/linux/lp.h
--- v2.6.12-rc3/include/linux/lp.h	2005-04-06 17:28:10.000000000 -0400
+++ sem-10/include/linux/lp.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/linux/mtd/blktrans.h sem-10/include/linux/mtd/blktrans.h
--- v2.6.12-rc3/include/linux/mtd/blktrans.h	2004-12-24 16:35:01.000000000 -0500
+++ sem-10/include/linux/mtd/blktrans.h	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/include/linux/mtd/doc2000.h sem-10/include/linux/mtd/doc2000.h
--- v2.6.12-rc3/include/linux/mtd/doc2000.h	2005-04-06 17:28:10.000000000 -0400
+++ sem-10/include/linux/mtd/doc2000.h	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/include/linux/parport.h sem-10/include/linux/parport.h
--- v2.6.12-rc3/include/linux/parport.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/parport.h	2005-04-28 11:16:50.000000000 -0400
@@ -101,9 +101,9 @@ typedef enum {
 #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;
diff -purN v2.6.12-rc3/include/linux/raid/md.h sem-10/include/linux/raid/md.h
--- v2.6.12-rc3/include/linux/raid/md.h	2004-12-24 16:33:51.000000000 -0500
+++ sem-10/include/linux/raid/md.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/include/linux/sched.h sem-10/include/linux/sched.h
--- v2.6.12-rc3/include/linux/sched.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/sched.h	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/include/linux/seq_file.h sem-10/include/linux/seq_file.h
--- v2.6.12-rc3/include/linux/seq_file.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/linux/seq_file.h	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/include/linux/syscalls.h sem-10/include/linux/syscalls.h
--- v2.6.12-rc3/include/linux/syscalls.h	2005-04-06 17:28:11.000000000 -0400
+++ sem-10/include/linux/syscalls.h	2005-04-28 11:16:50.000000000 -0400
@@ -57,7 +57,7 @@ struct mq_attr;
 #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>
diff -purN v2.6.12-rc3/include/linux/udf_fs_sb.h sem-10/include/linux/udf_fs_sb.h
--- v2.6.12-rc3/include/linux/udf_fs_sb.h	2005-04-06 17:28:11.000000000 -0400
+++ sem-10/include/linux/udf_fs_sb.h	2005-04-28 11:16:50.000000000 -0400
@@ -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)
 
diff -purN v2.6.12-rc3/include/sound/core.h sem-10/include/sound/core.h
--- v2.6.12-rc3/include/sound/core.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/sound/core.h	2005-04-28 11:16:50.000000000 -0400
@@ -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 */
diff -purN v2.6.12-rc3/include/sound/rawmidi.h sem-10/include/sound/rawmidi.h
--- v2.6.12-rc3/include/sound/rawmidi.h	2005-04-28 11:02:01.000000000 -0400
+++ sem-10/include/sound/rawmidi.h	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/ipc/compat.c sem-10/ipc/compat.c
--- v2.6.12-rc3/ipc/compat.c	2004-12-24 16:34:57.000000000 -0500
+++ sem-10/ipc/compat.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/kernel/cpu.c sem-10/kernel/cpu.c
--- v2.6.12-rc3/kernel/cpu.c	2005-04-06 17:28:11.000000000 -0400
+++ sem-10/kernel/cpu.c	2005-04-28 11:16:50.000000000 -0400
@@ -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);
diff -purN v2.6.12-rc3/kernel/cpuset.c sem-10/kernel/cpuset.c
--- v2.6.12-rc3/kernel/cpuset.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/kernel/cpuset.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
 
diff -purN v2.6.12-rc3/kernel/kthread.c sem-10/kernel/kthread.c
--- v2.6.12-rc3/kernel/kthread.c	2005-04-06 17:28:11.000000000 -0400
+++ sem-10/kernel/kthread.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/kernel/module.c sem-10/kernel/module.c
--- v2.6.12-rc3/kernel/module.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/kernel/module.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/kernel/posix-timers.c sem-10/kernel/posix-timers.c
--- v2.6.12-rc3/kernel/posix-timers.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/kernel/posix-timers.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/kernel/profile.c sem-10/kernel/profile.c
--- v2.6.12-rc3/kernel/profile.c	2005-04-06 17:28:11.000000000 -0400
+++ sem-10/kernel/profile.c	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/kernel/stop_machine.c sem-10/kernel/stop_machine.c
--- v2.6.12-rc3/kernel/stop_machine.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/kernel/stop_machine.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/lib/reed_solomon/reed_solomon.c sem-10/lib/reed_solomon/reed_solomon.c
--- v2.6.12-rc3/lib/reed_solomon/reed_solomon.c	2005-04-06 17:28:11.000000000 -0400
+++ sem-10/lib/reed_solomon/reed_solomon.c	2005-04-28 11:16:50.000000000 -0400
@@ -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);
diff -purN v2.6.12-rc3/net/core/flow.c sem-10/net/core/flow.c
--- v2.6.12-rc3/net/core/flow.c	2004-12-24 16:33:50.000000000 -0500
+++ sem-10/net/core/flow.c	2005-04-28 11:16:50.000000000 -0400
@@ -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;
diff -purN v2.6.12-rc3/net/ipv4/ipcomp.c sem-10/net/ipv4/ipcomp.c
--- v2.6.12-rc3/net/ipv4/ipcomp.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/net/ipv4/ipcomp.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/net/ipv4/netfilter/arp_tables.c sem-10/net/ipv4/netfilter/arp_tables.c
--- v2.6.12-rc3/net/ipv4/netfilter/arp_tables.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/net/ipv4/netfilter/arp_tables.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/net/ipv4/netfilter/ip_tables.c sem-10/net/ipv4/netfilter/ip_tables.c
--- v2.6.12-rc3/net/ipv4/netfilter/ip_tables.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/net/ipv4/netfilter/ip_tables.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
 
diff -purN v2.6.12-rc3/net/ipv6/ipcomp6.c sem-10/net/ipv6/ipcomp6.c
--- v2.6.12-rc3/net/ipv6/ipcomp6.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/net/ipv6/ipcomp6.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/net/ipv6/netfilter/ip6_tables.c sem-10/net/ipv6/netfilter/ip6_tables.c
--- v2.6.12-rc3/net/ipv6/netfilter/ip6_tables.c	2005-04-28 11:02:02.000000000 -0400
+++ sem-10/net/ipv6/netfilter/ip6_tables.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/security/selinux/hooks.c sem-10/security/selinux/hooks.c
--- v2.6.12-rc3/security/selinux/hooks.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/security/selinux/hooks.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/security/selinux/selinuxfs.c sem-10/security/selinux/selinuxfs.c
--- v2.6.12-rc3/security/selinux/selinuxfs.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/security/selinux/selinuxfs.c	2005-04-28 11:16:50.000000000 -0400
@@ -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. */
diff -purN v2.6.12-rc3/security/selinux/ss/conditional.c sem-10/security/selinux/ss/conditional.c
--- v2.6.12-rc3/security/selinux/ss/conditional.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/security/selinux/ss/conditional.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/security/selinux/ss/services.c sem-10/security/selinux/ss/services.c
--- v2.6.12-rc3/security/selinux/ss/services.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/security/selinux/ss/services.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/sound/arm/sa11xx-uda1341.c sem-10/sound/arm/sa11xx-uda1341.c
--- v2.6.12-rc3/sound/arm/sa11xx-uda1341.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/sound/arm/sa11xx-uda1341.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/sound/core/memalloc.c sem-10/sound/core/memalloc.c
--- v2.6.12-rc3/sound/core/memalloc.c	2004-12-24 16:35:39.000000000 -0500
+++ sem-10/sound/core/memalloc.c	2005-04-28 11:16:50.000000000 -0400
@@ -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>
diff -purN v2.6.12-rc3/sound/core/seq/seq_midi.c sem-10/sound/core/seq/seq_midi.c
--- v2.6.12-rc3/sound/core/seq/seq_midi.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/sound/core/seq/seq_midi.c	2005-04-28 11:16:50.000000000 -0400
@@ -32,7 +32,7 @@ Possible options for midisynth module:
 #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>
diff -purN v2.6.12-rc3/sound/oss/aci.c sem-10/sound/oss/aci.c
--- v2.6.12-rc3/sound/oss/aci.c	2005-04-06 17:28:13.000000000 -0400
+++ sem-10/sound/oss/aci.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/sound/oss/dmasound/dmasound_awacs.c sem-10/sound/oss/dmasound/dmasound_awacs.c
--- v2.6.12-rc3/sound/oss/dmasound/dmasound_awacs.c	2005-04-28 11:02:03.000000000 -0400
+++ sem-10/sound/oss/dmasound/dmasound_awacs.c	2005-04-28 11:16:50.000000000 -0400
@@ -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
diff -purN v2.6.12-rc3/sound/oss/via82cxxx_audio.c sem-10/sound/oss/via82cxxx_audio.c
--- v2.6.12-rc3/sound/oss/via82cxxx_audio.c	2005-04-06 17:28:14.000000000 -0400
+++ sem-10/sound/oss/via82cxxx_audio.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"
diff -purN v2.6.12-rc3/sound/oss/vwsnd.c sem-10/sound/oss/vwsnd.c
--- v2.6.12-rc3/sound/oss/vwsnd.c	2005-04-06 17:28:14.000000000 -0400
+++ sem-10/sound/oss/vwsnd.c	2005-04-28 11:16:50.000000000 -0400
@@ -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"