diff options
author | Matthew Wilcox <matthew@wil.cx> | 2008-02-26 09:55:29 -0500 |
---|---|---|
committer | Matthew Wilcox <willy@linux.intel.com> | 2008-04-18 22:14:49 -0400 |
commit | 950e4da32426859ee4b37b2c95026d4f1efa5d05 (patch) | |
tree | 7df9bb4b97d4e1ecde571611ceee76d128e5dfc6 | |
parent | 3925e6fc1f774048404fdd910b0345b06c699eb4 (diff) |
arch: Remove unnecessary inclusions of asm/semaphore.h
None of these files use any of the functionality promised by
asm/semaphore.h. It's possible that they rely on it dragging in some
unrelated header file, but I can't build all these files, so we'll have
fix any build failures as they come up.
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
28 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c index f53bca46e23c..aa8f7739c822 100644 --- a/arch/arm/common/rtctime.c +++ b/arch/arm/common/rtctime.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
23 | 23 | ||
24 | #include <asm/rtc.h> | 24 | #include <asm/rtc.h> |
25 | #include <asm/semaphore.h> | ||
26 | 25 | ||
27 | static DECLARE_WAIT_QUEUE_HEAD(rtc_wait); | 26 | static DECLARE_WAIT_QUEUE_HEAD(rtc_wait); |
28 | static struct fasync_struct *rtc_async_queue; | 27 | static struct fasync_struct *rtc_async_queue; |
diff --git a/arch/arm/mach-aaec2000/clock.c b/arch/arm/mach-aaec2000/clock.c index 74aa7a39bb68..e10ee158d720 100644 --- a/arch/arm/mach-aaec2000/clock.c +++ b/arch/arm/mach-aaec2000/clock.c | |||
@@ -18,8 +18,6 @@ | |||
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
20 | 20 | ||
21 | #include <asm/semaphore.h> | ||
22 | |||
23 | #include "clock.h" | 21 | #include "clock.h" |
24 | 22 | ||
25 | static LIST_HEAD(clocks); | 23 | static LIST_HEAD(clocks); |
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index de6424e9ac02..a33dfe450726 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | 25 | ||
26 | #include <asm/semaphore.h> | ||
27 | #include <asm/io.h> | 26 | #include <asm/io.h> |
28 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
29 | 28 | ||
diff --git a/arch/arm/mach-integrator/clock.c b/arch/arm/mach-integrator/clock.c index 95a1e263f7fa..8d761fdd2ecd 100644 --- a/arch/arm/mach-integrator/clock.c +++ b/arch/arm/mach-integrator/clock.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
19 | 19 | ||
20 | #include <asm/semaphore.h> | ||
21 | #include <asm/hardware/icst525.h> | 20 | #include <asm/hardware/icst525.h> |
22 | 21 | ||
23 | #include "clock.h" | 22 | #include "clock.h" |
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c index 8e00ed43fb95..a5268c3ac5a7 100644 --- a/arch/arm/mach-pnx4008/clock.c +++ b/arch/arm/mach-pnx4008/clock.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | 23 | ||
24 | #include <asm/semaphore.h> | ||
25 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
26 | #include <asm/io.h> | 25 | #include <asm/io.h> |
27 | 26 | ||
diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c index 1ab84ced7b5a..ef179cab80e2 100644 --- a/arch/arm/mach-pnx4008/gpio.c +++ b/arch/arm/mach-pnx4008/gpio.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <asm/semaphore.h> | ||
21 | #include <asm/io.h> | 20 | #include <asm/io.h> |
22 | #include <asm/arch/platform.h> | 21 | #include <asm/arch/platform.h> |
23 | #include <asm/arch/gpio.h> | 22 | #include <asm/arch/gpio.h> |
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c index 21325a4da9da..3e706c57833a 100644 --- a/arch/arm/mach-realview/clock.c +++ b/arch/arm/mach-realview/clock.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
18 | 18 | ||
19 | #include <asm/semaphore.h> | ||
20 | #include <asm/hardware/icst307.h> | 19 | #include <asm/hardware/icst307.h> |
21 | 20 | ||
22 | #include "clock.h" | 21 | #include "clock.h" |
diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c index 9858c96560e2..9336508ec0b2 100644 --- a/arch/arm/mach-versatile/clock.c +++ b/arch/arm/mach-versatile/clock.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
19 | 19 | ||
20 | #include <asm/semaphore.h> | ||
21 | #include <asm/hardware/icst307.h> | 20 | #include <asm/hardware/icst307.h> |
22 | 21 | ||
23 | #include "clock.h" | 22 | #include "clock.h" |
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 0a603242f367..203ac508b6b5 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | 24 | ||
25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
26 | #include <asm/semaphore.h> | ||
27 | 26 | ||
28 | #include <asm/arch/clock.h> | 27 | #include <asm/arch/clock.h> |
29 | 28 | ||
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 4b0d1538e7e5..8cc0c4753d89 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
@@ -37,7 +37,6 @@ | |||
37 | 37 | ||
38 | #include <asm/processor.h> | 38 | #include <asm/processor.h> |
39 | #include <asm/topology.h> | 39 | #include <asm/topology.h> |
40 | #include <asm/semaphore.h> | ||
41 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
42 | #include <asm/sal.h> | 41 | #include <asm/sal.h> |
43 | #include <asm/sn/io.h> | 42 | #include <asm/sn/io.h> |
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index 0055a6c06f75..04c69ffbea71 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/atarihw.h> | 29 | #include <asm/atarihw.h> |
30 | #include <asm/atari_stram.h> | 30 | #include <asm/atari_stram.h> |
31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include <asm/semaphore.h> | ||
33 | 32 | ||
34 | #undef DEBUG | 33 | #undef DEBUG |
35 | 34 | ||
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c index db359d7402a6..0116d208d300 100644 --- a/arch/m68k/sun3/intersil.c +++ b/arch/m68k/sun3/intersil.c | |||
@@ -15,7 +15,6 @@ | |||
15 | 15 | ||
16 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
17 | #include <asm/system.h> | 17 | #include <asm/system.h> |
18 | #include <asm/semaphore.h> | ||
19 | #include <asm/rtc.h> | 18 | #include <asm/rtc.h> |
20 | #include <asm/intersil.h> | 19 | #include <asm/intersil.h> |
21 | 20 | ||
diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c index 3ba830651c58..984e561f0f7a 100644 --- a/arch/mips/sgi-ip27/ip27-console.c +++ b/arch/mips/sgi-ip27/ip27-console.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | 9 | ||
10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
11 | #include <asm/semaphore.h> | ||
12 | #include <asm/sn/addrs.h> | 11 | #include <asm/sn/addrs.h> |
13 | #include <asm/sn/sn0/hub.h> | 12 | #include <asm/sn/sn0/hub.h> |
14 | #include <asm/sn/klconfig.h> | 13 | #include <asm/sn/klconfig.h> |
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index 50bbf33ee00c..71efd6a28e2a 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c | |||
@@ -49,7 +49,6 @@ | |||
49 | 49 | ||
50 | #include <asm/types.h> | 50 | #include <asm/types.h> |
51 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
52 | #include <asm/semaphore.h> | ||
53 | #include <asm/mmu_context.h> | 52 | #include <asm/mmu_context.h> |
54 | 53 | ||
55 | #include "sys32.h" | 54 | #include "sys32.h" |
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 52e95c2158c0..fe8d95146893 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/prom.h> | 26 | #include <asm/prom.h> |
27 | #include <asm/rtas.h> | 27 | #include <asm/rtas.h> |
28 | #include <asm/hvcall.h> | 28 | #include <asm/hvcall.h> |
29 | #include <asm/semaphore.h> | ||
30 | #include <asm/machdep.h> | 29 | #include <asm/machdep.h> |
31 | #include <asm/firmware.h> | 30 | #include <asm/firmware.h> |
32 | #include <asm/page.h> | 31 | #include <asm/page.h> |
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index 4a4f5c6b560b..fee9ee2260b1 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <asm/types.h> | 47 | #include <asm/types.h> |
48 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
49 | #include <asm/unistd.h> | 49 | #include <asm/unistd.h> |
50 | #include <asm/semaphore.h> | ||
51 | #include <asm/time.h> | 50 | #include <asm/time.h> |
52 | #include <asm/mmu_context.h> | 51 | #include <asm/mmu_context.h> |
53 | #include <asm/ppc-pci.h> | 52 | #include <asm/ppc-pci.h> |
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index 3b1d5dd65643..e722a4eeb5d0 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/personality.h> | 38 | #include <linux/personality.h> |
39 | 39 | ||
40 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
41 | #include <asm/semaphore.h> | ||
42 | #include <asm/syscalls.h> | 41 | #include <asm/syscalls.h> |
43 | #include <asm/time.h> | 42 | #include <asm/time.h> |
44 | #include <asm/unistd.h> | 43 | #include <asm/unistd.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c index f7a7e8635fb6..c7df0a6cfa1b 100644 --- a/arch/powerpc/platforms/cell/spufs/file.c +++ b/arch/powerpc/platforms/cell/spufs/file.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/marker.h> | 32 | #include <linux/marker.h> |
33 | 33 | ||
34 | #include <asm/io.h> | 34 | #include <asm/io.h> |
35 | #include <asm/semaphore.h> | ||
36 | #include <asm/spu.h> | 35 | #include <asm/spu.h> |
37 | #include <asm/spu_info.h> | 36 | #include <asm/spu_info.h> |
38 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 6d1228c66c5e..0c32a05ab068 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/parser.h> | 35 | #include <linux/parser.h> |
36 | 36 | ||
37 | #include <asm/prom.h> | 37 | #include <asm/prom.h> |
38 | #include <asm/semaphore.h> | ||
39 | #include <asm/spu.h> | 38 | #include <asm/spu.h> |
40 | #include <asm/spu_priv1.h> | 39 | #include <asm/spu_priv1.h> |
41 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c index 85434231ae14..96d5ce50364e 100644 --- a/arch/powerpc/platforms/powermac/pfunc_core.c +++ b/arch/powerpc/platforms/powermac/pfunc_core.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
14 | 14 | ||
15 | #include <asm/semaphore.h> | ||
16 | #include <asm/prom.h> | 15 | #include <asm/prom.h> |
17 | #include <asm/pmac_pfunc.h> | 16 | #include <asm/pmac_pfunc.h> |
18 | 17 | ||
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index ac80370ed2f7..a6fb7dcfa738 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
50 | #include <asm/ocp.h> | 50 | #include <asm/ocp.h> |
51 | #include <asm/errno.h> | 51 | #include <asm/errno.h> |
52 | #include <asm/semaphore.h> | ||
53 | 52 | ||
54 | //#define DBG(x) printk x | 53 | //#define DBG(x) printk x |
55 | #define DBG(x) | 54 | #define DBG(x) |
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 50b85d07ddd2..d7f22226fc4e 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c | |||
@@ -62,7 +62,6 @@ | |||
62 | 62 | ||
63 | #include <asm/types.h> | 63 | #include <asm/types.h> |
64 | #include <asm/uaccess.h> | 64 | #include <asm/uaccess.h> |
65 | #include <asm/semaphore.h> | ||
66 | 65 | ||
67 | #include <net/scm.h> | 66 | #include <net/scm.h> |
68 | #include <net/sock.h> | 67 | #include <net/sock.h> |
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 1e7d4ac7068b..dff0568e67ec 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/ctype.h> | 17 | #include <linux/ctype.h> |
18 | #include <linux/sysctl.h> | 18 | #include <linux/sysctl.h> |
19 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
20 | #include <asm/semaphore.h> | ||
21 | #include <linux/module.h> | 20 | #include <linux/module.h> |
22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
23 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index 2455fa498876..c1a61e98899a 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c | |||
@@ -55,7 +55,6 @@ | |||
55 | #include <asm/types.h> | 55 | #include <asm/types.h> |
56 | #include <asm/uaccess.h> | 56 | #include <asm/uaccess.h> |
57 | #include <asm/fpumacro.h> | 57 | #include <asm/fpumacro.h> |
58 | #include <asm/semaphore.h> | ||
59 | #include <asm/mmu_context.h> | 58 | #include <asm/mmu_context.h> |
60 | #include <asm/compat_signal.h> | 59 | #include <asm/compat_signal.h> |
61 | 60 | ||
diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c index 0a4df4d6e05f..003db9c8c44a 100644 --- a/arch/v850/kernel/syscalls.c +++ b/arch/v850/kernel/syscalls.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/file.h> | 30 | #include <linux/file.h> |
31 | 31 | ||
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | #include <asm/semaphore.h> | ||
34 | #include <asm/unistd.h> | 33 | #include <asm/unistd.h> |
35 | 34 | ||
36 | /* | 35 | /* |
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index 7cede7a9e0dc..f00afdf61e67 100644 --- a/arch/x86/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <asm/mman.h> | 43 | #include <asm/mman.h> |
44 | #include <asm/types.h> | 44 | #include <asm/types.h> |
45 | #include <asm/uaccess.h> | 45 | #include <asm/uaccess.h> |
46 | #include <asm/semaphore.h> | ||
47 | #include <asm/atomic.h> | 46 | #include <asm/atomic.h> |
48 | #include <asm/ia32.h> | 47 | #include <asm/ia32.h> |
49 | #include <asm/vgtod.h> | 48 | #include <asm/vgtod.h> |
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index d999d7833bc2..35b4f6a9c8ef 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
6 | #include <linux/percpu.h> | 6 | #include <linux/percpu.h> |
7 | #include <linux/bootmem.h> | 7 | #include <linux/bootmem.h> |
8 | #include <asm/semaphore.h> | ||
9 | #include <asm/processor.h> | 8 | #include <asm/processor.h> |
10 | #include <asm/i387.h> | 9 | #include <asm/i387.h> |
11 | #include <asm/msr.h> | 10 | #include <asm/msr.h> |
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c index 0978a4a39418..0d0d9057e7c0 100644 --- a/arch/x86/kernel/cpu/proc.c +++ b/arch/x86/kernel/cpu/proc.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include <linux/smp.h> | 1 | #include <linux/smp.h> |
2 | #include <linux/timex.h> | 2 | #include <linux/timex.h> |
3 | #include <linux/string.h> | 3 | #include <linux/string.h> |
4 | #include <asm/semaphore.h> | ||
5 | #include <linux/seq_file.h> | 4 | #include <linux/seq_file.h> |
6 | #include <linux/cpufreq.h> | 5 | #include <linux/cpufreq.h> |
7 | 6 | ||