diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-27 14:05:57 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:32 +0200 |
| commit | 2ba95bcbe68d692f549fb10809f15681a25ff6fb (patch) | |
| tree | e9d10de6620fff0bd3a2dd8477cc8c1afb840d45 | |
| parent | fe874b3edff43f9a74d9903eb3710e5e0511faf1 (diff) | |
| download | blackbird-op-linux-2ba95bcbe68d692f549fb10809f15681a25ff6fb.tar.gz blackbird-op-linux-2ba95bcbe68d692f549fb10809f15681a25ff6fb.zip | |
x86: provide bogus hard_smp_processor_id
We provide a bogus macro for x86_64 in case CONFIG_X86_LOCAL_APIC
is not set. It will always be set for x86_64, so the effect
is just to make the code equal to i386.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/asm-x86/smp_64.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h index 25206333476b..c46585e09ea1 100644 --- a/include/asm-x86/smp_64.h +++ b/include/asm-x86/smp_64.h @@ -46,6 +46,8 @@ static inline int num_booting_cpus(void) #define safe_smp_processor_id() smp_processor_id() +#ifdef CONFIG_X86_LOCAL_APIC + static inline int logical_smp_processor_id(void) { /* we don't want to mark this access volatile - bad code generation */ @@ -63,5 +65,13 @@ static inline int hard_smp_processor_id(void) } # endif /* APIC_DEFINITION */ +#else /* CONFIG_X86_LOCAL_APIC */ + +# ifndef CONFIG_SMP +# define hard_smp_processor_id() 0 +# endif + +#endif /* CONFIG_X86_LOCAL_APIC */ + #endif |
