浏览代码

x86_64: apic change setup_APIC_timer calling convention

setup_APIC_timer takes the file global calibration result as an argument.
Remove it.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Thomas Gleixner 17 年之前
父节点
当前提交
abc63fcd3c
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      arch/x86/kernel/apic_64.c

+ 4 - 4
arch/x86/kernel/apic_64.c

@@ -783,7 +783,7 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
 		apic_write(APIC_TMICT, clocks);
 		apic_write(APIC_TMICT, clocks);
 }
 }
 
 
-static void setup_APIC_timer(unsigned int clocks)
+static void setup_APIC_timer(void)
 {
 {
 	unsigned long flags;
 	unsigned long flags;
 	int irqen;
 	int irqen;
@@ -792,7 +792,7 @@ static void setup_APIC_timer(unsigned int clocks)
 
 
 	irqen = ! cpu_isset(smp_processor_id(),
 	irqen = ! cpu_isset(smp_processor_id(),
 			    timer_interrupt_broadcast_ipi_mask);
 			    timer_interrupt_broadcast_ipi_mask);
-	__setup_APIC_LVTT(clocks, 0, irqen);
+	__setup_APIC_LVTT(calibration_result, 0, irqen);
 	/* Turn off PIT interrupt if we use APIC timer as main timer.
 	/* Turn off PIT interrupt if we use APIC timer as main timer.
 	   Only works with the PM timer right now
 	   Only works with the PM timer right now
 	   TBD fix it for HPET too. */
 	   TBD fix it for HPET too. */
@@ -879,7 +879,7 @@ void __init setup_boot_APIC_clock (void)
 	/*
 	/*
 	 * Now set up the timer for real.
 	 * Now set up the timer for real.
 	 */
 	 */
-	setup_APIC_timer(calibration_result);
+	setup_APIC_timer();
 
 
 	local_irq_enable();
 	local_irq_enable();
 }
 }
@@ -887,7 +887,7 @@ void __init setup_boot_APIC_clock (void)
 void __cpuinit setup_secondary_APIC_clock(void)
 void __cpuinit setup_secondary_APIC_clock(void)
 {
 {
 	local_irq_disable(); /* FIXME: Do we need this? --RR */
 	local_irq_disable(); /* FIXME: Do we need this? --RR */
-	setup_APIC_timer(calibration_result);
+	setup_APIC_timer();
 	local_irq_enable();
 	local_irq_enable();
 }
 }