diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:02 -0400 |
commit | 9d97d0da71ad6c7ceb76b4e29b02bed1ee9d4cd2 (patch) | |
tree | f42192da4062c59f6e38f12439914d523b70b12e /include/asm-x86 | |
parent | 7cc3959ecd830796231f50bf5e42dc018b3694f2 (diff) |
x86: move stack_start to smp.h
voyager would conflict with it, but the types are ultimately
compatible. So remove the extern definition from voyager_smp.c
in favour of the common one
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/smp.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index d02e6eacee39..78ef16dd194b 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h | |||
@@ -28,6 +28,13 @@ extern const unsigned char trampoline_data []; | |||
28 | extern const unsigned char trampoline_end []; | 28 | extern const unsigned char trampoline_end []; |
29 | extern unsigned char *trampoline_base; | 29 | extern unsigned char *trampoline_base; |
30 | 30 | ||
31 | /* Static state in head.S used to set up a CPU */ | ||
32 | extern struct { | ||
33 | void *sp; | ||
34 | unsigned short ss; | ||
35 | } stack_start; | ||
36 | |||
37 | |||
31 | struct smp_ops { | 38 | struct smp_ops { |
32 | void (*smp_prepare_boot_cpu)(void); | 39 | void (*smp_prepare_boot_cpu)(void); |
33 | void (*smp_prepare_cpus)(unsigned max_cpus); | 40 | void (*smp_prepare_cpus)(unsigned max_cpus); |