Skip to content

Commit

Permalink
x86_64: apic change setup_APIC_timer calling convention
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner authored and Thomas Gleixner committed Oct 12, 2007
1 parent b58eb00 commit abc63fc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/x86/kernel/apic_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
apic_write(APIC_TMICT, clocks);
}

static void setup_APIC_timer(unsigned int clocks)
static void setup_APIC_timer(void)
{
unsigned long flags;
int irqen;
Expand All @@ -792,7 +792,7 @@ static void setup_APIC_timer(unsigned int clocks)

irqen = ! cpu_isset(smp_processor_id(),
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.
Only works with the PM timer right now
TBD fix it for HPET too. */
Expand Down Expand Up @@ -879,15 +879,15 @@ void __init setup_boot_APIC_clock (void)
/*
* Now set up the timer for real.
*/
setup_APIC_timer(calibration_result);
setup_APIC_timer();

local_irq_enable();
}

void __cpuinit setup_secondary_APIC_clock(void)
{
local_irq_disable(); /* FIXME: Do we need this? --RR */
setup_APIC_timer(calibration_result);
setup_APIC_timer();
local_irq_enable();
}

Expand Down

0 comments on commit abc63fc

Please sign in to comment.