diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/cpu.h | 1 | ||||
-rw-r--r-- | include/linux/device.h | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 2 | ||||
-rw-r--r-- | include/linux/hil_mlc.h | 2 | ||||
-rw-r--r-- | include/linux/i2o.h | 2 | ||||
-rw-r--r-- | include/linux/ide.h | 1 | ||||
-rw-r--r-- | include/linux/if_pppox.h | 1 | ||||
-rw-r--r-- | include/linux/jbd.h | 2 | ||||
-rw-r--r-- | include/linux/jbd2.h | 2 | ||||
-rw-r--r-- | include/linux/kernelcapi.h | 1 | ||||
-rw-r--r-- | include/linux/memory.h | 3 | ||||
-rw-r--r-- | include/linux/parport.h | 2 | ||||
-rw-r--r-- | include/linux/raid/md.h | 1 | ||||
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | include/linux/syscalls.h | 1 |
15 files changed, 6 insertions, 18 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 0be8d65bc3c8..f212fa98283e 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/node.h> | 23 | #include <linux/node.h> |
24 | #include <linux/compiler.h> | 24 | #include <linux/compiler.h> |
25 | #include <linux/cpumask.h> | 25 | #include <linux/cpumask.h> |
26 | #include <asm/semaphore.h> | ||
27 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
28 | 27 | ||
29 | struct cpu { | 28 | struct cpu { |
diff --git a/include/linux/device.h b/include/linux/device.h index 2258d89bf523..c79b93e56fa0 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
22 | #include <linux/pm.h> | 22 | #include <linux/pm.h> |
23 | #include <asm/semaphore.h> | 23 | #include <linux/semaphore.h> |
24 | #include <asm/atomic.h> | 24 | #include <asm/atomic.h> |
25 | #include <asm/device.h> | 25 | #include <asm/device.h> |
26 | 26 | ||
diff --git a/include/linux/fs.h b/include/linux/fs.h index d1eeea669d2c..0c609e71c379 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -287,9 +287,9 @@ extern int dir_notify_enable; | |||
287 | #include <linux/pid.h> | 287 | #include <linux/pid.h> |
288 | #include <linux/mutex.h> | 288 | #include <linux/mutex.h> |
289 | #include <linux/capability.h> | 289 | #include <linux/capability.h> |
290 | #include <linux/semaphore.h> | ||
290 | 291 | ||
291 | #include <asm/atomic.h> | 292 | #include <asm/atomic.h> |
292 | #include <asm/semaphore.h> | ||
293 | #include <asm/byteorder.h> | 293 | #include <asm/byteorder.h> |
294 | 294 | ||
295 | struct export_operations; | 295 | struct export_operations; |
diff --git a/include/linux/hil_mlc.h b/include/linux/hil_mlc.h index 8df29ca48a13..394a8405dd74 100644 --- a/include/linux/hil_mlc.h +++ b/include/linux/hil_mlc.h | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/hil.h> | 34 | #include <linux/hil.h> |
35 | #include <linux/time.h> | 35 | #include <linux/time.h> |
36 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
37 | #include <asm/semaphore.h> | 37 | #include <linux/semaphore.h> |
38 | #include <linux/serio.h> | 38 | #include <linux/serio.h> |
39 | #include <linux/list.h> | 39 | #include <linux/list.h> |
40 | 40 | ||
diff --git a/include/linux/i2o.h b/include/linux/i2o.h index 7da5b98d90e6..e92170dda245 100644 --- a/include/linux/i2o.h +++ b/include/linux/i2o.h | |||
@@ -33,9 +33,9 @@ | |||
33 | #include <linux/mempool.h> | 33 | #include <linux/mempool.h> |
34 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
35 | #include <linux/scatterlist.h> | 35 | #include <linux/scatterlist.h> |
36 | #include <linux/semaphore.h> /* Needed for MUTEX init macros */ | ||
36 | 37 | ||
37 | #include <asm/io.h> | 38 | #include <asm/io.h> |
38 | #include <asm/semaphore.h> /* Needed for MUTEX init macros */ | ||
39 | 39 | ||
40 | /* message queue empty */ | 40 | /* message queue empty */ |
41 | #define I2O_QUEUE_EMPTY 0xffffffff | 41 | #define I2O_QUEUE_EMPTY 0xffffffff |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 6c39482fd1a1..5f3e82ae901a 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/byteorder.h> | 23 | #include <asm/byteorder.h> |
24 | #include <asm/system.h> | 24 | #include <asm/system.h> |
25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
26 | #include <asm/semaphore.h> | ||
27 | #include <asm/mutex.h> | 26 | #include <asm/mutex.h> |
28 | 27 | ||
29 | #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) | 28 | #if defined(CONFIG_CRIS) || defined(CONFIG_FRV) |
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 40743e032845..6fb7f1788570 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/if_ether.h> | 24 | #include <linux/if_ether.h> |
25 | #include <linux/if.h> | 25 | #include <linux/if.h> |
26 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
27 | #include <asm/semaphore.h> | ||
28 | #include <linux/ppp_channel.h> | 27 | #include <linux/ppp_channel.h> |
29 | #endif /* __KERNEL__ */ | 28 | #endif /* __KERNEL__ */ |
30 | #include <linux/if_pppol2tp.h> | 29 | #include <linux/if_pppol2tp.h> |
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 423f58272188..07a9b52a2654 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
33 | #include <linux/lockdep.h> | 33 | #include <linux/lockdep.h> |
34 | 34 | ||
35 | #include <asm/semaphore.h> | ||
36 | |||
37 | #define journal_oom_retry 1 | 35 | #define journal_oom_retry 1 |
38 | 36 | ||
39 | /* | 37 | /* |
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 2cbf6fdb1799..05e2b307161a 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
@@ -30,8 +30,6 @@ | |||
30 | #include <linux/bit_spinlock.h> | 30 | #include <linux/bit_spinlock.h> |
31 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
32 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
33 | |||
34 | #include <asm/semaphore.h> | ||
35 | #endif | 33 | #endif |
36 | 34 | ||
37 | #define journal_oom_retry 1 | 35 | #define journal_oom_retry 1 |
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h index 8c4350a9ed87..a53e932f80fb 100644 --- a/include/linux/kernelcapi.h +++ b/include/linux/kernelcapi.h | |||
@@ -48,7 +48,6 @@ typedef struct kcapi_carddef { | |||
48 | #include <linux/list.h> | 48 | #include <linux/list.h> |
49 | #include <linux/skbuff.h> | 49 | #include <linux/skbuff.h> |
50 | #include <linux/workqueue.h> | 50 | #include <linux/workqueue.h> |
51 | #include <asm/semaphore.h> | ||
52 | 51 | ||
53 | #define KCI_CONTRUP 0 /* arg: struct capi_profile */ | 52 | #define KCI_CONTRUP 0 /* arg: struct capi_profile */ |
54 | #define KCI_CONTRDOWN 1 /* arg: NULL */ | 53 | #define KCI_CONTRDOWN 1 /* arg: NULL */ |
diff --git a/include/linux/memory.h b/include/linux/memory.h index 33f0ff0cf634..54d7866d9c0e 100644 --- a/include/linux/memory.h +++ b/include/linux/memory.h | |||
@@ -18,8 +18,7 @@ | |||
18 | #include <linux/sysdev.h> | 18 | #include <linux/sysdev.h> |
19 | #include <linux/node.h> | 19 | #include <linux/node.h> |
20 | #include <linux/compiler.h> | 20 | #include <linux/compiler.h> |
21 | 21 | #include <linux/semaphore.h> | |
22 | #include <asm/semaphore.h> | ||
23 | 22 | ||
24 | struct memory_block { | 23 | struct memory_block { |
25 | unsigned long phys_index; | 24 | unsigned long phys_index; |
diff --git a/include/linux/parport.h b/include/linux/parport.h index d1ad546c8c9e..dcb9e01a69ca 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h | |||
@@ -101,9 +101,9 @@ typedef enum { | |||
101 | #include <linux/spinlock.h> | 101 | #include <linux/spinlock.h> |
102 | #include <linux/wait.h> | 102 | #include <linux/wait.h> |
103 | #include <linux/irqreturn.h> | 103 | #include <linux/irqreturn.h> |
104 | #include <linux/semaphore.h> | ||
104 | #include <asm/system.h> | 105 | #include <asm/system.h> |
105 | #include <asm/ptrace.h> | 106 | #include <asm/ptrace.h> |
106 | #include <asm/semaphore.h> | ||
107 | 107 | ||
108 | /* Define this later. */ | 108 | /* Define this later. */ |
109 | struct parport; | 109 | struct parport; |
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h index fbaeda79b2e9..8ab630b67fcc 100644 --- a/include/linux/raid/md.h +++ b/include/linux/raid/md.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #define _MD_H | 19 | #define _MD_H |
20 | 20 | ||
21 | #include <linux/blkdev.h> | 21 | #include <linux/blkdev.h> |
22 | #include <asm/semaphore.h> | ||
23 | #include <linux/major.h> | 22 | #include <linux/major.h> |
24 | #include <linux/ioctl.h> | 23 | #include <linux/ioctl.h> |
25 | #include <linux/types.h> | 24 | #include <linux/types.h> |
diff --git a/include/linux/sched.h b/include/linux/sched.h index be6914014c70..311380e5fe89 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -61,7 +61,6 @@ struct sched_param { | |||
61 | #include <linux/mm_types.h> | 61 | #include <linux/mm_types.h> |
62 | 62 | ||
63 | #include <asm/system.h> | 63 | #include <asm/system.h> |
64 | #include <asm/semaphore.h> | ||
65 | #include <asm/page.h> | 64 | #include <asm/page.h> |
66 | #include <asm/ptrace.h> | 65 | #include <asm/ptrace.h> |
67 | #include <asm/cputime.h> | 66 | #include <asm/cputime.h> |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 4c2577bd1c85..8df6d1382ac8 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -60,7 +60,6 @@ struct getcpu_cache; | |||
60 | #include <linux/capability.h> | 60 | #include <linux/capability.h> |
61 | #include <linux/list.h> | 61 | #include <linux/list.h> |
62 | #include <linux/sem.h> | 62 | #include <linux/sem.h> |
63 | #include <asm/semaphore.h> | ||
64 | #include <asm/siginfo.h> | 63 | #include <asm/siginfo.h> |
65 | #include <asm/signal.h> | 64 | #include <asm/signal.h> |
66 | #include <linux/quota.h> | 65 | #include <linux/quota.h> |