aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-18 15:12:33 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-18 20:07:20 -0400
commit1b4ee4e4096d430c4c12516c1d30a6b0b4f9e9e4 (patch)
tree3c9beb64a10e93532f84ce47e80ca19658372091 /arch/x86/kernel/apic_64.c
parente75bedf415f300a08e9bbcc755784e488574a73e (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_64.c')
-rw-r--r--arch/x86/kernel/apic_64.c15
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)
1020 lapic_setup_esr(); 1020 lapic_setup_esr();
1021 1021
1022#ifdef CONFIG_X86_32 1022#ifdef CONFIG_X86_32
1023 unsigned int value; 1023 {
1024 /* Disable the local apic timer */ 1024 unsigned int value;
1025 value = apic_read(APIC_LVTT); 1025 /* Disable the local apic timer */
1026 value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); 1026 value = apic_read(APIC_LVTT);
1027 apic_write(APIC_LVTT, value); 1027 value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
1028 apic_write(APIC_LVTT, value);
1029 }
1028#endif 1030#endif
1029 1031
1030 setup_apic_nmi_watchdog(NULL); 1032 setup_apic_nmi_watchdog(NULL);
@@ -1363,6 +1365,8 @@ void __init connect_bsp_APIC(void)
1363 */ 1365 */
1364void disconnect_bsp_APIC(int virt_wire_setup) 1366void disconnect_bsp_APIC(int virt_wire_setup)
1365{ 1367{
1368 unsigned int value;
1369
1366#ifdef CONFIG_X86_32 1370#ifdef CONFIG_X86_32
1367 if (pic_mode) { 1371 if (pic_mode) {
1368 /* 1372 /*
@@ -1380,7 +1384,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
1380#endif 1384#endif
1381 1385
1382 /* Go back to Virtual Wire compatibility mode */ 1386 /* Go back to Virtual Wire compatibility mode */
1383 unsigned int value;
1384 1387
1385 /* For the spurious interrupt use vector F, and enable it */ 1388 /* For the spurious interrupt use vector F, and enable it */
1386 value = apic_read(APIC_SPIV); 1389 value = apic_read(APIC_SPIV);