From patchwork Mon Sep 17 22:04:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11473 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 306DD2415D for ; Mon, 17 Sep 2012 22:05:25 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 821FB3D08FCF for ; Mon, 17 Sep 2012 22:05:24 +0000 (UTC) Received: by ieak11 with SMTP id k11so9905009iea.11 for ; Mon, 17 Sep 2012 15:05:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references:x-cbid :x-gm-message-state; bh=3ObhHD2WYuZVHl6kU+2Z8NWHo8n6I/2NrhddoO3zFYc=; b=Zn7zYfhFO8vuIn82lVM4gbnHNy5tIRAUh5nhsZg5I6FxQf5V1kBtrmXcdR/tIFsWXu 1DPNLxitsqZDhkLPAUnwC+CRjMnpON/gITnPiR0bwOsy8CAvGoJpozEKhOZuvMpvCfAC 2YiqaNbo7KMIrbgjhOSN/V4YV9kBhdm1RFsnX4/FF7WFTKuENDu4rvuOLngt0czwkmFL Rmq7vAzwBbUaABAPui7jAieFPgXm8/aMe9m+4kwSxBTYz8ID0tAaTMTX31qBj+oJUaza JQucGaOHYC/0xerQ4xemEQt5J1Llmw+gU5EzB3k0L5Gu+B3YUwjTTGDy/3Nh6QhRMx5r X7nQ== Received: by 10.50.89.164 with SMTP id bp4mr8470369igb.28.1347919523928; Mon, 17 Sep 2012 15:05:23 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp341509igc; Mon, 17 Sep 2012 15:05:23 -0700 (PDT) Received: by 10.42.62.143 with SMTP id y15mr10135518ich.38.1347919522676; Mon, 17 Sep 2012 15:05:22 -0700 (PDT) Received: from e4.ny.us.ibm.com (e4.ny.us.ibm.com. [32.97.182.144]) by mx.google.com with ESMTPS id x9si12198090igm.60.2012.09.17.15.05.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 15:05:22 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.182.144 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.182.144; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.182.144 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Sep 2012 18:05:22 -0400 Received: from d01relay07.pok.ibm.com (9.56.227.147) by e4.ny.us.ibm.com (192.168.1.104) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 17 Sep 2012 18:05:18 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8HM5GbL32702602; Mon, 17 Sep 2012 18:05:16 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8HM5FtG014633; Mon, 17 Sep 2012 19:05:16 -0300 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8HM5DvF014521; Mon, 17 Sep 2012 19:05:15 -0300 From: John Stultz To: linux-kernel Cc: John Stultz , Tony Luck , Paul Mackerras , Benjamin Herrenschmidt , Andy Lutomirski , Martin Schwidefsky , Paul Turner , Steven Rostedt , Richard Cochran , Prarit Bhargava , Thomas Gleixner Subject: [PATCH 2/6][RFC] time: Move update_vsyscall definitions to timekeeper_internal.h Date: Mon, 17 Sep 2012 18:04:57 -0400 Message-Id: <1347919501-64534-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347919501-64534-1-git-send-email-john.stultz@linaro.org> References: <1347919501-64534-1-git-send-email-john.stultz@linaro.org> x-cbid: 12091722-3534-0000-0000-00000CD52F18 X-Gm-Message-State: ALoCoQl7j/Ovv5wf11f4MokbZwSM359NMkpzZusZliYwqlo6VrBUPyUcO17La9vs9s4Ybyg0q7Qc Since users will need to include timekeeper_internal.h, move update_vsyscall definitions to timekeeper_internal.h. Cc: Tony Luck Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Andy Lutomirski Cc: Martin Schwidefsky Cc: Paul Turner Cc: Steven Rostedt Cc: Richard Cochran Cc: Prarit Bhargava Cc: Thomas Gleixner Signed-off-by: John Stultz --- arch/ia64/kernel/time.c | 2 +- arch/powerpc/kernel/time.c | 2 +- arch/s390/kernel/time.c | 2 +- arch/x86/kernel/vsyscall_64.c | 2 +- include/linux/clocksource.h | 16 ---------------- include/linux/timekeeper_internal.h | 17 +++++++++++++++++ kernel/time.c | 2 +- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index ecc904b..acb688f 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index e49e931..613a830d 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -73,7 +73,7 @@ /* powerpc clocksource/clockevent code */ #include -#include +#include static cycle_t rtc_read(struct clocksource *); static struct clocksource clocksource_rtc = { diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index dcec960..bfb62ad 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c index 8d141b3..6ec8411 100644 --- a/arch/x86/kernel/vsyscall_64.c +++ b/arch/x86/kernel/vsyscall_64.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index fbe89e1..4dceaf8 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -319,22 +319,6 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz) __clocksource_updatefreq_scale(cs, 1000, khz); } -#ifdef CONFIG_GENERIC_TIME_VSYSCALL -extern void -update_vsyscall(struct timespec *ts, struct timespec *wtm, - struct clocksource *c, u32 mult); -extern void update_vsyscall_tz(void); -#else -static inline void -update_vsyscall(struct timespec *ts, struct timespec *wtm, - struct clocksource *c, u32 mult) -{ -} - -static inline void update_vsyscall_tz(void) -{ -} -#endif extern void timekeeping_notify(struct clocksource *clock); diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index 8ba43fa..9c1c2cf 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -65,4 +65,21 @@ struct timekeeper { /* Seqlock for all timekeeper values */ seqlock_t lock; }; + + +#ifdef CONFIG_GENERIC_TIME_VSYSCALL +extern void +update_vsyscall(struct timespec *ts, struct timespec *wtm, + struct clocksource *c, u32 mult); +extern void update_vsyscall_tz(void); +#else +static inline void update_vsyscall(struct timespec *ts, struct timespec *wtm, + struct clocksource *c, u32 mult) +{ +} +static inline void update_vsyscall_tz(void) +{ +} +#endif + #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */ diff --git a/kernel/time.c b/kernel/time.c index ba744cf..d226c6a 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include