[PATCH 03/35] tick: Cleanup internal header files

From: Peter Zijlstra
Date: Mon Feb 16 2015 - 08:12:36 EST


From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

Move clocksource related stuff to timekeeping.h and remove the
pointless include from ntp.c

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
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(-)

Index: linux/kernel/time/clocksource.c
===================================================================
--- linux.orig/kernel/time/clocksource.c
+++ linux/kernel/time/clocksource.c
@@ -31,7 +31,7 @@
#include <linux/tick.h>
#include <linux/kthread.h>

-#include "tick-internal.h"
+#include "timekeeping.h"
#include "timekeeping_internal.h"

void timecounter_init(struct timecounter *tc,
Index: linux/kernel/time/jiffies.c
===================================================================
--- linux.orig/kernel/time/jiffies.c
+++ linux/kernel/time/jiffies.c
@@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/init.h>

-#include "tick-internal.h"
+#include "timekeeping.h"

/* The Jiffies based clocksource is the lowest common
* denominator clock source which should function on
Index: linux/kernel/time/ntp.c
===================================================================
--- linux.orig/kernel/time/ntp.c
+++ linux/kernel/time/ntp.c
@@ -17,7 +17,6 @@
#include <linux/module.h>
#include <linux/rtc.h>

-#include "tick-internal.h"
#include "ntp_internal.h"

/*
Index: linux/kernel/time/tick-internal.h
===================================================================
--- linux.orig/kernel/time/tick-internal.h
+++ linux/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
@@ -168,5 +164,3 @@ int __clockevents_update_freq(struct clo

#endif /* GENERIC_CLOCKEVENTS */

-extern void do_timer(unsigned long ticks);
-extern void update_wall_time(void);
Index: linux/kernel/time/timekeeping.h
===================================================================
--- linux.orig/kernel/time/timekeeping.h
+++ linux/kernel/time/timekeeping.h
@@ -17,4 +17,11 @@ extern s32 timekeeping_get_tai_offset(vo
extern void timekeeping_set_tai_offset(s32 tai_offset);
extern void timekeeping_clocktai(struct timespec *ts);

+extern void do_timer(unsigned long ticks);
+extern void update_wall_time(void);
+
+extern seqlock_t jiffies_lock;
+
+#define CS_NAME_LEN 32
+
#endif


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