projects/linux·commit 429f731d

Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

429f731d · Linus Torvalds <[email protected]> · 2008-04-21 15:41:27 -07:00

* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
  Deprecate the asm/semaphore.h files in feature-removal-schedule.
  Convert asm/semaphore.h users to linux/semaphore.h
  security: Remove unnecessary inclusions of asm/semaphore.h
  lib: Remove unnecessary inclusions of asm/semaphore.h
  kernel: Remove unnecessary inclusions of asm/semaphore.h
  include: Remove unnecessary inclusions of asm/semaphore.h
  fs: Remove unnecessary inclusions of asm/semaphore.h
  drivers: Remove unnecessary inclusions of asm/semaphore.h
  net: Remove unnecessary inclusions of asm/semaphore.h
  arch: Remove unnecessary inclusions of asm/semaphore.h
Commit
429f731dea577bdd43693940cdca524135287e6a
Parents
85b375a6 · d2f5e808

Merge commit. Changes below are compared with the first parent: 85b375a6.

Changes

136 files changed · +44 −143

FileStatusAddDelContent
Documentation/DocBook/kernel-locking.tmplmodified+3−3View file
Documentation/feature-removal-schedule.txtmodified+8−0View file
arch/arm/common/rtctime.cmodified+0−1View file
arch/arm/mach-aaec2000/clock.cmodified+0−2View file
arch/arm/mach-at91/clock.cmodified+0−1View file
arch/arm/mach-integrator/clock.cmodified+0−1View file
arch/arm/mach-pnx4008/clock.cmodified+0−1View file
arch/arm/mach-pnx4008/gpio.cmodified+0−1View file
arch/arm/mach-realview/clock.cmodified+0−1View file
arch/arm/mach-versatile/clock.cmodified+0−1View file
arch/arm/plat-omap/clock.cmodified+0−1View file
arch/ia64/kernel/salinfo.cmodified+1−1View file
arch/ia64/sn/kernel/sn2/sn_hwperf.cmodified+0−1View file
arch/m68k/atari/stram.cmodified+0−1View file
arch/m68k/sun3/intersil.cmodified+0−1View file
arch/mips/sgi-ip27/ip27-console.cmodified+0−1View file
arch/parisc/kernel/sys_parisc32.cmodified+0−1View file
arch/powerpc/kernel/rtas.cmodified+0−1View file
arch/powerpc/kernel/sys_ppc32.cmodified+0−1View file
arch/powerpc/kernel/syscalls.cmodified+0−1View file
arch/powerpc/platforms/cell/spufs/file.cmodified+0−1View file
arch/powerpc/platforms/cell/spufs/inode.cmodified+0−1View file
arch/powerpc/platforms/powermac/pfunc_core.cmodified+0−1View file
arch/ppc/syslib/ocp.cmodified+0−1View file
arch/s390/kernel/compat_linux.cmodified+0−1View file
arch/s390/kernel/debug.cmodified+0−1View file
arch/sparc64/kernel/sys_sparc32.cmodified+0−1View file
arch/v850/kernel/syscalls.cmodified+0−1View file
arch/x86/ia32/sys_ia32.cmodified+0−1View file
arch/x86/kernel/cpu/common.cmodified+0−1View file
arch/x86/kernel/cpu/proc.cmodified+0−1View file
drivers/ata/libata-core.cmodified+0−1View file
drivers/base/core.cmodified+1−1View file
drivers/block/cryptoloop.cmodified+0−1View file
drivers/char/generic_serial.cmodified+0−1View file
drivers/char/rio/rioboot.cmodified+0−1View file
drivers/char/rio/riocmd.cmodified+0−1View file
drivers/char/rio/rioctrl.cmodified+0−1View file
drivers/char/rio/rioinit.cmodified+0−1View file
drivers/char/rio/riointr.cmodified+0−1View file
drivers/char/rio/rioparam.cmodified+0−1View file
drivers/char/rio/rioroute.cmodified+0−1View file
drivers/char/rio/riotable.cmodified+0−1View file
drivers/char/rio/riotty.cmodified+0−1View file
drivers/char/snsc.hmodified+1−1View file
drivers/firewire/fw-device.cmodified+2−1View file
drivers/firewire/fw-transaction.cmodified+0−1View file
drivers/firmware/dcdbas.cmodified+0−1View file
drivers/i2c/i2c-core.cmodified+1−1View file
drivers/ieee1394/nodemgr.cmodified+1−1View file
drivers/infiniband/core/user_mad.cmodified+1−1View file
drivers/infiniband/hw/amso1100/c2.hmodified+0−1View file
drivers/infiniband/hw/mthca/mthca_dev.hmodified+1−2View file
drivers/infiniband/hw/nes/nes.hmodified+0−1View file
drivers/input/serio/hp_sdc_mlc.cmodified+1−1View file
drivers/lguest/lg.hmodified+0−1View file
drivers/macintosh/adb.cmodified+1−1View file
drivers/macintosh/windfarm_smu_sat.cmodified+1−1View file
drivers/media/radio/radio-aimslab.cmodified+0−1View file
drivers/media/video/ir-kbd-i2c.cmodified+0−1View file
drivers/media/video/ov511.cmodified+0−1View file
drivers/media/video/pvrusb2/pvrusb2-context.cmodified+0−1View file
drivers/media/video/pvrusb2/pvrusb2-hdw.cmodified+0−1View file
drivers/media/video/pvrusb2/pvrusb2-sysfs.cmodified+0−1View file
drivers/mfd/ucb1x00-ts.cmodified+0−1View file
drivers/net/3c527.cmodified+1−1View file
drivers/net/cxgb3/adapter.hmodified+0−1View file
drivers/net/cxgb3/t3cdev.hmodified+0−1View file
drivers/net/hamradio/6pack.cmodified+1−1View file
drivers/net/ibmveth.cmodified+0−1View file
drivers/net/netxen/netxen_nic_hdr.hmodified+0−1View file
drivers/net/usb/kaweth.cmodified+0−1View file
drivers/s390/cio/ccwgroup.cmodified+0−1View file
drivers/s390/cio/qdio.cmodified+1−1View file
drivers/scsi/aacraid/aachba.cmodified+0−1View file
drivers/scsi/aacraid/commctrl.cmodified+1−1View file
drivers/scsi/aacraid/comminit.cmodified+0−1View file
drivers/scsi/aacraid/commsup.cmodified+1−1View file
drivers/scsi/aacraid/dpcsup.cmodified+1−1View file
drivers/scsi/aacraid/linit.cmodified+0−1View file
drivers/scsi/aacraid/rx.cmodified+0−1View file
drivers/scsi/aacraid/sa.cmodified+0−1View file
drivers/scsi/dpt/dpti_i2o.hmodified+0−1View file
drivers/scsi/megaraid/mega_common.hmodified+0−1View file
drivers/scsi/megaraid/megaraid_ioctl.hmodified+1−1View file
drivers/scsi/qla2xxx/qla_def.hmodified+1−1View file
drivers/serial/mcfserial.cmodified+0−1View file
drivers/usb/atm/usbatm.hmodified+0−1View file
drivers/usb/core/hub.cmodified+0−1View file
drivers/usb/misc/appledisplay.cmodified+0−1View file
drivers/usb/serial/io_ti.cmodified+0−1View file
drivers/usb/serial/ti_usb_3410_5052.cmodified+0−1View file
drivers/watchdog/sc1200wdt.cmodified+1−1View file
fs/9p/fid.cmodified+0−1View file
fs/cramfs/inode.cmodified+0−1View file
fs/dlm/dlm_internal.hmodified+0−1View file
fs/jffs2/jffs2_fs_i.hmodified+1−1View file
fs/jffs2/jffs2_fs_sb.hmodified+1−1View file
fs/locks.cmodified+0−1View file
fs/reiserfs/journal.cmodified+1−1View file
fs/reiserfs/xattr.cmodified+0−1View file
fs/xfs/linux-2.6/sema.hmodified+1−1View file
include/asm-blackfin/dma.hmodified+0−1View file
include/asm-ia64/sn/nodepda.hmodified+0−1View file
include/asm-ppc/ocp.hmodified+0−1View file
include/linux/cpu.hmodified+0−1View file
include/linux/device.hmodified+1−1View file
include/linux/fs.hmodified+1−1View file
include/linux/hil_mlc.hmodified+1−1View file
include/linux/i2o.hmodified+1−1View file
include/linux/ide.hmodified+0−1View file
include/linux/if_pppox.hmodified+0−1View file
include/linux/jbd.hmodified+0−2View file
include/linux/jbd2.hmodified+0−2View file
include/linux/kernelcapi.hmodified+0−1View file
include/linux/memory.hmodified+1−2View file
include/linux/parport.hmodified+1−1View file
include/linux/raid/md.hmodified+0−1View file
include/linux/sched.hmodified+0−1View file
include/linux/syscalls.hmodified+0−1View file
include/scsi/libsas.hmodified+0−1View file
kernel/kexec.cmodified+0−1View file
kernel/kthread.cmodified+0−1View file
kernel/module.cmodified+1−2View file
kernel/posix-timers.cmodified+0−1View file
kernel/profile.cmodified+0−1View file
kernel/stop_machine.cmodified+0−1View file
lib/kernel_lock.cmodified+1−1View file
lib/reed_solomon/reed_solomon.cmodified+0−1View file
net/core/flow.cmodified+0−1View file
net/dccp/proto.cmodified+0−1View file
net/ipv4/ipcomp.cmodified+0−1View file
net/ipv6/ipcomp6.cmodified+0−1View file
security/selinux/selinuxfs.cmodified+0−1View file
security/selinux/ss/conditional.cmodified+0−1View file
security/selinux/xfrm.cmodified+0−1View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/kernel-locking.tmpl

