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 /init | |
| parent | db43a9982a1ac8b797e82d22c92a43ec676ec1a0 (diff) | |
| download | history-2612d7a4610222e8a6fac3ffe0574438bdf3ae64.tar.gz | |
[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 'init')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 76df13bcd7a398..6eaeffde35f6fd 100644 --- a/init/main.c +++ b/init/main.c @@ -288,7 +288,6 @@ static int __init init_setup(char *str) __setup("init=", init_setup); extern void setup_arch(char **); -extern void cpu_idle(void); #ifndef CONFIG_SMP |