diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2005-01-04 05:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 05:37:20 -0800 |
| commit | 2612d7a4610222e8a6fac3ffe0574438bdf3ae64 (patch) | |
| tree | 8349cb4351ce04ea291dfe99ac6d6f569ed4b1ce /include | |
| parent | db43a9982a1ac8b797e82d22c92a43ec676ec1a0 (diff) | |
[PATCH] fix conflicting cpu_idle() declarations
cpu_idle() is referenced from generic code (init/main.c). It is
declared/defined in
init/main.c: void cpu_idle(void)
i386/kernel/process.c void cpu_idle(void)
i386/kernel/smpboot.c: int cpu_idle(void)
i386/mach-voyager/voyager_smp.c: int cpu_idle(void)
ppc/kernel/idle.c: int cpu_idle(void)
ppc/kernel/smp.c: int cpu_idle(void *unused)
ppc64/kernel/idle.c: int cpu_idle(void)
ppc64/kernel/smp.c: int cpu_idle(void *unused)
sparc/kernel/process.c: int cpu_idle(void)
sparc64/kernel/process.c: int cpu_idle(void)
sh/kernel/process.c: void cpu_idle(void *unused)
sh/kernel/smp.c: int cpu_idle(void *unused)
ia64/kernel/smpboot.c: int cpu_idle(void)
ia64/kernel/process.c: void cpu_idle(void *unused)
sh64/kernel/process.c: void cpu_idle(void *unused)
s390/kernel/process.c: int cpu_idle(void)
s390/kernel/smp.c: int cpu_idle(void * unused)
m32r/kernel/process.c: void cpu_idle(void)
m32r/kernel/smpboot.c int cpu_idle(void)
Other arches beleive that cpu_idle is void(void).
This patch puts 'void cpu_idle(void)' in include/linux/smp.h
and fixes conflicting definitions.
Also removes now unneeded declarations in x86_64, alpha, parisc.
Only i386 part is tested.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/proto.h | 1 | ||||
| -rw-r--r-- | include/linux/smp.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index afb9b52b879c..e942ca5957e4 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -25,7 +25,6 @@ extern void ia32_syscall(void); extern void ia32_cstar_target(void); extern void ia32_sysenter_target(void); -extern void cpu_idle(void); extern void config_acpi_tables(void); extern void ia32_syscall(void); extern void iommu_hole_init(void); diff --git a/include/linux/smp.h b/include/linux/smp.h index 312ec58a4025..a4ca8abdbedb 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -8,6 +8,8 @@ #include <linux/config.h> +extern void cpu_idle(void); + #ifdef CONFIG_SMP #include <linux/preempt.h> |