View file
diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl
index 2e9d6b4..435413c 100644
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
@@ -241,7 +241,7 @@
</para>
<para>
The third type is a semaphore
- (<filename class="headerfile">include/asm/semaphore.h</filename>): it
+ (<filename class="headerfile">include/linux/semaphore.h</filename>): it
can have more than one holder at any time (the number decided at
initialization time), although it is most commonly used as a
single-holder lock (a mutex). If you can't get a semaphore, your
@@ -290,7 +290,7 @@
<para>
If you have a data structure which is only ever accessed from
user context, then you can use a simple semaphore
- (<filename>linux/asm/semaphore.h</filename>) to protect it. This
+ (<filename>linux/linux/semaphore.h</filename>) to protect it. This
is the most trivial case: you initialize the semaphore to the number
of resources available (usually 1), and call
<function>down_interruptible()</function> to grab the semaphore, and
@@ -1656,7 +1656,7 @@ the amount of locking which needs to be done.
#include &lt;linux/slab.h&gt;
#include &lt;linux/string.h&gt;
+#include &lt;linux/rcupdate.h&gt;
- #include &lt;asm/semaphore.h&gt;
+ #include &lt;linux/semaphore.h&gt;
#include &lt;asm/errno.h&gt;
struct object

Documentation/feature-removal-schedule.txt

