lkml.org 
[lkml]   [2007]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch -mm 24/28] x86_64: hpet restore vread
    >From sebastien.dugue@bull.net

    It seems the hpet clocksource's vread method was lost in the x86_64 conversion
    to clockevents. So here it is.

    Signed-off-by: Sébastien Dugué <sebastien.dugue@bull.net>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

    arch/i386/kernel/hpet.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    Index: linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c
    ===================================================================
    --- linux-2.6.22-rc4-mm.orig/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200
    +++ linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200
    @@ -255,6 +255,13 @@ static cycle_t read_hpet(void)
    return (cycle_t)hpet_readl(HPET_COUNTER);
    }

    +#ifdef CONFIG_X86_64
    +static cycle_t __vsyscall_fn vread_hpet(void)
    +{
    + return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
    +}
    +#endif
    +
    static struct clocksource clocksource_hpet = {
    .name = "hpet",
    .rating = 250,
    @@ -263,6 +270,9 @@ static struct clocksource clocksource_hp
    .shift = HPET_SHIFT,
    .flags = CLOCK_SOURCE_IS_CONTINUOUS,
    .resume = hpet_start_counter,
    +#ifdef CONFIG_X86_64
    + .vread = vread_hpet,
    +#endif
    };

    /*
    --

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-23 15:31    [W:0.022 / U:58.920 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site