From 44ef01e3eca9dee38c4cbc1269a7622f6d7dbcaf Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Sun, 24 Aug 2008 02:01:39 -0700 Subject: [PATCH] --- yaml --- r: 116467 b: refs/heads/master c: db4b5525caafd846ec20f95afbc6403c792e22cf h: refs/heads/master i: 116465: 9f7714b86f34166131e63e5b483dff33e3ac9a4d 116463: b05d8461bac24f59eb8c761b9bf692a6fb158a95 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 48e6bcb2b6dc..8e5b113b4cbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2699574b3c04351f5a23c8a842e17c303d7ebb6f +refs/heads/master: db4b5525caafd846ec20f95afbc6403c792e22cf diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c index cd860856a0b7..8f551276681e 100644 --- a/trunk/arch/x86/kernel/apic_64.c +++ b/trunk/arch/x86/kernel/apic_64.c @@ -400,7 +400,7 @@ static void lapic_timer_broadcast(cpumask_t mask) * Setup the local APIC timer for this CPU. Copy the initilized values * of the boot CPU and register the clock event in the framework. */ -static void setup_APIC_timer(void) +static void __cpuinit setup_APIC_timer(void) { struct clock_event_device *levt = &__get_cpu_var(lapic_events);