leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: apic - unify end_local_APIC_setup

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 20:45:58 +04:00
committed by Ingo Molnar
parent 1b313f4a6d
commit fa6b95fc7c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1155,13 +1155,15 @@ void __cpuinit setup_local_APIC(void)
void __cpuinit end_local_APIC_setup(void) void __cpuinit end_local_APIC_setup(void)
{ {
unsigned long value;
lapic_setup_esr(); lapic_setup_esr();
#ifdef CONFIG_X86_32
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
setup_apic_nmi_watchdog(NULL); setup_apic_nmi_watchdog(NULL);
apic_pm_activate(); apic_pm_activate();

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

@@ -1014,6 +1014,15 @@ void __cpuinit setup_local_APIC(void)
void __cpuinit end_local_APIC_setup(void) void __cpuinit end_local_APIC_setup(void)
{ {
lapic_setup_esr(); 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); setup_apic_nmi_watchdog(NULL);
apic_pm_activate(); apic_pm_activate();
} }