From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753484AbbDBM3Z (ORCPT ); Thu, 2 Apr 2015 08:29:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60582 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752522AbbDBM3V (ORCPT ); Thu, 2 Apr 2015 08:29:21 -0400 Date: Thu, 2 Apr 2015 05:28:51 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, rafael.j.wysocki@intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: peterz@infradead.org, linux-kernel@vger.kernel.org, rafael.j.wysocki@intel.com, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com In-Reply-To: <2714218.nM5AEfAHj0@vostro.rjw.lan> References: <2714218.nM5AEfAHj0@vostro.rjw.lan> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] tick: Move clocksource related stuff to timekeeping.h Git-Commit-ID: bfb83b27519aa7ed9510f601a8f825a2c1484bc2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bfb83b27519aa7ed9510f601a8f825a2c1484bc2 Gitweb: http://git.kernel.org/tip/bfb83b27519aa7ed9510f601a8f825a2c1484bc2 Author: Thomas Gleixner AuthorDate: Wed, 25 Mar 2015 13:06:04 +0100 Committer: Ingo Molnar CommitDate: Wed, 1 Apr 2015 14:22:58 +0200 tick: Move clocksource related stuff to timekeeping.h Move clocksource related stuff to timekeeping.h and remove the pointless include from ntp.c Signed-off-by: Thomas Gleixner [ rjw: Subject ] Signed-off-by: Rafael J. Wysocki Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/2714218.nM5AEfAHj0@vostro.rjw.lan Signed-off-by: Ingo Molnar --- kernel/time/clocksource.c | 2 +- kernel/time/jiffies.c | 2 +- kernel/time/ntp.c | 1 - kernel/time/tick-internal.h | 6 ------ kernel/time/timekeeping.h | 7 +++++++ 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index c3be3c7..8b4010f 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -31,7 +31,7 @@ #include #include -#include "tick-internal.h" +#include "timekeeping.h" #include "timekeeping_internal.h" /** diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index c4bb518..347fecf 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c @@ -25,7 +25,7 @@ #include #include -#include "tick-internal.h" +#include "timekeeping.h" /* The Jiffies based clocksource is the lowest common * denominator clock source which should function on diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 0f60b08..9ad60d0 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -17,7 +17,6 @@ #include #include -#include "tick-internal.h" #include "ntp_internal.h" /* diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index c7b75be..cba5214 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -6,10 +6,6 @@ #include "timekeeping.h" -extern seqlock_t jiffies_lock; - -#define CS_NAME_LEN 32 - #ifdef CONFIG_GENERIC_CLOCKEVENTS #define TICK_DO_TIMER_NONE -1 @@ -169,5 +165,3 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); #endif /* GENERIC_CLOCKEVENTS */ -extern void do_timer(unsigned long ticks); -extern void update_wall_time(void); diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h index 1d91416..ead8794 100644 --- a/kernel/time/timekeeping.h +++ b/kernel/time/timekeeping.h @@ -19,4 +19,11 @@ extern void timekeeping_clocktai(struct timespec *ts); extern int timekeeping_suspend(void); extern void timekeeping_resume(void); +extern void do_timer(unsigned long ticks); +extern void update_wall_time(void); + +extern seqlock_t jiffies_lock; + +#define CS_NAME_LEN 32 + #endif