From 2d44065924d500822a557b72512b127510dfd5aa Mon Sep 17 00:00:00 2001 From: Jacob Pan Date: Wed, 23 Feb 2011 16:07:26 -0800 Subject: [PATCH] --- yaml --- r: 233675 b: refs/heads/master c: 7b62dbec908a29f448047099bedb5c64c9cb8808 h: refs/heads/master i: 233673: 401d1ee66ad858afd5b9c75621fb7615eeb205a7 233671: cecee2c2acf69eb462d48a6fa015589b7aa9b4fe v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apb_timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d2197ed1529b..1adee6f8c259 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e19e074b1525d11a66c8e3386fec7db248ad3005 +refs/heads/master: 7b62dbec908a29f448047099bedb5c64c9cb8808 diff --git a/trunk/arch/x86/kernel/apb_timer.c b/trunk/arch/x86/kernel/apb_timer.c index 51ef31a89be9..51d4e1663066 100644 --- a/trunk/arch/x86/kernel/apb_timer.c +++ b/trunk/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);