diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
| commit | 429f731dea577bdd43693940cdca524135287e6a (patch) | |
| tree | 932337b7d23dd736612c6b6e6601c50bc24cfc5f /arch/x86/kernel/cpu | |
| parent | 85b375a613085b78531ec86369a51c2f3b922f95 (diff) | |
| parent | d2f5e80862d33a7746a40569840248a592dbc395 (diff) | |
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
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/proc.c | 1 |
2 files changed, 0 insertions, 2 deletions
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 | ||