Messages in this thread Patch in this message | | | Date | Thu, 5 Jun 2008 14:05:57 +0200 | From | Andreas Herrmann <> | Subject | [PATCH] x86: fix compile warning in io_apic_{32,64}.c |
| |
Commit 05f2d12c3563dea8c81b301f9f3cf7919af23b13 (x86: change GET_APIC_ID() from an inline function to an out-of-line function)
introduced a compile warning
arch/x86/kernel/io_apic_64.c: In function 'print_local_APIC': arch/x86/kernel/io_apic_64.c:1152: warning: 'v' is used uninitialized in this function
in some debug code -- which is not enabled by default. This patch reverts the code changes in print_local_APIC.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
-- diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index a40d54f..9a3446f 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c @@ -1489,8 +1489,8 @@ void /*__init*/ print_local_APIC(void * dummy) printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", smp_processor_id(), hard_smp_processor_id()); - printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, - GET_APIC_ID(read_apic_id())); + v = apic_read(APIC_ID); + printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(v)); v = apic_read(APIC_LVR); printk(KERN_INFO "... APIC VERSION: %08x\n", v); ver = GET_APIC_VERSION(v); diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index ef1a8df..59ed52c 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c @@ -1077,7 +1077,8 @@ void __apicdebuginit print_local_APIC(void * dummy) printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", smp_processor_id(), hard_smp_processor_id()); - printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); + v = apic_read(APIC_ID); + printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(v)); v = apic_read(APIC_LVR); printk(KERN_INFO "... APIC VERSION: %08x\n", v); ver = GET_APIC_VERSION(v);
| |