lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: apic - compilation warnings fix

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Cyrill Gorcunov
2008-08-18 23:12:33 +04:00
committed by Ingo Molnar
parent e75bedf415
commit 1b4ee4e409
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/apic_32.c
View File

@@ -1162,11 +1162,13 @@ void __cpuinit end_local_APIC_setup(void)
lapic_setup_esr(); lapic_setup_esr();
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
{
unsigned int value; unsigned int value;
/* Disable the local apic timer */ /* Disable the local apic timer */
value = apic_read(APIC_LVTT); value = apic_read(APIC_LVTT);
value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
apic_write(APIC_LVTT, value); apic_write(APIC_LVTT, value);
}
#endif #endif
setup_apic_nmi_watchdog(NULL); setup_apic_nmi_watchdog(NULL);
@@ -1426,6 +1428,8 @@ void __init connect_bsp_APIC(void)
*/ */
void disconnect_bsp_APIC(int virt_wire_setup) void disconnect_bsp_APIC(int virt_wire_setup)
{ {
unsigned int value;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
if (pic_mode) { if (pic_mode) {
/* /*
@@ -1443,7 +1447,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
#endif #endif
/* Go back to Virtual Wire compatibility mode */ /* Go back to Virtual Wire compatibility mode */
unsigned int value;
/* For the spurious interrupt use vector F, and enable it */ /* For the spurious interrupt use vector F, and enable it */
value = apic_read(APIC_SPIV); value = apic_read(APIC_SPIV);

5
arch/x86/kernel/apic_64.c
View File

@@ -1020,11 +1020,13 @@ void __cpuinit end_local_APIC_setup(void)
lapic_setup_esr(); lapic_setup_esr();
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
{
unsigned int value; unsigned int value;
/* Disable the local apic timer */ /* Disable the local apic timer */
value = apic_read(APIC_LVTT); value = apic_read(APIC_LVTT);
value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR); value |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
apic_write(APIC_LVTT, value); apic_write(APIC_LVTT, value);
}
#endif #endif
setup_apic_nmi_watchdog(NULL); setup_apic_nmi_watchdog(NULL);
@@ -1363,6 +1365,8 @@ void __init connect_bsp_APIC(void)
*/ */
void disconnect_bsp_APIC(int virt_wire_setup) void disconnect_bsp_APIC(int virt_wire_setup)
{ {
unsigned int value;
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
if (pic_mode) { if (pic_mode) {
/* /*
@@ -1380,7 +1384,6 @@ void disconnect_bsp_APIC(int virt_wire_setup)
#endif #endif
/* Go back to Virtual Wire compatibility mode */ /* Go back to Virtual Wire compatibility mode */
unsigned int value;
/* For the spurious interrupt use vector F, and enable it */ /* For the spurious interrupt use vector F, and enable it */
value = apic_read(APIC_SPIV); value = apic_read(APIC_SPIV);