diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-18 15:12:33 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-18 20:07:20 -0400 |
commit | 1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4 (patch) | |
tree | 3c9beb64a10e93532f84ce47e80ca19658372091 /arch/x86/kernel/apic_32.c | |
parent | e75bedf415f300a08e9bbcc755784e488574a73e (diff) |
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_32.c')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index e975562a76a5..b8d80c291650 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -1162,11 +1162,13 @@ void __cpuinit end_local_APIC_setup(void) | |||
1162 | lapic_setup_esr(); | 1162 | lapic_setup_esr(); |
1163 | 1163 | ||
1164 | #ifdef CONFIG_X86_32 | 1164 | #ifdef CONFIG_X86_32 |
1165 | unsigned int value; | 1165 | { |
1166 | /* Disable the local apic timer */ | 1166 | unsigned int value; |
1167 | value = apic_read(APIC_LVTT); | 1167 | /* Disable the local apic timer */ |
1168 | value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); | 1168 | value = apic_read(APIC_LVTT); |
1169 | apic_write(APIC_LVTT, value); | 1169 | value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); |
1170 | apic_write(APIC_LVTT, value); | ||
1171 | } | ||
1170 | #endif | 1172 | #endif |
1171 | 1173 | ||
1172 | setup_apic_nmi_watchdog(NULL); | 1174 | setup_apic_nmi_watchdog(NULL); |
@@ -1426,6 +1428,8 @@ void __init connect_bsp_APIC(void) | |||
1426 | */ | 1428 | */ |
1427 | void disconnect_bsp_APIC(int virt_wire_setup) | 1429 | void disconnect_bsp_APIC(int virt_wire_setup) |
1428 | { | 1430 | { |
1431 | unsigned int value; | ||
1432 | |||
1429 | #ifdef CONFIG_X86_32 | 1433 | #ifdef CONFIG_X86_32 |
1430 | if (pic_mode) { | 1434 | if (pic_mode) { |
1431 | /* | 1435 | /* |
@@ -1443,7 +1447,6 @@ void disconnect_bsp_APIC(int virt_wire_setup) | |||
1443 | #endif | 1447 | #endif |
1444 | 1448 | ||
1445 | /* Go back to Virtual Wire compatibility mode */ | 1449 | /* Go back to Virtual Wire compatibility mode */ |
1446 | unsigned int value; | ||
1447 | 1450 | ||
1448 | /* For the spurious interrupt use vector F, and enable it */ | 1451 | /* For the spurious interrupt use vector F, and enable it */ |
1449 | value = apic_read(APIC_SPIV); | 1452 | value = apic_read(APIC_SPIV); |