diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-12 17:04:07 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-12 17:04:07 -0400 |
commit | abc63fcd3cc61876b2d6f5b0d08021bd1538385c (patch) | |
tree | 86cad68e2461a13e4ad099f0fa6c51f0fab2f6c2 /arch/x86 | |
parent | b58eb00df7f7f80b7f456bf8fb740fddf14408ba (diff) |
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>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index f746f9dc8ce..f74b1c20e5c 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -783,7 +783,7 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen) | |||
783 | apic_write(APIC_TMICT, clocks); | 783 | apic_write(APIC_TMICT, clocks); |
784 | } | 784 | } |
785 | 785 | ||
786 | static void setup_APIC_timer(unsigned int clocks) | 786 | static void setup_APIC_timer(void) |
787 | { | 787 | { |
788 | unsigned long flags; | 788 | unsigned long flags; |
789 | int irqen; | 789 | int irqen; |
@@ -792,7 +792,7 @@ static void setup_APIC_timer(unsigned int clocks) | |||
792 | 792 | ||
793 | irqen = ! cpu_isset(smp_processor_id(), | 793 | irqen = ! cpu_isset(smp_processor_id(), |
794 | timer_interrupt_broadcast_ipi_mask); | 794 | timer_interrupt_broadcast_ipi_mask); |
795 | __setup_APIC_LVTT(clocks, 0, irqen); | 795 | __setup_APIC_LVTT(calibration_result, 0, irqen); |
796 | /* Turn off PIT interrupt if we use APIC timer as main timer. | 796 | /* Turn off PIT interrupt if we use APIC timer as main timer. |
797 | Only works with the PM timer right now | 797 | Only works with the PM timer right now |
798 | TBD fix it for HPET too. */ | 798 | TBD fix it for HPET too. */ |
@@ -879,7 +879,7 @@ void __init setup_boot_APIC_clock (void) | |||
879 | /* | 879 | /* |
880 | * Now set up the timer for real. | 880 | * Now set up the timer for real. |
881 | */ | 881 | */ |
882 | setup_APIC_timer(calibration_result); | 882 | setup_APIC_timer(); |
883 | 883 | ||
884 | local_irq_enable(); | 884 | local_irq_enable(); |
885 | } | 885 | } |
@@ -887,7 +887,7 @@ void __init setup_boot_APIC_clock (void) | |||
887 | void __cpuinit setup_secondary_APIC_clock(void) | 887 | void __cpuinit setup_secondary_APIC_clock(void) |
888 | { | 888 | { |
889 | local_irq_disable(); /* FIXME: Do we need this? --RR */ | 889 | local_irq_disable(); /* FIXME: Do we need this? --RR */ |
890 | setup_APIC_timer(calibration_result); | 890 | setup_APIC_timer(); |
891 | local_irq_enable(); | 891 | local_irq_enable(); |
892 | } | 892 | } |
893 | 893 | ||