From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755419Ab1GJDXP (ORCPT ); Sat, 9 Jul 2011 23:23:15 -0400 Received: from DMZ-MAILSEC-SCANNER-4.MIT.EDU ([18.9.25.15]:46783 "EHLO dmz-mailsec-scanner-4.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755361Ab1GJDWf (ORCPT ); Sat, 9 Jul 2011 23:22:35 -0400 X-AuditID: 1209190f-b7c82ae000000a20-c3-4e191af60af8 From: Andy Lutomirski To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Ingo Molnar , John Stultz , Borislav Petkov , Andy Lutomirski , Clemens Ladisch , linux-ia64@vger.kernel.org, Tony Luck , Fenghua Yu , Thomas Gleixner Subject: [PATCH v2 7/8] ia64: Replace clocksource.fsys_mmio with generic arch data Date: Sat, 9 Jul 2011 23:22:14 -0400 Message-Id: X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIKsWRmVeSWpSXmKPExsUixG6novtNStLP4OR2Y4u+K0fZLS42bmOx WHLiIZNF2zRHi9a189ktPnS8Y7W4vGsOm8WWS82sFps3TWW2eHPhHovFjw2PWR24PboffWL0 uNX2h9lj56y77B6L97xk8ti0qpPN48eKfmaPd+fOsXucu9bH7PF5k1wAZxSXTUpqTmZZapG+ XQJXxpHH69kL7spXXPzbytTAeESqi5GTQ0LARGL3+tWMELaYxIV769m6GLk4hAT2MUpMXrSK FcJZzyjx5MxHRgjnKZPE0ufz2EFa2ARUJDqWPmDqYuTgEBEQklh6tw4kzCzwk0liRnMCSFhY IEhi32k5kDCLgKrEundXmEBsXqDwn8PPWCAWy0kcufwcLM4pYCCx/O5sNhBbSEBfovPTfnZc 4hMYBRYwMqxilE3JrdLNTczMKU5N1i1OTszLSy3SNdHLzSzRS00p3cQICn1OSf4djN8OKh1i FOBgVOLh/Vks4SfEmlhWXJl7iFGSg0lJlJcXGDlCfEn5KZUZicUZ8UWlOanFhxglOJiVRHhr NgGV86YkVlalFuXDpKQ5WJTEecu9//sKCaQnlqRmp6YWpBbBZGU4OJQkeLtBhgoWpaanVqRl 5pQgpJk4OEGG8wAN3w9Sw1tckJhbnJkOkT/FqMtx6syCI4xCLHn5ealS4rxhIEUCIEUZpXlw c2Ap6xWjONBbwrzNIFU8wHQHN+kV0BImoCXTn4N8UFySiJCSamD0Tpi+/fXnnZtmH/WYeCY/ 9/SeJUc0Uut2GVhbHJxoaL670Mi2rYnZKe/++oOb70Zu2t812dN553rtu57XeHdHrJi4UvvD h8M/io6FabxZUGcofePpZAUFi0LWhZkvzJ5YvhJetf576+y4JUaz7V+d2XN8JYfm8cqKwzu8 727+E+h8hnGv2sWAg0osxRmJhlrMRcWJABKCQEQ0AwAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that clocksource.archdata is available, use it for ia64-specific code. Cc: Clemens Ladisch Cc: linux-ia64@vger.kernel.org Cc: Tony Luck Cc: Fenghua Yu Cc: John Stultz Cc: Thomas Gleixner Signed-off-by: Andy Lutomirski --- 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(-) create mode 100644 arch/ia64/include/asm/clocksource.h 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 34d6a1c..0833896 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -952,7 +952,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 9ab6b6a..0c79005 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 -- 1.7.6