View file
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 309c47b..b45ea28 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -298,3 +298,11 @@ Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb
ocfs2-tools. 2 years should be sufficient time to phase in new versions
which know to look in /sys/fs/o2cb.
+
+---------------------------
+
+What: asm/semaphore.h
+When: 2.6.26
+Why: Implementation became generic; users should now include
+ linux/semaphore.h instead.
+Who: Matthew Wilcox <[email protected]>

arch/arm/common/rtctime.c

View file
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
index f53bca4..aa8f773 100644
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@ -22,7 +22,6 @@
#include <linux/mutex.h>
#include <asm/rtc.h>
-#include <asm/semaphore.h>
static DECLARE_WAIT_QUEUE_HEAD(rtc_wait);
static struct fasync_struct *rtc_async_queue;

arch/arm/mach-aaec2000/clock.c

View file
diff --git a/arch/arm/mach-aaec2000/clock.c b/arch/arm/mach-aaec2000/clock.c
index 74aa7a3..e10ee15 100644
--- a/arch/arm/mach-aaec2000/clock.c
+++ b/arch/arm/mach-aaec2000/clock.c
@@ -18,8 +18,6 @@
#include <linux/clk.h>
#include <linux/mutex.h>
-#include <asm/semaphore.h>
-
#include "clock.h"
static LIST_HEAD(clocks);

