lkml.org 
[lkml]   [2011]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/vdso] ia64: Replace clocksource.fsys_mmio with generic arch data
    Commit-ID:  574c44fa8fa6262ffd5939789ef51a6e98ed62d7
    Gitweb: http://git.kernel.org/tip/574c44fa8fa6262ffd5939789ef51a6e98ed62d7
    Author: Andy Lutomirski <luto@mit.edu>
    AuthorDate: Wed, 13 Jul 2011 09:24:15 -0400
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Thu, 14 Jul 2011 17:57:09 -0700

    ia64: Replace clocksource.fsys_mmio with generic arch data

    Now that clocksource.archdata is available, use it for ia64-specific
    code.

    Cc: Clemens Ladisch <clemens@ladisch.de>
    Cc: linux-ia64@vger.kernel.org
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: John Stultz <johnstul@us.ibm.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andy Lutomirski <luto@mit.edu>
    Link: http://lkml.kernel.org/r/d31de0ee0842a0e322fb6441571c2b0adb323fa2.1310563276.git.luto@mit.edu
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    arch/ia64/include/asm/clocksource.h | 12 ++++++++++++
    arch/ia64/kernel/cyclone.c | 2 +-
    arch/ia64/kernel/time.c | 2 +-
    arch/ia64/sn/kernel/sn2/timer.c | 2 +-
    drivers/char/hpet.c | 2 +-
    include/linux/clocksource.h | 7 -------
    6 files changed, 16 insertions(+), 11 deletions(-)
    diff --git a/arch/ia64/include/asm/clocksource.h b/arch/ia64/include/asm/clocksource.h
    new file mode 100644
    index 0000000..00eb549
    --- /dev/null
    +++ b/arch/ia64/include/asm/clocksource.h
    @@ -0,0 +1,12 @@
    +/* IA64-specific clocksource additions */
    +
    +#ifndef _ASM_IA64_CLOCKSOURCE_H
    +#define _ASM_IA64_CLOCKSOURCE_H
    +
    +#define __ARCH_HAS_CLOCKSOURCE_DATA
    +
    +struct arch_clocksource_data {
    + void *fsys_mmio; /* used by fsyscall asm code */
    +};
    +
    +#endif /* _ASM_IA64_CLOCKSOURCE_H */
    diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
    index f64097b..4826ff9 100644
    --- a/arch/ia64/kernel/cyclone.c
    +++ b/arch/ia64/kernel/cyclone.c
    @@ -115,7 +115,7 @@ int __init init_cyclone_clock(void)
    }
    /* initialize last tick */
    cyclone_mc = cyclone_timer;
    - clocksource_cyclone.fsys_mmio = cyclone_timer;
    + clocksource_cyclone.archdata.fsys_mmio = cyclone_timer;
    clocksource_register_hz(&clocksource_cyclone, CYCLONE_TIMER_FREQ);

    return 0;
    diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
    index 85118df..43920de 100644
    --- a/arch/ia64/kernel/time.c
    +++ b/arch/ia64/kernel/time.c
    @@ -468,7 +468,7 @@ void update_vsyscall(struct timespec *wall, struct timespec *wtm,
    fsyscall_gtod_data.clk_mask = c->mask;
    fsyscall_gtod_data.clk_mult = mult;
    fsyscall_gtod_data.clk_shift = c->shift;
    - fsyscall_gtod_data.clk_fsys_mmio = c->fsys_mmio;
    + fsyscall_gtod_data.clk_fsys_mmio = c->archdata.fsys_mmio;
    fsyscall_gtod_data.clk_cycle_last = c->cycle_last;

    /* copy kernel time structures */
    diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c
    index c34efda..0f8844e 100644
    --- a/arch/ia64/sn/kernel/sn2/timer.c
    +++ b/arch/ia64/sn/kernel/sn2/timer.c
    @@ -54,7 +54,7 @@ ia64_sn_udelay (unsigned long usecs)

    void __init sn_timer_init(void)
    {
    - clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;
    + clocksource_sn2.archdata.fsys_mmio = RTC_COUNTER_ADDR;
    clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second);

    ia64_udelay = &ia64_sn_udelay;
    diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
    index 051474c..0557651 100644
    --- a/drivers/char/hpet.c
    +++ b/drivers/char/hpet.c
    @@ -931,7 +931,7 @@ int hpet_alloc(struct hpet_data *hdp)
    #ifdef CONFIG_IA64
    if (!hpet_clocksource) {
    hpet_mctr = (void __iomem *)&hpetp->hp_hpet->hpet_mc;
    - CLKSRC_FSYS_MMIO_SET(clocksource_hpet.fsys_mmio, hpet_mctr);
    + clocksource_hpet.archdata.fsys_mmio = hpet_mctr;
    clocksource_register_hz(&clocksource_hpet, hpetp->hp_tick_freq);
    hpetp->hp_clocksource = &clocksource_hpet;
    hpet_clocksource = &clocksource_hpet;
    diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
    index 0fb83c2..6bb6970 100644
    --- a/include/linux/clocksource.h
    +++ b/include/linux/clocksource.h
    @@ -171,13 +171,6 @@ struct clocksource {
    u32 shift;
    u64 max_idle_ns;

    -#ifdef CONFIG_IA64
    - void *fsys_mmio; /* used by fsyscall asm code */
    -#define CLKSRC_FSYS_MMIO_SET(mmio, addr) ((mmio) = (addr))
    -#else
    -#define CLKSRC_FSYS_MMIO_SET(mmio, addr) do { } while (0)
    -#endif
    -
    #ifdef __ARCH_HAS_CLOCKSOURCE_DATA
    struct arch_clocksource_data archdata;
    #endif

    \
     
     \ /
      Last update: 2011-07-15 06:27    [from the cache]
    ©2003-2011 Jasper Spaans