diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/smp.c | 4 | ||||
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 1 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 | ||||
| -rw-r--r-- | arch/x86_64/kernel/smpboot.c | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c index 304243ed7a..465188e2d7 100644 --- a/arch/i386/kernel/smp.c +++ b/arch/i386/kernel/smp.c | |||
| @@ -683,8 +683,8 @@ __smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 683 | * or is or has executed. | 683 | * or is or has executed. |
| 684 | */ | 684 | */ |
| 685 | 685 | ||
| 686 | int smp_call_function_single (int cpu, void (*func) (void *info), void *info, | 686 | int smp_call_function_single(int cpu, void (*func) (void *info), void *info, |
| 687 | int nonatomic, int wait) | 687 | int nonatomic, int wait) |
| 688 | { | 688 | { |
| 689 | /* prevent preemption and reschedule on another processor */ | 689 | /* prevent preemption and reschedule on another processor */ |
| 690 | int me = get_cpu(); | 690 | int me = get_cpu(); |
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index 84a7e52f56..7bb7696e4c 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/file.h> | 34 | #include <linux/file.h> |
| 35 | #include <linux/poll.h> | 35 | #include <linux/poll.h> |
| 36 | #include <linux/vfs.h> | 36 | #include <linux/vfs.h> |
| 37 | #include <linux/smp.h> | ||
| 37 | #include <linux/pagemap.h> | 38 | #include <linux/pagemap.h> |
| 38 | #include <linux/mount.h> | 39 | #include <linux/mount.h> |
| 39 | #include <linux/bitops.h> | 40 | #include <linux/bitops.h> |
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 9a8a29339d..b632b9c1e3 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
| @@ -32,9 +32,10 @@ | |||
| 32 | #include <linux/cpumask.h> | 32 | #include <linux/cpumask.h> |
| 33 | #include <linux/smp_lock.h> | 33 | #include <linux/smp_lock.h> |
| 34 | #include <linux/nodemask.h> | 34 | #include <linux/nodemask.h> |
| 35 | #include <linux/smp.h> | ||
| 36 | |||
| 35 | #include <asm/processor.h> | 37 | #include <asm/processor.h> |
| 36 | #include <asm/topology.h> | 38 | #include <asm/topology.h> |
| 37 | #include <asm/smp.h> | ||
| 38 | #include <asm/semaphore.h> | 39 | #include <asm/semaphore.h> |
| 39 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
| 40 | #include <asm/sal.h> | 41 | #include <asm/sal.h> |
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 975380207b..3ae9ffdddd 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
| @@ -46,9 +46,10 @@ | |||
| 46 | #include <linux/bootmem.h> | 46 | #include <linux/bootmem.h> |
| 47 | #include <linux/thread_info.h> | 47 | #include <linux/thread_info.h> |
| 48 | #include <linux/module.h> | 48 | #include <linux/module.h> |
| 49 | |||
| 50 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 51 | #include <linux/mc146818rtc.h> | 50 | #include <linux/mc146818rtc.h> |
| 51 | #include <linux/smp.h> | ||
| 52 | |||
| 52 | #include <asm/mtrr.h> | 53 | #include <asm/mtrr.h> |
| 53 | #include <asm/pgalloc.h> | 54 | #include <asm/pgalloc.h> |
| 54 | #include <asm/desc.h> | 55 | #include <asm/desc.h> |