arch/arm/mach-at91/clock.c

View file
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index de6424e..a33dfe4 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -23,7 +23,6 @@
#include <linux/delay.h>
#include <linux/clk.h>
-#include <asm/semaphore.h>
#include <asm/io.h>
#include <asm/mach-types.h>

arch/arm/mach-integrator/clock.c

View file
diff --git a/arch/arm/mach-integrator/clock.c b/arch/arm/mach-integrator/clock.c
index 95a1e26..8d761fd 100644
--- a/arch/arm/mach-integrator/clock.c
+++ b/arch/arm/mach-integrator/clock.c
@@ -17,7 +17,6 @@
#include <linux/clk.h>
#include <linux/mutex.h>
-#include <asm/semaphore.h>
#include <asm/hardware/icst525.h>
#include "clock.h"

arch/arm/mach-pnx4008/clock.c

View file
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c
index 8e00ed4..a5268c3 100644
--- a/arch/arm/mach-pnx4008/clock.c
+++ b/arch/arm/mach-pnx4008/clock.c
@@ -21,7 +21,6 @@
#include <linux/err.h>
#include <linux/delay.h>
-#include <asm/semaphore.h>
#include <asm/hardware.h>
#include <asm/io.h>

arch/arm/mach-pnx4008/gpio.c

View file
diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c
index 1ab84ce..ef179ca 100644
--- a/arch/arm/mach-pnx4008/gpio.c
+++ b/arch/arm/mach-pnx4008/gpio.c
@@ -17,7 +17,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm/semaphore.h>
#include <asm/io.h>
#include <asm/arch/platform.h>
#include <asm/arch/gpio.h>

arch/arm/mach-realview/clock.c

View file
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c
index 21325a4..3e706c5 100644
--- a/arch/arm/mach-realview/clock.c
+++ b/arch/arm/mach-realview/clock.c
@@ -16,7 +16,6 @@
#include <linux/clk.h>
#include <linux/mutex.h>
-#include <asm/semaphore.h>
#include <asm/hardware/icst307.h>
#include "clock.h"

arch/arm/mach-versatile/clock.c

View file
diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c
index 9858c96..9336508 100644
--- a/arch/arm/mach-versatile/clock.c
+++ b/arch/arm/mach-versatile/clock.c
@@ -17,7 +17,6 @@
#include <linux/clk.h>
#include <linux/mutex.h>
-#include <asm/semaphore.h>
#include <asm/hardware/icst307.h>
#include "clock.h"

arch/arm/plat-omap/clock.c

View file
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 32a533b..72d34a2 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -23,7 +23,6 @@
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <asm/semaphore.h>
#include <asm/arch/clock.h>

arch/ia64/kernel/salinfo.c

View file
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 779c3cc..b11bb50 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -44,8 +44,8 @@
#include <linux/smp.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>

arch/ia64/sn/kernel/sn2/sn_hwperf.c

View file
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 4b0d153..8cc0c47 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -37,7 +37,6 @@
#include <asm/processor.h>
#include <asm/topology.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <asm/sal.h>
#include <asm/sn/io.h>

arch/m68k/atari/stram.c

View file
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index 0055a6c..04c69ff 100644
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -29,7 +29,6 @@
#include <asm/atarihw.h>
#include <asm/atari_stram.h>
#include <asm/io.h>
-#include <asm/semaphore.h>
#undef DEBUG

arch/m68k/sun3/intersil.c

View file
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index db359d7..0116d20 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -15,7 +15,6 @@
#include <asm/errno.h>
#include <asm/system.h>
-#include <asm/semaphore.h>
#include <asm/rtc.h>
#include <asm/intersil.h>

arch/mips/sgi-ip27/ip27-console.c

View file
diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c
index 3ba8306..984e561 100644
--- a/arch/mips/sgi-ip27/ip27-console.c
+++ b/arch/mips/sgi-ip27/ip27-console.c
@@ -8,7 +8,6 @@
#include <linux/init.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>

