diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:29:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 16:29:23 +0200 |
| commit | 6dec3a10a7a6093af10cef7ac56021150afd6451 (patch) | |
| tree | f4d8511f023e3e0c203baf889d4a0f3925882381 /include/asm-x86/mach-es7000 | |
| parent | 29308333fbe2cc61258c1c470f9403960428beb2 (diff) | |
| parent | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (diff) | |
Merge branch 'x86/x2apic' into x86/core
Conflicts:
include/asm-x86/i8259.h
include/asm-x86/msidef.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mach-es7000')
| -rw-r--r-- | include/asm-x86/mach-es7000/mach_apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/mach-es7000/mach_apic.h b/include/asm-x86/mach-es7000/mach_apic.h index c1f6f682d61..ae877ec267f 100644 --- a/include/asm-x86/mach-es7000/mach_apic.h +++ b/include/asm-x86/mach-es7000/mach_apic.h @@ -141,7 +141,7 @@ static inline void setup_portio_remap(void) extern unsigned int boot_cpu_physical_apicid; static inline int check_phys_apicid_present(int cpu_physical_apicid) { - boot_cpu_physical_apicid = GET_APIC_ID(read_apic_id()); + boot_cpu_physical_apicid = read_apic_id(); return (1); } |