Skip to contentSkip to conversation

x86/mrst: fix apb timer rating when lapic timer is used

PATCH In review [email protected] 1 participant 2 messages Feb 24, 2011 x86

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 x86/mrst: fix apb timer rating when lapic timer is used

From: Jacob Pan <[email protected]>

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 <[email protected]>
---
 arch/x86/kernel/apb_timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/apb_timer.c +1 -1
index 671d5aa..1293c70 100644
@@ -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);
Signature · 1 line
1.7.0.4
author
#1 lore raw

[tip:x86/urgent] x86/mrst: Fix apb timer rating when lapic timer is used

Commit-ID:  7b62dbec908a29f448047099bedb5c64c9cb8808
Gitweb:     http://git.kernel.org/tip/7b62dbec908a29f448047099bedb5c64c9cb8808
Author:     Jacob Pan <[email protected]>
AuthorDate: Wed, 23 Feb 2011 16:07:26 -0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 24 Feb 2011 08:22:43 +0100

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 <[email protected]>
Cc Arjan van de Ven <[email protected]>
Cc Alan Cox <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc John Stultz <[email protected]>

LKML-Reference: <[email protected]>

Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/apb_timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/apb_timer.c +1 -1
index 51ef31a..51d4e16 100644
@@ -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);