arch/parisc/kernel/sys_parisc32.c

View file
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 50bbf33..71efd6a 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -49,7 +49,6 @@
#include <asm/types.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include <asm/mmu_context.h>
#include "sys32.h"

arch/powerpc/kernel/rtas.c

View file
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 52e95c2..fe8d951 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -26,7 +26,6 @@
#include <asm/prom.h>
#include <asm/rtas.h>
#include <asm/hvcall.h>
-#include <asm/semaphore.h>
#include <asm/machdep.h>
#include <asm/firmware.h>
#include <asm/page.h>

arch/powerpc/kernel/sys_ppc32.c

View file
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 4a4f5c6..fee9ee2 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -47,7 +47,6 @@
#include <asm/types.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-#include <asm/semaphore.h>
#include <asm/time.h>
#include <asm/mmu_context.h>
#include <asm/ppc-pci.h>

arch/powerpc/kernel/syscalls.c

View file
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 3b1d5dd..e722a4e 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -38,7 +38,6 @@
#include <linux/personality.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include <asm/syscalls.h>
#include <asm/time.h>
#include <asm/unistd.h>

arch/powerpc/platforms/cell/spufs/file.c

View file
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index f7a7e86..c7df0a6 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -32,7 +32,6 @@
#include <linux/marker.h>
#include <asm/io.h>
-#include <asm/semaphore.h>
#include <asm/spu.h>
#include <asm/spu_info.h>
#include <asm/uaccess.h>

arch/powerpc/platforms/cell/spufs/inode.c

View file
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 6d1228c..0c32a05 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -35,7 +35,6 @@
#include <linux/parser.h>
#include <asm/prom.h>
-#include <asm/semaphore.h>
#include <asm/spu.h>
#include <asm/spu_priv1.h>
#include <asm/uaccess.h>

arch/powerpc/platforms/powermac/pfunc_core.c

View file
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 8543423..96d5ce5 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/mutex.h>
-#include <asm/semaphore.h>
#include <asm/prom.h>
#include <asm/pmac_pfunc.h>

arch/ppc/syslib/ocp.c

View file
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c
index ac80370..a6fb7dc 100644
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
@@ -49,7 +49,6 @@
#include <asm/io.h>
#include <asm/ocp.h>
#include <asm/errno.h>
-#include <asm/semaphore.h>
//#define DBG(x) printk x
#define DBG(x)

arch/s390/kernel/compat_linux.c

View file
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 50b85d0..d7f2222 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -62,7 +62,6 @@
#include <asm/types.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include <net/scm.h>
#include <net/sock.h>

arch/s390/kernel/debug.c

View file
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 1e7d4ac..dff0568 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -17,7 +17,6 @@
#include <linux/ctype.h>
#include <linux/sysctl.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/fs.h>

arch/sparc64/kernel/sys_sparc32.c

View file
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 2455fa4..c1a61e9 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -55,7 +55,6 @@
#include <asm/types.h>
#include <asm/uaccess.h>
#include <asm/fpumacro.h>
-#include <asm/semaphore.h>
#include <asm/mmu_context.h>
#include <asm/compat_signal.h>

arch/v850/kernel/syscalls.c

