Commit 1b4ee4e4 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - compilation warnings fix 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e75bedf4

arch/x86/kernel/apic_32.c

+9 −6
Original line number Diff line number Diff line
@@ -1162,11 +1162,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);

	}

#endif



	setup_apic_nmi_watchdog(NULL);
@@ -1426,6 +1428,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) {

		/*
@@ -1443,7 +1447,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);

arch/x86/kernel/apic_64.c

+9 −6
Original line number Diff line number Diff line
@@ -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);

	}

#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);