diff options
| author | Suresh Siddha <suresh.b.siddha@intel.com> | 2008-07-10 11:16:48 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 08:44:57 +0200 |
| commit | 0c81c746f9bdbfaafe64322d540c8b7b59c27314 (patch) | |
| tree | 2f6a291a7b699b930e617909f3476dfafb5a38bb /include/asm-x86/smp.h | |
| parent | 4dc2f96cacd1e74c688f94348a3bfd0a980817d5 (diff) | |
| download | blackbird-op-linux-0c81c746f9bdbfaafe64322d540c8b7b59c27314.tar.gz blackbird-op-linux-0c81c746f9bdbfaafe64322d540c8b7b59c27314.zip | |
x64, x2apic/intr-remap: introduce read_apic_id() to genapic routines
Move the read_apic_id() to genapic routines.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: akpm@linux-foundation.org
Cc: arjan@linux.intel.com
Cc: andi@firstfloor.org
Cc: ebiederm@xmission.com
Cc: jbarnes@virtuousgeek.org
Cc: steiner@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
| -rw-r--r-- | include/asm-x86/smp.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 2e221f1ce0b2..9848715fbd9e 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -169,12 +169,10 @@ static inline unsigned int read_apic_id(void) { return *(u32 *)(APIC_BASE + APIC_ID); } -#else -extern unsigned int read_apic_id(void); #endif -# ifdef APIC_DEFINITION +# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64) extern int hard_smp_processor_id(void); # else # include <mach_apicdef.h> |
