tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* '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

Linus Torvalds 429f731d 85b375a6

+44 -143
+3 -3
Documentation/DocBook/kernel-locking.tmpl
··· 241 241 </para> 242 242 <para> 243 243 The third type is a semaphore 244 - (<filename class="headerfile">include/asm/semaphore.h</filename>): it 244 + (<filename class="headerfile">include/linux/semaphore.h</filename>): it 245 245 can have more than one holder at any time (the number decided at 246 246 initialization time), although it is most commonly used as a 247 247 single-holder lock (a mutex). If you can't get a semaphore, your ··· 290 290 <para> 291 291 If you have a data structure which is only ever accessed from 292 292 user context, then you can use a simple semaphore 293 - (<filename>linux/asm/semaphore.h</filename>) to protect it. This 293 + (<filename>linux/linux/semaphore.h</filename>) to protect it. This 294 294 is the most trivial case: you initialize the semaphore to the number 295 295 of resources available (usually 1), and call 296 296 <function>down_interruptible()</function> to grab the semaphore, and ··· 1656 1656 #include &lt;linux/slab.h&gt; 1657 1657 #include &lt;linux/string.h&gt; 1658 1658 +#include &lt;linux/rcupdate.h&gt; 1659 - #include &lt;asm/semaphore.h&gt; 1659 + #include &lt;linux/semaphore.h&gt; 1660 1660 #include &lt;asm/errno.h&gt; 1661 1661 1662 1662 struct object
+8
Documentation/feature-removal-schedule.txt
··· 298 298 ocfs2-tools. 2 years should be sufficient time to phase in new versions 299 299 which know to look in /sys/fs/o2cb. 300 300 Who: ocfs2-devel@oss.oracle.com 301 + 302 + --------------------------- 303 + 304 + What: asm/semaphore.h 305 + When: 2.6.26 306 + Why: Implementation became generic; users should now include 307 + linux/semaphore.h instead. 308 + Who: Matthew Wilcox <willy@linux.intel.com>
-1
arch/arm/common/rtctime.c
··· 22 22 #include <linux/mutex.h> 23 23 24 24 #include <asm/rtc.h> 25 - #include <asm/semaphore.h> 26 25 27 26 static DECLARE_WAIT_QUEUE_HEAD(rtc_wait); 28 27 static struct fasync_struct *rtc_async_queue;
-2
arch/arm/mach-aaec2000/clock.c
··· 18 18 #include <linux/clk.h> 19 19 #include <linux/mutex.h> 20 20 21 - #include <asm/semaphore.h> 22 - 23 21 #include "clock.h" 24 22 25 23 static LIST_HEAD(clocks);
-1
arch/arm/mach-at91/clock.c
··· 23 23 #include <linux/delay.h> 24 24 #include <linux/clk.h> 25 25 26 - #include <asm/semaphore.h> 27 26 #include <asm/io.h> 28 27 #include <asm/mach-types.h> 29 28
-1
arch/arm/mach-integrator/clock.c
··· 17 17 #include <linux/clk.h> 18 18 #include <linux/mutex.h> 19 19 20 - #include <asm/semaphore.h> 21 20 #include <asm/hardware/icst525.h> 22 21 23 22 #include "clock.h"
-1
arch/arm/mach-pnx4008/clock.c
··· 21 21 #include <linux/err.h> 22 22 #include <linux/delay.h> 23 23 24 - #include <asm/semaphore.h> 25 24 #include <asm/hardware.h> 26 25 #include <asm/io.h> 27 26
-1
arch/arm/mach-pnx4008/gpio.c
··· 17 17 #include <linux/types.h> 18 18 #include <linux/kernel.h> 19 19 #include <linux/module.h> 20 - #include <asm/semaphore.h> 21 20 #include <asm/io.h> 22 21 #include <asm/arch/platform.h> 23 22 #include <asm/arch/gpio.h>
-1
arch/arm/mach-realview/clock.c
··· 16 16 #include <linux/clk.h> 17 17 #include <linux/mutex.h> 18 18 19 - #include <asm/semaphore.h> 20 19 #include <asm/hardware/icst307.h> 21 20 22 21 #include "clock.h"
-1
arch/arm/mach-versatile/clock.c
··· 17 17 #include <linux/clk.h> 18 18 #include <linux/mutex.h> 19 19 20 - #include <asm/semaphore.h> 21 20 #include <asm/hardware/icst307.h> 22 21 23 22 #include "clock.h"
-1
arch/arm/plat-omap/clock.c
··· 23 23 #include <linux/platform_device.h> 24 24 25 25 #include <asm/io.h> 26 - #include <asm/semaphore.h> 27 26 28 27 #include <asm/arch/clock.h> 29 28
+1 -1
arch/ia64/kernel/salinfo.c
··· 44 44 #include <linux/smp.h> 45 45 #include <linux/timer.h> 46 46 #include <linux/vmalloc.h> 47 + #include <linux/semaphore.h> 47 48 48 - #include <asm/semaphore.h> 49 49 #include <asm/sal.h> 50 50 #include <asm/uaccess.h> 51 51
-1
arch/ia64/sn/kernel/sn2/sn_hwperf.c
··· 37 37 38 38 #include <asm/processor.h> 39 39 #include <asm/topology.h> 40 - #include <asm/semaphore.h> 41 40 #include <asm/uaccess.h> 42 41 #include <asm/sal.h> 43 42 #include <asm/sn/io.h>
-1
arch/m68k/atari/stram.c
··· 29 29 #include <asm/atarihw.h> 30 30 #include <asm/atari_stram.h> 31 31 #include <asm/io.h> 32 - #include <asm/semaphore.h> 33 32 34 33 #undef DEBUG 35 34
-1
arch/m68k/sun3/intersil.c
··· 15 15 16 16 #include <asm/errno.h> 17 17 #include <asm/system.h> 18 - #include <asm/semaphore.h> 19 18 #include <asm/rtc.h> 20 19 #include <asm/intersil.h> 21 20
-1
arch/mips/sgi-ip27/ip27-console.c
··· 8 8 #include <linux/init.h> 9 9 10 10 #include <asm/page.h> 11 - #include <asm/semaphore.h> 12 11 #include <asm/sn/addrs.h> 13 12 #include <asm/sn/sn0/hub.h> 14 13 #include <asm/sn/klconfig.h>
-1
arch/parisc/kernel/sys_parisc32.c
··· 49 49 50 50 #include <asm/types.h> 51 51 #include <asm/uaccess.h> 52 - #include <asm/semaphore.h> 53 52 #include <asm/mmu_context.h> 54 53 55 54 #include "sys32.h"
-1
arch/powerpc/kernel/rtas.c
··· 26 26 #include <asm/prom.h> 27 27 #include <asm/rtas.h> 28 28 #include <asm/hvcall.h> 29 - #include <asm/semaphore.h> 30 29 #include <asm/machdep.h> 31 30 #include <asm/firmware.h> 32 31 #include <asm/page.h>
-1
arch/powerpc/kernel/sys_ppc32.c
··· 47 47 #include <asm/types.h> 48 48 #include <asm/uaccess.h> 49 49 #include <asm/unistd.h> 50 - #include <asm/semaphore.h> 51 50 #include <asm/time.h> 52 51 #include <asm/mmu_context.h> 53 52 #include <asm/ppc-pci.h>
-1
arch/powerpc/kernel/syscalls.c
··· 38 38 #include <linux/personality.h> 39 39 40 40 #include <asm/uaccess.h> 41 - #include <asm/semaphore.h> 42 41 #include <asm/syscalls.h> 43 42 #include <asm/time.h> 44 43 #include <asm/unistd.h>
-1
arch/powerpc/platforms/cell/spufs/file.c
··· 32 32 #include <linux/marker.h> 33 33 34 34 #include <asm/io.h> 35 - #include <asm/semaphore.h> 36 35 #include <asm/spu.h> 37 36 #include <asm/spu_info.h> 38 37 #include <asm/uaccess.h>
-1
arch/powerpc/platforms/cell/spufs/inode.c
··· 35 35 #include <linux/parser.h> 36 36 37 37 #include <asm/prom.h> 38 - #include <asm/semaphore.h> 39 38 #include <asm/spu.h> 40 39 #include <asm/spu_priv1.h> 41 40 #include <asm/uaccess.h>
-1
arch/powerpc/platforms/powermac/pfunc_core.c
··· 12 12 #include <linux/module.h> 13 13 #include <linux/mutex.h> 14 14 15 - #include <asm/semaphore.h> 16 15 #include <asm/prom.h> 17 16 #include <asm/pmac_pfunc.h> 18 17
-1
arch/ppc/syslib/ocp.c
··· 49 49 #include <asm/io.h> 50 50 #include <asm/ocp.h> 51 51 #include <asm/errno.h> 52 - #include <asm/semaphore.h> 53 52 54 53 //#define DBG(x) printk x 55 54 #define DBG(x)
-1
arch/s390/kernel/compat_linux.c
··· 62 62 63 63 #include <asm/types.h> 64 64 #include <asm/uaccess.h> 65 - #include <asm/semaphore.h> 66 65 67 66 #include <net/scm.h> 68 67 #include <net/sock.h>
-1
arch/s390/kernel/debug.c
··· 17 17 #include <linux/ctype.h> 18 18 #include <linux/sysctl.h> 19 19 #include <asm/uaccess.h> 20 - #include <asm/semaphore.h> 21 20 #include <linux/module.h> 22 21 #include <linux/init.h> 23 22 #include <linux/fs.h>
-1
arch/sparc64/kernel/sys_sparc32.c
··· 55 55 #include <asm/types.h> 56 56 #include <asm/uaccess.h> 57 57 #include <asm/fpumacro.h> 58 - #include <asm/semaphore.h> 59 58 #include <asm/mmu_context.h> 60 59 #include <asm/compat_signal.h> 61 60
-1
arch/v850/kernel/syscalls.c
··· 30 30 #include <linux/file.h> 31 31 32 32 #include <asm/uaccess.h> 33 - #include <asm/semaphore.h> 34 33 #include <asm/unistd.h> 35 34 36 35 /*
-1
arch/x86/ia32/sys_ia32.c
··· 43 43 #include <asm/mman.h> 44 44 #include <asm/types.h> 45 45 #include <asm/uaccess.h> 46 - #include <asm/semaphore.h> 47 46 #include <asm/atomic.h> 48 47 #include <asm/ia32.h> 49 48 #include <asm/vgtod.h>
-1
arch/x86/kernel/cpu/common.c
··· 5 5 #include <linux/module.h> 6 6 #include <linux/percpu.h> 7 7 #include <linux/bootmem.h> 8 - #include <asm/semaphore.h> 9 8 #include <asm/processor.h> 10 9 #include <asm/i387.h> 11 10 #include <asm/msr.h>
-1
arch/x86/kernel/cpu/proc.c
··· 1 1 #include <linux/smp.h> 2 2 #include <linux/timex.h> 3 3 #include <linux/string.h> 4 - #include <asm/semaphore.h> 5 4 #include <linux/seq_file.h> 6 5 #include <linux/cpufreq.h> 7 6
-1
drivers/ata/libata-core.c
··· 61 61 #include <scsi/scsi_cmnd.h> 62 62 #include <scsi/scsi_host.h> 63 63 #include <linux/libata.h> 64 - #include <asm/semaphore.h> 65 64 #include <asm/byteorder.h> 66 65 #include <linux/cdrom.h> 67 66
+1 -1
drivers/base/core.c
··· 20 20 #include <linux/notifier.h> 21 21 #include <linux/genhd.h> 22 22 #include <linux/kallsyms.h> 23 - #include <asm/semaphore.h> 23 + #include <linux/semaphore.h> 24 24 25 25 #include "base.h" 26 26 #include "power/power.h"
-1
drivers/block/cryptoloop.c
··· 27 27 #include <linux/blkdev.h> 28 28 #include <linux/loop.h> 29 29 #include <linux/scatterlist.h> 30 - #include <asm/semaphore.h> 31 30 #include <asm/uaccess.h> 32 31 33 32 MODULE_LICENSE("GPL");
-1
drivers/char/generic_serial.c
··· 28 28 #include <linux/interrupt.h> 29 29 #include <linux/tty_flip.h> 30 30 #include <linux/delay.h> 31 - #include <asm/semaphore.h> 32 31 #include <asm/uaccess.h> 33 32 34 33 #define DEBUG
-1
drivers/char/rio/rioboot.c
··· 35 35 #include <linux/termios.h> 36 36 #include <linux/serial.h> 37 37 #include <linux/vmalloc.h> 38 - #include <asm/semaphore.h> 39 38 #include <linux/generic_serial.h> 40 39 #include <linux/errno.h> 41 40 #include <linux/interrupt.h>
-1
drivers/char/rio/riocmd.c
··· 41 41 #include <asm/io.h> 42 42 #include <asm/system.h> 43 43 #include <asm/string.h> 44 - #include <asm/semaphore.h> 45 44 #include <asm/uaccess.h> 46 45 47 46 #include <linux/termios.h>
-1
drivers/char/rio/rioctrl.c
··· 40 40 #include <asm/io.h> 41 41 #include <asm/system.h> 42 42 #include <asm/string.h> 43 - #include <asm/semaphore.h> 44 43 #include <asm/uaccess.h> 45 44 46 45 #include <linux/termios.h>
-1
drivers/char/rio/rioinit.c
··· 40 40 #include <asm/io.h> 41 41 #include <asm/system.h> 42 42 #include <asm/string.h> 43 - #include <asm/semaphore.h> 44 43 #include <asm/uaccess.h> 45 44 46 45 #include <linux/termios.h>
-1
drivers/char/rio/riointr.c
··· 42 42 #include <asm/io.h> 43 43 #include <asm/system.h> 44 44 #include <asm/string.h> 45 - #include <asm/semaphore.h> 46 45 #include <asm/uaccess.h> 47 46 48 47 #include <linux/termios.h>
-1
drivers/char/rio/rioparam.c
··· 41 41 #include <asm/io.h> 42 42 #include <asm/system.h> 43 43 #include <asm/string.h> 44 - #include <asm/semaphore.h> 45 44 #include <asm/uaccess.h> 46 45 47 46 #include <linux/termios.h>
-1
drivers/char/rio/rioroute.c
··· 39 39 #include <asm/io.h> 40 40 #include <asm/system.h> 41 41 #include <asm/string.h> 42 - #include <asm/semaphore.h> 43 42 #include <asm/uaccess.h> 44 43 45 44 #include <linux/termios.h>
-1
drivers/char/rio/riotable.c
··· 42 42 #include <asm/io.h> 43 43 #include <asm/system.h> 44 44 #include <asm/string.h> 45 - #include <asm/semaphore.h> 46 45 #include <asm/uaccess.h> 47 46 48 47 #include <linux/termios.h>
-1
drivers/char/rio/riotty.c
··· 44 44 #include <asm/io.h> 45 45 #include <asm/system.h> 46 46 #include <asm/string.h> 47 - #include <asm/semaphore.h> 48 47 #include <asm/uaccess.h> 49 48 50 49 #include <linux/termios.h>
+1 -1
drivers/char/snsc.h
··· 22 22 #include <linux/kobject.h> 23 23 #include <linux/fs.h> 24 24 #include <linux/cdev.h> 25 + #include <linux/semaphore.h> 25 26 #include <asm/sn/types.h> 26 - #include <asm/semaphore.h> 27 27 28 28 #define CHUNKSIZE 127 29 29
+2 -1
drivers/firewire/fw-device.c
··· 26 26 #include <linux/delay.h> 27 27 #include <linux/idr.h> 28 28 #include <linux/string.h> 29 - #include <asm/semaphore.h> 29 + #include <linux/rwsem.h> 30 + #include <linux/semaphore.h> 30 31 #include <asm/system.h> 31 32 #include <linux/ctype.h> 32 33 #include "fw-transaction.h"
-1
drivers/firewire/fw-transaction.c
··· 29 29 #include <linux/list.h> 30 30 #include <linux/kthread.h> 31 31 #include <asm/uaccess.h> 32 - #include <asm/semaphore.h> 33 32 34 33 #include "fw-transaction.h" 35 34 #include "fw-topology.h"
-1
drivers/firmware/dcdbas.c
··· 35 35 #include <linux/types.h> 36 36 #include <linux/mutex.h> 37 37 #include <asm/io.h> 38 - #include <asm/semaphore.h> 39 38 40 39 #include "dcdbas.h" 41 40
+1 -1
drivers/i2c/i2c-core.c
··· 35 35 #include <linux/completion.h> 36 36 #include <linux/hardirq.h> 37 37 #include <linux/irqflags.h> 38 + #include <linux/semaphore.h> 38 39 #include <asm/uaccess.h> 39 - #include <asm/semaphore.h> 40 40 41 41 #include "i2c-core.h" 42 42
+1 -1
drivers/ieee1394/nodemgr.c
··· 18 18 #include <linux/moduleparam.h> 19 19 #include <linux/mutex.h> 20 20 #include <linux/freezer.h> 21 + #include <linux/semaphore.h> 21 22 #include <asm/atomic.h> 22 - #include <asm/semaphore.h> 23 23 24 24 #include "csr.h" 25 25 #include "highlevel.h"
+1 -1
drivers/infiniband/core/user_mad.c
··· 46 46 #include <linux/mutex.h> 47 47 #include <linux/kref.h> 48 48 #include <linux/compat.h> 49 + #include <linux/semaphore.h> 49 50 50 51 #include <asm/uaccess.h> 51 - #include <asm/semaphore.h> 52 52 53 53 #include <rdma/ib_mad.h> 54 54 #include <rdma/ib_user_mad.h>
-1
drivers/infiniband/hw/amso1100/c2.h
··· 40 40 #include <linux/pci.h> 41 41 #include <linux/dma-mapping.h> 42 42 #include <linux/idr.h> 43 - #include <asm/semaphore.h> 44 43 45 44 #include "c2_provider.h" 46 45 #include "c2_mq.h"
+1 -2
drivers/infiniband/hw/mthca/mthca_dev.h
··· 46 46 #include <linux/timer.h> 47 47 #include <linux/mutex.h> 48 48 #include <linux/list.h> 49 - 50 - #include <asm/semaphore.h> 49 + #include <linux/semaphore.h> 51 50 52 51 #include "mthca_provider.h" 53 52 #include "mthca_doorbell.h"
-1
drivers/infiniband/hw/nes/nes.h
··· 43 43 #include <linux/dma-mapping.h> 44 44 #include <linux/workqueue.h> 45 45 #include <linux/slab.h> 46 - #include <asm/semaphore.h> 47 46 #include <linux/version.h> 48 47 #include <asm/io.h> 49 48 #include <linux/crc32c.h>
+1 -1
drivers/input/serio/hp_sdc_mlc.c
··· 40 40 #include <linux/module.h> 41 41 #include <linux/init.h> 42 42 #include <linux/string.h> 43 - #include <asm/semaphore.h> 43 + #include <linux/semaphore.h> 44 44 45 45 #define PREFIX "HP SDC MLC: " 46 46
-1
drivers/lguest/lg.h
··· 10 10 #include <linux/wait.h> 11 11 #include <linux/hrtimer.h> 12 12 #include <linux/err.h> 13 - #include <asm/semaphore.h> 14 13 15 14 #include <asm/lguest.h> 16 15
+1 -1
drivers/macintosh/adb.c
··· 37 37 #include <linux/device.h> 38 38 #include <linux/kthread.h> 39 39 #include <linux/platform_device.h> 40 + #include <linux/semaphore.h> 40 41 41 42 #include <asm/uaccess.h> 42 - #include <asm/semaphore.h> 43 43 #ifdef CONFIG_PPC 44 44 #include <asm/prom.h> 45 45 #include <asm/machdep.h>
+1 -1
drivers/macintosh/windfarm_smu_sat.c
··· 13 13 #include <linux/init.h> 14 14 #include <linux/wait.h> 15 15 #include <linux/i2c.h> 16 - #include <asm/semaphore.h> 16 + #include <linux/semaphore.h> 17 17 #include <asm/prom.h> 18 18 #include <asm/smu.h> 19 19 #include <asm/pmac_low_i2c.h>
-1
drivers/media/radio/radio-aimslab.c
··· 36 36 #include <asm/uaccess.h> /* copy to/from user */ 37 37 #include <linux/videodev2.h> /* kernel radio structs */ 38 38 #include <media/v4l2-common.h> 39 - #include <asm/semaphore.h> /* Lock for the I/O */ 40 39 41 40 #include <linux/version.h> /* for KERNEL_VERSION MACRO */ 42 41 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
-1
drivers/media/video/ir-kbd-i2c.c
··· 40 40 #include <linux/i2c.h> 41 41 #include <linux/i2c-id.h> 42 42 #include <linux/workqueue.h> 43 - #include <asm/semaphore.h> 44 43 45 44 #include <media/ir-common.h> 46 45 #include <media/ir-kbd-i2c.h>
-1
drivers/media/video/ov511.c
··· 41 41 #include <linux/slab.h> 42 42 #include <linux/ctype.h> 43 43 #include <linux/pagemap.h> 44 - #include <asm/semaphore.h> 45 44 #include <asm/processor.h> 46 45 #include <linux/mm.h> 47 46 #include <linux/device.h>
-1
drivers/media/video/pvrusb2/pvrusb2-context.c
··· 26 26 #include <linux/errno.h> 27 27 #include <linux/string.h> 28 28 #include <linux/slab.h> 29 - #include <asm/semaphore.h> 30 29 31 30 32 31 static void pvr2_context_destroy(struct pvr2_context *mp)
-1
drivers/media/video/pvrusb2/pvrusb2-hdw.c
··· 25 25 #include <linux/firmware.h> 26 26 #include <linux/videodev2.h> 27 27 #include <media/v4l2-common.h> 28 - #include <asm/semaphore.h> 29 28 #include "pvrusb2.h" 30 29 #include "pvrusb2-std.h" 31 30 #include "pvrusb2-util.h"
-1
drivers/media/video/pvrusb2/pvrusb2-sysfs.c
··· 21 21 22 22 #include <linux/string.h> 23 23 #include <linux/slab.h> 24 - #include <asm/semaphore.h> 25 24 #include "pvrusb2-sysfs.h" 26 25 #include "pvrusb2-hdw.h" 27 26 #include "pvrusb2-debug.h"
-1
drivers/mfd/ucb1x00-ts.c
··· 32 32 #include <linux/kthread.h> 33 33 34 34 #include <asm/dma.h> 35 - #include <asm/semaphore.h> 36 35 #include <asm/arch/collie.h> 37 36 #include <asm/mach-types.h> 38 37
+1 -1
drivers/net/3c527.c
··· 103 103 #include <linux/ethtool.h> 104 104 #include <linux/completion.h> 105 105 #include <linux/bitops.h> 106 + #include <linux/semaphore.h> 106 107 107 - #include <asm/semaphore.h> 108 108 #include <asm/uaccess.h> 109 109 #include <asm/system.h> 110 110 #include <asm/io.h>
-1
drivers/net/cxgb3/adapter.h
··· 43 43 #include <linux/mutex.h> 44 44 #include <linux/bitops.h> 45 45 #include "t3cdev.h" 46 - #include <asm/semaphore.h> 47 46 #include <asm/io.h> 48 47 49 48 struct vlan_group;
-1
drivers/net/cxgb3/t3cdev.h
··· 34 34 35 35 #include <linux/list.h> 36 36 #include <asm/atomic.h> 37 - #include <asm/semaphore.h> 38 37 #include <linux/netdevice.h> 39 38 #include <linux/proc_fs.h> 40 39 #include <linux/skbuff.h>
+1 -1
drivers/net/hamradio/6pack.c
··· 33 33 #include <linux/init.h> 34 34 #include <linux/ip.h> 35 35 #include <linux/tcp.h> 36 - #include <asm/semaphore.h> 36 + #include <linux/semaphore.h> 37 37 #include <asm/atomic.h> 38 38 39 39 #define SIXPACK_VERSION "Revision: 0.3.0"
-1
drivers/net/ibmveth.c
··· 49 49 #include <linux/in.h> 50 50 #include <linux/ip.h> 51 51 #include <net/net_namespace.h> 52 - #include <asm/semaphore.h> 53 52 #include <asm/hvcall.h> 54 53 #include <asm/atomic.h> 55 54 #include <asm/vio.h>
-1
drivers/net/netxen/netxen_nic_hdr.h
··· 34 34 #include <linux/kernel.h> 35 35 #include <linux/version.h> 36 36 37 - #include <asm/semaphore.h> 38 37 #include <linux/spinlock.h> 39 38 #include <asm/irq.h> 40 39 #include <linux/init.h>
-1
drivers/net/usb/kaweth.c
··· 58 58 #include <linux/dma-mapping.h> 59 59 #include <linux/wait.h> 60 60 #include <asm/uaccess.h> 61 - #include <asm/semaphore.h> 62 61 #include <asm/byteorder.h> 63 62 64 63 #undef DEBUG
-1
drivers/s390/cio/ccwgroup.c
··· 16 16 #include <linux/ctype.h> 17 17 #include <linux/dcache.h> 18 18 19 - #include <asm/semaphore.h> 20 19 #include <asm/ccwdev.h> 21 20 #include <asm/ccwgroup.h> 22 21
+1 -1
drivers/s390/cio/qdio.c
··· 38 38 #include <linux/proc_fs.h> 39 39 #include <linux/timer.h> 40 40 #include <linux/mempool.h> 41 + #include <linux/semaphore.h> 41 42 42 43 #include <asm/ccwdev.h> 43 44 #include <asm/io.h> 44 45 #include <asm/atomic.h> 45 - #include <asm/semaphore.h> 46 46 #include <asm/timex.h> 47 47 48 48 #include <asm/debug.h>
-1
drivers/scsi/aacraid/aachba.c
··· 31 31 #include <linux/slab.h> 32 32 #include <linux/completion.h> 33 33 #include <linux/blkdev.h> 34 - #include <asm/semaphore.h> 35 34 #include <asm/uaccess.h> 36 35 #include <linux/highmem.h> /* For flush_kernel_dcache_page */ 37 36
+1 -1
drivers/scsi/aacraid/commctrl.c
··· 39 39 #include <linux/blkdev.h> 40 40 #include <linux/delay.h> /* ssleep prototype */ 41 41 #include <linux/kthread.h> 42 - #include <asm/semaphore.h> 42 + #include <linux/semaphore.h> 43 43 #include <asm/uaccess.h> 44 44 45 45 #include "aacraid.h"
-1
drivers/scsi/aacraid/comminit.c
··· 39 39 #include <linux/completion.h> 40 40 #include <linux/mm.h> 41 41 #include <scsi/scsi_host.h> 42 - #include <asm/semaphore.h> 43 42 44 43 #include "aacraid.h" 45 44
+1 -1
drivers/scsi/aacraid/commsup.c
··· 41 41 #include <linux/delay.h> 42 42 #include <linux/kthread.h> 43 43 #include <linux/interrupt.h> 44 + #include <linux/semaphore.h> 44 45 #include <scsi/scsi.h> 45 46 #include <scsi/scsi_host.h> 46 47 #include <scsi/scsi_device.h> 47 48 #include <scsi/scsi_cmnd.h> 48 - #include <asm/semaphore.h> 49 49 50 50 #include "aacraid.h" 51 51
+1 -1
drivers/scsi/aacraid/dpcsup.c
··· 36 36 #include <linux/slab.h> 37 37 #include <linux/completion.h> 38 38 #include <linux/blkdev.h> 39 - #include <asm/semaphore.h> 39 + #include <linux/semaphore.h> 40 40 41 41 #include "aacraid.h" 42 42
-1
drivers/scsi/aacraid/linit.c
··· 42 42 #include <linux/syscalls.h> 43 43 #include <linux/delay.h> 44 44 #include <linux/kthread.h> 45 - #include <asm/semaphore.h> 46 45 47 46 #include <scsi/scsi.h> 48 47 #include <scsi/scsi_cmnd.h>
-1
drivers/scsi/aacraid/rx.c
··· 39 39 #include <linux/completion.h> 40 40 #include <linux/time.h> 41 41 #include <linux/interrupt.h> 42 - #include <asm/semaphore.h> 43 42 44 43 #include <scsi/scsi_host.h> 45 44
-1
drivers/scsi/aacraid/sa.c
··· 39 39 #include <linux/completion.h> 40 40 #include <linux/time.h> 41 41 #include <linux/interrupt.h> 42 - #include <asm/semaphore.h> 43 42 44 43 #include <scsi/scsi_host.h> 45 44
-1
drivers/scsi/dpt/dpti_i2o.h
··· 21 21 22 22 #include <linux/i2o-dev.h> 23 23 24 - #include <asm/semaphore.h> /* Needed for MUTEX init macros */ 25 24 #include <linux/version.h> 26 25 #include <linux/notifier.h> 27 26 #include <asm/atomic.h>
-1
drivers/scsi/megaraid/mega_common.h
··· 28 28 #include <linux/list.h> 29 29 #include <linux/moduleparam.h> 30 30 #include <linux/dma-mapping.h> 31 - #include <asm/semaphore.h> 32 31 #include <scsi/scsi.h> 33 32 #include <scsi/scsi_cmnd.h> 34 33 #include <scsi/scsi_device.h>
+1 -1
drivers/scsi/megaraid/megaraid_ioctl.h
··· 18 18 #define _MEGARAID_IOCTL_H_ 19 19 20 20 #include <linux/types.h> 21 - #include <asm/semaphore.h> 21 + #include <linux/semaphore.h> 22 22 23 23 #include "mbox_defs.h" 24 24
+1 -1
drivers/scsi/qla2xxx/qla_def.h
··· 25 25 #include <linux/firmware.h> 26 26 #include <linux/aer.h> 27 27 #include <linux/mutex.h> 28 - #include <asm/semaphore.h> 28 + #include <linux/semaphore.h> 29 29 30 30 #include <scsi/scsi.h> 31 31 #include <scsi/scsi_host.h>
-1
drivers/serial/mcfserial.c
··· 40 40 #include <asm/io.h> 41 41 #include <asm/irq.h> 42 42 #include <asm/system.h> 43 - #include <asm/semaphore.h> 44 43 #include <asm/delay.h> 45 44 #include <asm/coldfire.h> 46 45 #include <asm/mcfsim.h>
-1
drivers/usb/atm/usbatm.h
··· 24 24 #ifndef _USBATM_H_ 25 25 #define _USBATM_H_ 26 26 27 - #include <asm/semaphore.h> 28 27 #include <linux/atm.h> 29 28 #include <linux/atmdev.h> 30 29 #include <linux/completion.h>
-1
drivers/usb/core/hub.c
··· 23 23 #include <linux/mutex.h> 24 24 #include <linux/freezer.h> 25 25 26 - #include <asm/semaphore.h> 27 26 #include <asm/uaccess.h> 28 27 #include <asm/byteorder.h> 29 28
-1
drivers/usb/misc/appledisplay.c
··· 29 29 #include <linux/timer.h> 30 30 #include <linux/workqueue.h> 31 31 #include <asm/atomic.h> 32 - #include <asm/semaphore.h> 33 32 34 33 #define APPLE_VENDOR_ID 0x05AC 35 34
-1
drivers/usb/serial/io_ti.c
··· 38 38 #include <linux/serial.h> 39 39 #include <linux/ioctl.h> 40 40 #include <asm/uaccess.h> 41 - #include <asm/semaphore.h> 42 41 #include <linux/usb.h> 43 42 #include <linux/usb/serial.h> 44 43
-1
drivers/usb/serial/ti_usb_3410_5052.c
··· 82 82 #include <linux/circ_buf.h> 83 83 #include <linux/mutex.h> 84 84 #include <asm/uaccess.h> 85 - #include <asm/semaphore.h> 86 85 #include <linux/usb.h> 87 86 #include <linux/usb/serial.h> 88 87
+1 -1
drivers/watchdog/sc1200wdt.c
··· 38 38 #include <linux/init.h> 39 39 #include <linux/pnp.h> 40 40 #include <linux/fs.h> 41 + #include <linux/semaphore.h> 41 42 42 - #include <asm/semaphore.h> 43 43 #include <asm/io.h> 44 44 #include <asm/uaccess.h> 45 45
-1
fs/9p/fid.c
··· 26 26 #include <linux/fs.h> 27 27 #include <linux/sched.h> 28 28 #include <linux/idr.h> 29 - #include <asm/semaphore.h> 30 29 #include <net/9p/9p.h> 31 30 #include <net/9p/client.h> 32 31
-1
fs/cramfs/inode.c
··· 23 23 #include <linux/buffer_head.h> 24 24 #include <linux/vfs.h> 25 25 #include <linux/mutex.h> 26 - #include <asm/semaphore.h> 27 26 28 27 #include <asm/uaccess.h> 29 28
-1
fs/dlm/dlm_internal.h
··· 37 37 #include <linux/jhash.h> 38 38 #include <linux/miscdevice.h> 39 39 #include <linux/mutex.h> 40 - #include <asm/semaphore.h> 41 40 #include <asm/uaccess.h> 42 41 43 42 #include <linux/dlm.h>
+1 -1
fs/jffs2/jffs2_fs_i.h
··· 15 15 #include <linux/version.h> 16 16 #include <linux/rbtree.h> 17 17 #include <linux/posix_acl.h> 18 - #include <asm/semaphore.h> 18 + #include <linux/semaphore.h> 19 19 20 20 struct jffs2_inode_info { 21 21 /* We need an internal mutex similar to inode->i_mutex.
+1 -1
fs/jffs2/jffs2_fs_sb.h
··· 16 16 #include <linux/spinlock.h> 17 17 #include <linux/workqueue.h> 18 18 #include <linux/completion.h> 19 - #include <asm/semaphore.h> 19 + #include <linux/semaphore.h> 20 20 #include <linux/timer.h> 21 21 #include <linux/wait.h> 22 22 #include <linux/list.h>
-1
fs/locks.c
··· 127 127 #include <linux/rcupdate.h> 128 128 #include <linux/pid_namespace.h> 129 129 130 - #include <asm/semaphore.h> 131 130 #include <asm/uaccess.h> 132 131 133 132 #define IS_POSIX(fl) (fl->fl_flags & FL_POSIX)
+1 -1
fs/reiserfs/journal.c
··· 38 38 #include <asm/system.h> 39 39 40 40 #include <linux/time.h> 41 - #include <asm/semaphore.h> 41 + #include <linux/semaphore.h> 42 42 43 43 #include <linux/vmalloc.h> 44 44 #include <linux/reiserfs_fs.h>
-1
fs/reiserfs/xattr.c
··· 44 44 #include <net/checksum.h> 45 45 #include <linux/smp_lock.h> 46 46 #include <linux/stat.h> 47 - #include <asm/semaphore.h> 48 47 49 48 #define FL_READONLY 128 50 49 #define FL_DIR_SEM_HELD 256
+1 -1
fs/xfs/linux-2.6/sema.h
··· 20 20 21 21 #include <linux/time.h> 22 22 #include <linux/wait.h> 23 + #include <linux/semaphore.h> 23 24 #include <asm/atomic.h> 24 - #include <asm/semaphore.h> 25 25 26 26 /* 27 27 * sema_t structure just maps to struct semaphore in Linux kernel.
-1
include/asm-blackfin/dma.h
··· 33 33 #include <linux/slab.h> 34 34 #include <asm/irq.h> 35 35 #include <asm/signal.h> 36 - #include <asm/semaphore.h> 37 36 38 37 #include <linux/kernel.h> 39 38 #include <asm/mach/dma.h>
-1
include/asm-ia64/sn/nodepda.h
··· 9 9 #define _ASM_IA64_SN_NODEPDA_H 10 10 11 11 12 - #include <asm/semaphore.h> 13 12 #include <asm/irq.h> 14 13 #include <asm/sn/arch.h> 15 14 #include <asm/sn/intr.h>
-1
include/asm-ppc/ocp.h
··· 31 31 32 32 #include <asm/mmu.h> 33 33 #include <asm/ocp_ids.h> 34 - #include <asm/semaphore.h> 35 34 36 35 #ifdef CONFIG_PPC_OCP 37 36
-1
include/linux/cpu.h
··· 23 23 #include <linux/node.h> 24 24 #include <linux/compiler.h> 25 25 #include <linux/cpumask.h> 26 - #include <asm/semaphore.h> 27 26 #include <linux/mutex.h> 28 27 29 28 struct cpu {
+1 -1
include/linux/device.h
··· 20 20 #include <linux/types.h> 21 21 #include <linux/module.h> 22 22 #include <linux/pm.h> 23 - #include <asm/semaphore.h> 23 + #include <linux/semaphore.h> 24 24 #include <asm/atomic.h> 25 25 #include <asm/device.h> 26 26
+1 -1
include/linux/fs.h
··· 287 287 #include <linux/pid.h> 288 288 #include <linux/mutex.h> 289 289 #include <linux/capability.h> 290 + #include <linux/semaphore.h> 290 291 291 292 #include <asm/atomic.h> 292 - #include <asm/semaphore.h> 293 293 #include <asm/byteorder.h> 294 294 295 295 struct export_operations;
+1 -1
include/linux/hil_mlc.h
··· 34 34 #include <linux/hil.h> 35 35 #include <linux/time.h> 36 36 #include <linux/interrupt.h> 37 - #include <asm/semaphore.h> 37 + #include <linux/semaphore.h> 38 38 #include <linux/serio.h> 39 39 #include <linux/list.h> 40 40
+1 -1
include/linux/i2o.h
··· 33 33 #include <linux/mempool.h> 34 34 #include <linux/mutex.h> 35 35 #include <linux/scatterlist.h> 36 + #include <linux/semaphore.h> /* Needed for MUTEX init macros */ 36 37 37 38 #include <asm/io.h> 38 - #include <asm/semaphore.h> /* Needed for MUTEX init macros */ 39 39 40 40 /* message queue empty */ 41 41 #define I2O_QUEUE_EMPTY 0xffffffff
-1
include/linux/ide.h
··· 23 23 #include <asm/byteorder.h> 24 24 #include <asm/system.h> 25 25 #include <asm/io.h> 26 - #include <asm/semaphore.h> 27 26 #include <asm/mutex.h> 28 27 29 28 #if defined(CONFIG_CRIS) || defined(CONFIG_FRV)
-1
include/linux/if_pppox.h
··· 24 24 #include <linux/if_ether.h> 25 25 #include <linux/if.h> 26 26 #include <linux/netdevice.h> 27 - #include <asm/semaphore.h> 28 27 #include <linux/ppp_channel.h> 29 28 #endif /* __KERNEL__ */ 30 29 #include <linux/if_pppol2tp.h>
-2
include/linux/jbd.h
··· 32 32 #include <linux/timer.h> 33 33 #include <linux/lockdep.h> 34 34 35 - #include <asm/semaphore.h> 36 - 37 35 #define journal_oom_retry 1 38 36 39 37 /*
-2
include/linux/jbd2.h
··· 30 30 #include <linux/bit_spinlock.h> 31 31 #include <linux/mutex.h> 32 32 #include <linux/timer.h> 33 - 34 - #include <asm/semaphore.h> 35 33 #endif 36 34 37 35 #define journal_oom_retry 1
-1
include/linux/kernelcapi.h
··· 48 48 #include <linux/list.h> 49 49 #include <linux/skbuff.h> 50 50 #include <linux/workqueue.h> 51 - #include <asm/semaphore.h> 52 51 53 52 #define KCI_CONTRUP 0 /* arg: struct capi_profile */ 54 53 #define KCI_CONTRDOWN 1 /* arg: NULL */
+1 -2
include/linux/memory.h
··· 18 18 #include <linux/sysdev.h> 19 19 #include <linux/node.h> 20 20 #include <linux/compiler.h> 21 - 22 - #include <asm/semaphore.h> 21 + #include <linux/semaphore.h> 23 22 24 23 struct memory_block { 25 24 unsigned long phys_index;
+1 -1
include/linux/parport.h
··· 101 101 #include <linux/spinlock.h> 102 102 #include <linux/wait.h> 103 103 #include <linux/irqreturn.h> 104 + #include <linux/semaphore.h> 104 105 #include <asm/system.h> 105 106 #include <asm/ptrace.h> 106 - #include <asm/semaphore.h> 107 107 108 108 /* Define this later. */ 109 109 struct parport;
-1
include/linux/raid/md.h
··· 19 19 #define _MD_H 20 20 21 21 #include <linux/blkdev.h> 22 - #include <asm/semaphore.h> 23 22 #include <linux/major.h> 24 23 #include <linux/ioctl.h> 25 24 #include <linux/types.h>
-1
include/linux/sched.h
··· 61 61 #include <linux/mm_types.h> 62 62 63 63 #include <asm/system.h> 64 - #include <asm/semaphore.h> 65 64 #include <asm/page.h> 66 65 #include <asm/ptrace.h> 67 66 #include <asm/cputime.h>
-1
include/linux/syscalls.h
··· 60 60 #include <linux/capability.h> 61 61 #include <linux/list.h> 62 62 #include <linux/sem.h> 63 - #include <asm/semaphore.h> 64 63 #include <asm/siginfo.h> 65 64 #include <asm/signal.h> 66 65 #include <linux/quota.h>
-1
include/scsi/libsas.h
··· 32 32 #include <scsi/sas.h> 33 33 #include <linux/libata.h> 34 34 #include <linux/list.h> 35 - #include <asm/semaphore.h> 36 35 #include <scsi/scsi_device.h> 37 36 #include <scsi/scsi_cmnd.h> 38 37 #include <scsi/scsi_transport_sas.h>
-1
kernel/kexec.c
··· 29 29 #include <asm/uaccess.h> 30 30 #include <asm/io.h> 31 31 #include <asm/system.h> 32 - #include <asm/semaphore.h> 33 32 #include <asm/sections.h> 34 33 35 34 /* Per cpu memory for storing cpu states in case of system crash. */
-1
kernel/kthread.c
··· 13 13 #include <linux/file.h> 14 14 #include <linux/module.h> 15 15 #include <linux/mutex.h> 16 - #include <asm/semaphore.h> 17 16 18 17 #define KTHREAD_NICE_LEVEL (-5) 19 18
+1 -2
kernel/module.c
··· 43 43 #include <linux/mutex.h> 44 44 #include <linux/unwind.h> 45 45 #include <asm/uaccess.h> 46 - #include <asm/semaphore.h> 47 46 #include <asm/cacheflush.h> 48 47 #include <linux/license.h> 49 48 #include <asm/sections.h> ··· 663 664 664 665 static void wait_for_zero_refcount(struct module *mod) 665 666 { 666 - /* Since we might sleep for some time, drop the semaphore first */ 667 + /* Since we might sleep for some time, release the mutex first */ 667 668 mutex_unlock(&module_mutex); 668 669 for (;;) { 669 670 DEBUGP("Looking at refcount...\n");
-1
kernel/posix-timers.c
··· 37 37 #include <linux/mutex.h> 38 38 39 39 #include <asm/uaccess.h> 40 - #include <asm/semaphore.h> 41 40 #include <linux/list.h> 42 41 #include <linux/init.h> 43 42 #include <linux/compiler.h>
-1
kernel/profile.c
··· 23 23 #include <linux/highmem.h> 24 24 #include <linux/mutex.h> 25 25 #include <asm/sections.h> 26 - #include <asm/semaphore.h> 27 26 #include <asm/irq_regs.h> 28 27 #include <asm/ptrace.h> 29 28
-1
kernel/stop_machine.c
··· 11 11 #include <linux/interrupt.h> 12 12 13 13 #include <asm/atomic.h> 14 - #include <asm/semaphore.h> 15 14 #include <asm/uaccess.h> 16 15 17 16 /* Since we effect priority and affinity (both of which are visible
+1 -1
lib/kernel_lock.c
··· 8 8 #include <linux/smp_lock.h> 9 9 #include <linux/module.h> 10 10 #include <linux/kallsyms.h> 11 - #include <asm/semaphore.h> 11 + #include <linux/semaphore.h> 12 12 13 13 /* 14 14 * The 'big kernel semaphore'
-1
lib/reed_solomon/reed_solomon.c
··· 45 45 #include <linux/rslib.h> 46 46 #include <linux/slab.h> 47 47 #include <linux/mutex.h> 48 - #include <asm/semaphore.h> 49 48 50 49 /* This list holds all currently allocated rs control structures */ 51 50 static LIST_HEAD (rslist);
-1
net/core/flow.c
··· 23 23 #include <linux/mutex.h> 24 24 #include <net/flow.h> 25 25 #include <asm/atomic.h> 26 - #include <asm/semaphore.h> 27 26 #include <linux/security.h> 28 27 29 28 struct flow_cache_entry {
-1
net/dccp/proto.c
··· 27 27 #include <net/xfrm.h> 28 28 29 29 #include <asm/ioctls.h> 30 - #include <asm/semaphore.h> 31 30 #include <linux/spinlock.h> 32 31 #include <linux/timer.h> 33 32 #include <linux/delay.h>
-1
net/ipv4/ipcomp.c
··· 14 14 * - Adaptive compression. 15 15 */ 16 16 #include <linux/module.h> 17 - #include <asm/semaphore.h> 18 17 #include <linux/crypto.h> 19 18 #include <linux/err.h> 20 19 #include <linux/pfkeyv2.h>
-1
net/ipv6/ipcomp6.c
··· 34 34 #include <net/ip.h> 35 35 #include <net/xfrm.h> 36 36 #include <net/ipcomp.h> 37 - #include <asm/semaphore.h> 38 37 #include <linux/crypto.h> 39 38 #include <linux/err.h> 40 39 #include <linux/pfkeyv2.h>
-1
security/selinux/selinuxfs.c
··· 28 28 #include <linux/percpu.h> 29 29 #include <linux/audit.h> 30 30 #include <asm/uaccess.h> 31 - #include <asm/semaphore.h> 32 31 33 32 /* selinuxfs pseudo filesystem for exporting the security policy API. 34 33 Based on the proc code and the fs/nfsd/nfsctl.c code. */
-1
security/selinux/ss/conditional.c
··· 11 11 #include <linux/errno.h> 12 12 #include <linux/string.h> 13 13 #include <linux/spinlock.h> 14 - #include <asm/semaphore.h> 15 14 #include <linux/slab.h> 16 15 17 16 #include "security.h"
-1
security/selinux/xfrm.c
··· 45 45 #include <net/xfrm.h> 46 46 #include <net/checksum.h> 47 47 #include <net/udp.h> 48 - #include <asm/semaphore.h> 49 48 #include <asm/atomic.h> 50 49 51 50 #include "avc.h"