Skip to contentSkip to conversation

Patch "tick: Move clocksource related stuff to timekeeping.h" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message Jun 29, 2015

Subsystems (3)
Stable branch Timekeeping, clocksource core, NTP, alarmtimer Nohz, dynticks support
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tick: Move clocksource related stuff to timekeeping.h

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tick-move-clocksource-related-stuff-to-timekeeping.h.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From bfb83b27519aa7ed9510f601a8f825a2c1484bc2 Mon Sep 17 00:00:00 2001

From: Thomas Gleixner <[email protected]>
Date: Wed, 25 Mar 2015 13:06:04 +0100
Subject: tick: Move clocksource related stuff to timekeeping.h

From: Thomas Gleixner <[email protected]>

commit bfb83b27519aa7ed9510f601a8f825a2c1484bc2 upstream.

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

Signed-off-by Thomas Gleixner <[email protected]>
[ rjw: Subject ]
Signed-off-by Rafael J. Wysocki <[email protected]>
Cc Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
Signed-off-by Preeti U Murthy <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 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(-)
kernel/time/clocksource.c +1 -1
@@ -31,7 +31,7 @@
 #include <linux/tick.h>
 #include <linux/kthread.h>
 
-#include "tick-internal.h"
+#include "timekeeping.h"
 #include "timekeeping_internal.h"
 
 /**
kernel/time/jiffies.c +1 -1
@@ -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
kernel/time/ntp.c +0 -1
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 
-#include "tick-internal.h"
 #include "ntp_internal.h"
 
 /*
kernel/time/tick-internal.h +0 -6
@@ -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);
kernel/time/timekeeping.h +7 -0
@@ -19,4 +19,11 @@ extern void timekeeping_clocktai(struct
 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

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/tick-move-clocksource-related-stuff-to-timekeeping.h.patch queue-4.0/clockevents-remove-config_generic_clockevents_build.patch