x86: apic - compilation warnings fix
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index e975562..b8d80c2 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1162,11 +1162,13 @@
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);
@@ -1426,6 +1428,8 @@
*/
void disconnect_bsp_APIC(int virt_wire_setup)
{
+ unsigned int value;
+
#ifdef CONFIG_X86_32
if (pic_mode) {
/*
@@ -1443,7 +1447,6 @@
#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);
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 7a31718..37e0376 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1020,11 +1020,13 @@
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 disconnect_bsp_APIC(int virt_wire_setup)
{
+ unsigned int value;
+
#ifdef CONFIG_X86_32
if (pic_mode) {
/*
@@ -1380,7 +1384,6 @@
#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);