lkml.org 
[lkml]   [2011]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[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 <jacob.jun.pan@linux.intel.com>
    AuthorDate: Wed, 23 Feb 2011 16:07:26 -0800
    Committer: Ingo Molnar <mingo@elte.hu>
    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 <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>
    ---
    arch/x86/kernel/apb_timer.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
    index 51ef31a..51d4e16 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);

    \
     
     \ /
      Last update: 2011-02-24 08:31    [W:0.026 / U:61.420 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site