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 /arch/x86/kernel/io_apic_32.c | |
| parent | 29308333fbe2cc61258c1c470f9403960428beb2 (diff) | |
| parent | 10a010f6953b5a14ba2f0be40a4fce1bea220875 (diff) | |
| download | kernel-crypto-6dec3a10a7a6093af10cef7ac56021150afd6451.tar.gz kernel-crypto-6dec3a10a7a6093af10cef7ac56021150afd6451.tar.xz kernel-crypto-6dec3a10a7a6093af10cef7ac56021150afd6451.zip | |
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 'arch/x86/kernel/io_apic_32.c')
| -rw-r--r-- | arch/x86/kernel/io_apic_32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index de9aa0e3a9c..98e4db5373f 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c @@ -1494,7 +1494,7 @@ void /*__init*/ print_local_APIC(void *dummy) smp_processor_id(), hard_smp_processor_id()); v = apic_read(APIC_ID); printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, - GET_APIC_ID(read_apic_id())); + GET_APIC_ID(v)); v = apic_read(APIC_LVR); printk(KERN_INFO "... APIC VERSION: %08x\n", v); ver = GET_APIC_VERSION(v); @@ -1702,8 +1702,7 @@ void disable_IO_APIC(void) entry.dest_mode = 0; /* Physical */ entry.delivery_mode = dest_ExtINT; /* ExtInt */ entry.vector = 0; - entry.dest.physical.physical_dest = - GET_APIC_ID(read_apic_id()); + entry.dest.physical.physical_dest = read_apic_id(); /* * Add it to the IO-APIC irq-routing table: |