View file
diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c
index 0a4df4d..003db9c 100644
--- a/arch/v850/kernel/syscalls.c
+++ b/arch/v850/kernel/syscalls.c
@@ -30,7 +30,6 @@
#include <linux/file.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include <asm/unistd.h>
/*

arch/x86/ia32/sys_ia32.c

View file
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index 7cede7a..f00afdf 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -43,7 +43,6 @@
#include <asm/mman.h>
#include <asm/types.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include <asm/atomic.h>
#include <asm/ia32.h>
#include <asm/vgtod.h>

arch/x86/kernel/cpu/common.c

View file
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d999d78..35b4f6a 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -5,7 +5,6 @@
#include <linux/module.h>
#include <linux/percpu.h>
#include <linux/bootmem.h>
-#include <asm/semaphore.h>
#include <asm/processor.h>
#include <asm/i387.h>
#include <asm/msr.h>

arch/x86/kernel/cpu/proc.c

View file
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index 0978a4a..0d0d905 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -1,7 +1,6 @@
#include <linux/smp.h>
#include <linux/timex.h>
#include <linux/string.h>
-#include <asm/semaphore.h>
#include <linux/seq_file.h>
#include <linux/cpufreq.h>

drivers/ata/libata-core.c

View file
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 733eb94..b0b00af 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -61,7 +61,6 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
-#include <asm/semaphore.h>
#include <asm/byteorder.h>
#include <linux/cdrom.h>

drivers/base/core.c

View file
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 24198ad..7c4b36c 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -20,7 +20,7 @@
#include <linux/notifier.h>
#include <linux/genhd.h>
#include <linux/kallsyms.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
#include "base.h"
#include "power/power.h"

drivers/block/cryptoloop.c

View file
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
index 2411678..8b6bb76 100644
--- a/drivers/block/cryptoloop.c
+++ b/drivers/block/cryptoloop.c
@@ -27,7 +27,6 @@
#include <linux/blkdev.h>
#include <linux/loop.h>
#include <linux/scatterlist.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
MODULE_LICENSE("GPL");

drivers/char/generic_serial.c

View file
diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c
index 8facf3e..7ed7da1 100644
--- a/drivers/char/generic_serial.c
+++ b/drivers/char/generic_serial.c
@@ -28,7 +28,6 @@
#include <linux/interrupt.h>
#include <linux/tty_flip.h>
#include <linux/delay.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#define DEBUG

drivers/char/rio/rioboot.c

View file
diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c
index eca2b95..d956dd3 100644
--- a/drivers/char/rio/rioboot.c
+++ b/drivers/char/rio/rioboot.c
@@ -35,7 +35,6 @@
#include <linux/termios.h>
#include <linux/serial.h>
#include <linux/vmalloc.h>
-#include <asm/semaphore.h>
#include <linux/generic_serial.h>
#include <linux/errno.h>
#include <linux/interrupt.h>

drivers/char/rio/riocmd.c

View file
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 7321d00..bf36959 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -41,7 +41,6 @@ static char *_riocmd_c_sccs_ = "@(#)riocmd.c 1.2";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/rioctrl.c

View file
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c
index 7ce7761..d8eb2bc 100644
--- a/drivers/char/rio/rioctrl.c
+++ b/drivers/char/rio/rioctrl.c
@@ -40,7 +40,6 @@ static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c 1.3";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/rioinit.c

View file
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
index 0794844..add1718 100644
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/char/rio/rioinit.c
@@ -40,7 +40,6 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/riointr.c

View file
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c
index ebc7634..4734e26 100644
--- a/drivers/char/rio/riointr.c
+++ b/drivers/char/rio/riointr.c
@@ -42,7 +42,6 @@ static char *_riointr_c_sccs_ = "@(#)riointr.c 1.2";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/rioparam.c

View file
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
index bb498d2..da276ed 100644
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/char/rio/rioparam.c
@@ -41,7 +41,6 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.c 1.3";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/rioroute.c

View file
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
index a99f3d9..85091ff 100644
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -39,7 +39,6 @@ static char *_rioroute_c_sccs_ = "@(#)rioroute.c 1.3";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/riotable.c

View file
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 9b52892..2b24488 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -42,7 +42,6 @@ static char *_riotable_c_sccs_ = "@(#)riotable.c 1.2";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/rio/riotty.c

View file
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index cfa5436..1cb8580 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -44,7 +44,6 @@ static char *_riotty_c_sccs_ = "@(#)riotty.c 1.3";
#include <asm/io.h>
#include <asm/system.h>
#include <asm/string.h>
-#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <linux/termios.h>

drivers/char/snsc.h

View file
diff --git a/drivers/char/snsc.h b/drivers/char/snsc.h
index 8a98169..4be62ed 100644
--- a/drivers/char/snsc.h
+++ b/drivers/char/snsc.h
@@ -22,8 +22,8 @@
#include <linux/kobject.h>
#include <linux/fs.h>
#include <linux/cdev.h>
+#include <linux/semaphore.h>
#include <asm/sn/types.h>
-#include <asm/semaphore.h>
#define CHUNKSIZE 127

drivers/firewire/fw-device.c

View file
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c
index 2d01bc1..d9c8daf 100644
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
@@ -26,7 +26,8 @@
#include <linux/delay.h>
#include <linux/idr.h>
#include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/rwsem.h>
+#include <linux/semaphore.h>
#include <asm/system.h>
#include <linux/ctype.h>
#include "fw-transaction.h"

drivers/firewire/fw-transaction.c

View file
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 3a59e9b..ccf0e4c 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -29,7 +29,6 @@
#include <linux/list.h>
#include <linux/kthread.h>
#include <asm/uaccess.h>
-#include <asm/semaphore.h>
#include "fw-transaction.h"
#include "fw-topology.h"

drivers/firmware/dcdbas.c

View file
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c
index 0ffef3b..f235940 100644
--- a/drivers/firmware/dcdbas.c
+++ b/drivers/firmware/dcdbas.c
@@ -35,7 +35,6 @@

This diff is incomplete. Download the complete patch.

drivers/i2c/i2c-core.c

View file

This diff is incomplete. Download the complete patch.

drivers/ieee1394/nodemgr.c

View file

This diff is incomplete. Download the complete patch.

drivers/infiniband/core/user_mad.c

View file

This diff is incomplete. Download the complete patch.

drivers/infiniband/hw/amso1100/c2.h

View file

This diff is incomplete. Download the complete patch.

drivers/infiniband/hw/mthca/mthca_dev.h

View file

This diff is incomplete. Download the complete patch.

drivers/infiniband/hw/nes/nes.h

View file

This diff is incomplete. Download the complete patch.

drivers/input/serio/hp_sdc_mlc.c

View file

This diff is incomplete. Download the complete patch.

drivers/lguest/lg.h

View file

This diff is incomplete. Download the complete patch.

drivers/macintosh/adb.c

View file

This diff is incomplete. Download the complete patch.

drivers/macintosh/windfarm_smu_sat.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/radio/radio-aimslab.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/video/ir-kbd-i2c.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/video/ov511.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/video/pvrusb2/pvrusb2-context.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/video/pvrusb2/pvrusb2-hdw.c

View file

This diff is incomplete. Download the complete patch.

drivers/media/video/pvrusb2/pvrusb2-sysfs.c

View file

This diff is incomplete. Download the complete patch.

drivers/mfd/ucb1x00-ts.c

View file

This diff is incomplete. Download the complete patch.

drivers/net/3c527.c

View file

This diff is incomplete. Download the complete patch.

drivers/net/cxgb3/adapter.h

View file

This diff is incomplete. Download the complete patch.

drivers/net/cxgb3/t3cdev.h

View file

This diff is incomplete. Download the complete patch.

drivers/net/hamradio/6pack.c

View file

This diff is incomplete. Download the complete patch.

drivers/net/ibmveth.c

View file

This diff is incomplete. Download the complete patch.

drivers/net/netxen/netxen_nic_hdr.h

View file

This diff is incomplete. Download the complete patch.

drivers/net/usb/kaweth.c

View file

This diff is incomplete. Download the complete patch.

drivers/s390/cio/ccwgroup.c

View file

This diff is incomplete. Download the complete patch.

drivers/s390/cio/qdio.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/aachba.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/commctrl.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/comminit.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/commsup.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/dpcsup.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/linit.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/rx.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/aacraid/sa.c

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/dpt/dpti_i2o.h

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/megaraid/mega_common.h

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/megaraid/megaraid_ioctl.h

View file

This diff is incomplete. Download the complete patch.

drivers/scsi/qla2xxx/qla_def.h

View file

This diff is incomplete. Download the complete patch.

drivers/serial/mcfserial.c

View file

This diff is incomplete. Download the complete patch.

drivers/usb/atm/usbatm.h

View file

This diff is incomplete. Download the complete patch.

drivers/usb/core/hub.c

View file

This diff is incomplete. Download the complete patch.

drivers/usb/misc/appledisplay.c

View file

This diff is incomplete. Download the complete patch.

drivers/usb/serial/io_ti.c

View file

This diff is incomplete. Download the complete patch.

drivers/usb/serial/ti_usb_3410_5052.c

View file

This diff is incomplete. Download the complete patch.

drivers/watchdog/sc1200wdt.c

View file

This diff is incomplete. Download the complete patch.

fs/9p/fid.c

View file

This diff is incomplete. Download the complete patch.

fs/cramfs/inode.c

View file

This diff is incomplete. Download the complete patch.

fs/dlm/dlm_internal.h

View file

This diff is incomplete. Download the complete patch.

fs/jffs2/jffs2_fs_i.h

View file

This diff is incomplete. Download the complete patch.

fs/jffs2/jffs2_fs_sb.h

View file

This diff is incomplete. Download the complete patch.

fs/locks.c

View file

This diff is incomplete. Download the complete patch.

fs/reiserfs/journal.c

View file

This diff is incomplete. Download the complete patch.

fs/reiserfs/xattr.c

View file

This diff is incomplete. Download the complete patch.

fs/xfs/linux-2.6/sema.h

View file

This diff is incomplete. Download the complete patch.

include/asm-blackfin/dma.h

View file

This diff is incomplete. Download the complete patch.

include/asm-ia64/sn/nodepda.h

View file

This diff is incomplete. Download the complete patch.

include/asm-ppc/ocp.h

View file

This diff is incomplete. Download the complete patch.

include/linux/cpu.h

View file

This diff is incomplete. Download the complete patch.

include/linux/device.h

View file

This diff is incomplete. Download the complete patch.

include/linux/fs.h

View file

This diff is incomplete. Download the complete patch.

include/linux/hil_mlc.h

View file

This diff is incomplete. Download the complete patch.

include/linux/i2o.h

View file

This diff is incomplete. Download the complete patch.

include/linux/ide.h

View file

This diff is incomplete. Download the complete patch.

include/linux/if_pppox.h

View file

This diff is incomplete. Download the complete patch.

include/linux/jbd.h

View file

This diff is incomplete. Download the complete patch.

include/linux/jbd2.h

View file

This diff is incomplete. Download the complete patch.

include/linux/kernelcapi.h

View file

This diff is incomplete. Download the complete patch.

include/linux/memory.h

View file

This diff is incomplete. Download the complete patch.

include/linux/parport.h

View file

This diff is incomplete. Download the complete patch.

include/linux/raid/md.h

View file

This diff is incomplete. Download the complete patch.

include/linux/sched.h

View file

This diff is incomplete. Download the complete patch.

include/linux/syscalls.h

View file

This diff is incomplete. Download the complete patch.

include/scsi/libsas.h

View file

This diff is incomplete. Download the complete patch.

kernel/kexec.c

View file

This diff is incomplete. Download the complete patch.

kernel/kthread.c

View file

This diff is incomplete. Download the complete patch.

kernel/module.c

View file

This diff is incomplete. Download the complete patch.

kernel/posix-timers.c

View file

This diff is incomplete. Download the complete patch.

kernel/profile.c

View file

This diff is incomplete. Download the complete patch.

kernel/stop_machine.c

View file

This diff is incomplete. Download the complete patch.

lib/kernel_lock.c

View file

This diff is incomplete. Download the complete patch.

lib/reed_solomon/reed_solomon.c

View file

This diff is incomplete. Download the complete patch.

net/core/flow.c

View file

This diff is incomplete. Download the complete patch.

net/dccp/proto.c

View file

This diff is incomplete. Download the complete patch.

net/ipv4/ipcomp.c

View file

This diff is incomplete. Download the complete patch.

net/ipv6/ipcomp6.c

View file

This diff is incomplete. Download the complete patch.

security/selinux/selinuxfs.c

View file

This diff is incomplete. Download the complete patch.

security/selinux/ss/conditional.c

View file

This diff is incomplete. Download the complete patch.

security/selinux/xfrm.c

View file

This diff is incomplete. Download the complete patch.