diff options
| author |   Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 23:12:33 +0400 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-08-19 02:07:20 +0200 |
| commit | 1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4 (patch) | |
| tree | 3c9beb64a10e93532f84ce47e80ca19658372091 /arch/x86/kernel/apic_64.c | |
| parent | x86: apic - lapic_resume 32bit - unification fix (diff) | |
| download | linux-dev-1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4.tar.xz linux-dev-1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4.zip | |
x86: apic - compilation warnings fix
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 7a317180ba2e..37e037606f30 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -1020,11 +1020,13 @@ void __cpuinit end_local_APIC_setup(void) lapic_setup_esr(); #ifdef CONFIG_X86_32 - unsigned int value; - /* Disable the local apic timer */ - value = apic_read(APIC_LVTT); - value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); - apic_write(APIC_LVTT, value); + { + unsigned int value; + /* Disable the local apic timer */ + value = apic_read(APIC_LVTT); + value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); + apic_write(APIC_LVTT, value); + } #endif setup_apic_nmi_watchdog(NULL); @@ -1363,6 +1365,8 @@ void __init connect_bsp_APIC(void) */ void disconnect_bsp_APIC(int virt_wire_setup) { + unsigned int value; + #ifdef CONFIG_X86_32 if (pic_mode) { /* @@ -1380,7 +1384,6 @@ void disconnect_bsp_APIC(int virt_wire_setup) #endif /* Go back to Virtual Wire compatibility mode */ - unsigned int value; /* For the spurious interrupt use vector F, and enable it */ value = apic_read(APIC_SPIV); |