aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/apic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/kernel/apic.c')
-rw-r--r--arch/x86_64/kernel/apic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index f8e6cc4fecd4..2a6c893ccf60 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -285,7 +285,7 @@ void __init init_bsp_APIC(void)
285 apic_write_around(APIC_LVT1, value); 285 apic_write_around(APIC_LVT1, value);
286} 286}
287 287
288void __init setup_local_APIC (void) 288void __cpuinit setup_local_APIC (void)
289{ 289{
290 unsigned int value, ver, maxlvt; 290 unsigned int value, ver, maxlvt;
291 291
@@ -534,7 +534,7 @@ static struct sys_device device_lapic = {
534 .cls = &lapic_sysclass, 534 .cls = &lapic_sysclass,
535}; 535};
536 536
537static void __init apic_pm_activate(void) 537static void __cpuinit apic_pm_activate(void)
538{ 538{
539 apic_pm_state.active = 1; 539 apic_pm_state.active = 1;
540} 540}
@@ -774,14 +774,14 @@ void __init setup_boot_APIC_clock (void)
774 local_irq_enable(); 774 local_irq_enable();
775} 775}
776 776
777void __init setup_secondary_APIC_clock(void) 777void __cpuinit setup_secondary_APIC_clock(void)
778{ 778{
779 local_irq_disable(); /* FIXME: Do we need this? --RR */ 779 local_irq_disable(); /* FIXME: Do we need this? --RR */
780 setup_APIC_timer(calibration_result); 780 setup_APIC_timer(calibration_result);
781 local_irq_enable(); 781 local_irq_enable();
782} 782}
783 783
784void __init disable_APIC_timer(void) 784void __cpuinit disable_APIC_timer(void)
785{ 785{
786 if (using_apic_timer) { 786 if (using_apic_timer) {
787 unsigned long v; 787 unsigned long v;