diff options
-rw-r--r-- | kernel/kexec.c | 1 | ||||
-rw-r--r-- | kernel/kthread.c | 1 | ||||
-rw-r--r-- | kernel/module.c | 3 | ||||
-rw-r--r-- | kernel/posix-timers.c | 1 | ||||
-rw-r--r-- | kernel/profile.c | 1 | ||||
-rw-r--r-- | kernel/stop_machine.c | 1 |
6 files changed, 1 insertions, 7 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 06a0e2775651..6782dce93d01 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | #include <asm/system.h> | 31 | #include <asm/system.h> |
32 | #include <asm/semaphore.h> | ||
33 | #include <asm/sections.h> | 32 | #include <asm/sections.h> |
34 | 33 | ||
35 | /* Per cpu memory for storing cpu states in case of system crash. */ | 34 | /* Per cpu memory for storing cpu states in case of system crash. */ |
diff --git a/kernel/kthread.c b/kernel/kthread.c index 0ac887882f90..92dd1bcaa0df 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/file.h> | 13 | #include <linux/file.h> |
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
16 | #include <asm/semaphore.h> | ||
17 | 16 | ||
18 | #define KTHREAD_NICE_LEVEL (-5) | 17 | #define KTHREAD_NICE_LEVEL (-5) |
19 | 18 | ||
diff --git a/kernel/module.c b/kernel/module.c index 5d437bffd8dc..8d6cccc6c3cf 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
44 | #include <linux/unwind.h> | 44 | #include <linux/unwind.h> |
45 | #include <asm/uaccess.h> | 45 | #include <asm/uaccess.h> |
46 | #include <asm/semaphore.h> | ||
47 | #include <asm/cacheflush.h> | 46 | #include <asm/cacheflush.h> |
48 | #include <linux/license.h> | 47 | #include <linux/license.h> |
49 | #include <asm/sections.h> | 48 | #include <asm/sections.h> |
@@ -664,7 +663,7 @@ static void free_module(struct module *mod); | |||
664 | 663 | ||
665 | static void wait_for_zero_refcount(struct module *mod) | 664 | static void wait_for_zero_refcount(struct module *mod) |
666 | { | 665 | { |
667 | /* Since we might sleep for some time, drop the semaphore first */ | 666 | /* Since we might sleep for some time, release the mutex first */ |
668 | mutex_unlock(&module_mutex); | 667 | mutex_unlock(&module_mutex); |
669 | for (;;) { | 668 | for (;;) { |
670 | DEBUGP("Looking at refcount...\n"); | 669 | DEBUGP("Looking at refcount...\n"); |
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index a9b04203a66d..8476956ffd92 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/mutex.h> | 37 | #include <linux/mutex.h> |
38 | 38 | ||
39 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
40 | #include <asm/semaphore.h> | ||
41 | #include <linux/list.h> | 40 | #include <linux/list.h> |
42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
43 | #include <linux/compiler.h> | 42 | #include <linux/compiler.h> |
diff --git a/kernel/profile.c b/kernel/profile.c index 3b7a1b055122..606d7387265c 100644 --- a/kernel/profile.c +++ b/kernel/profile.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/highmem.h> | 23 | #include <linux/highmem.h> |
24 | #include <linux/mutex.h> | 24 | #include <linux/mutex.h> |
25 | #include <asm/sections.h> | 25 | #include <asm/sections.h> |
26 | #include <asm/semaphore.h> | ||
27 | #include <asm/irq_regs.h> | 26 | #include <asm/irq_regs.h> |
28 | #include <asm/ptrace.h> | 27 | #include <asm/ptrace.h> |
29 | 28 | ||
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 6f4e0e13f70c..3da3c2c6702d 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
12 | 12 | ||
13 | #include <asm/atomic.h> | 13 | #include <asm/atomic.h> |
14 | #include <asm/semaphore.h> | ||
15 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
16 | 15 | ||
17 | /* Since we effect priority and affinity (both of which are visible | 16 | /* Since we effect priority and affinity (both of which are visible |