summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2011-02-23 16:07:26 -0800
committerIngo Molnar <mingo@elte.hu>2011-02-24 08:22:43 +0100
commit7b62dbec908a29f448047099bedb5c64c9cb8808 (patch)
tree5d40da35a8e0d619b931fe6c4fb366b27f113093 /arch
parente19e074b1525d11a66c8e3386fec7db248ad3005 (diff)
downloadlinux-3.10-7b62dbec908a29f448047099bedb5c64c9cb8808.tar.gz
linux-3.10-7b62dbec908a29f448047099bedb5c64c9cb8808.tar.bz2
linux-3.10-7b62dbec908a29f448047099bedb5c64c9cb8808.zip
x86/mrst: Fix apb timer rating when lapic timer is used
Need to adjust the clockevent device rating for the structure that will be registered with clockevent system instead of the temporary structure. Without this fix, APB timer rating will be higher than LAPIC timer such that it can not be released later to be used as the broadcast timer. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Alan Cox <alan@linux.intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <john.stultz@linaro.org> LKML-Reference: <1298506046-439-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/apb_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 51ef31a89be..51d4e166306 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -284,7 +284,7 @@ static int __init apbt_clockevent_register(void)
memcpy(&adev->evt, &apbt_clockevent, sizeof(struct clock_event_device));
if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) {
- apbt_clockevent.rating = APBT_CLOCKEVENT_RATING - 100;
+ adev->evt.rating = APBT_CLOCKEVENT_RATING - 100;
global_clock_event = &adev->evt;
printk(KERN_DEBUG "%s clockevent registered as global\n",
global_clock_event->name);