summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-09 11:18:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-09 11:18:59 -0700
commit8d97a6c32955103000872663db181b050245eb4d (patch)
tree10c069ac3bb87dec4e7a6ada1e3c1c49f2981e1b
parent4d3c4a42938a23cc826e6e191aaff3567541ad05 (diff)
parent86d35afb8e07d99f8bfba4eadf93d918b4741f66 (diff)
downloadlinux-8d97a6c32955103000872663db181b050245eb4d.tar.bz2
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timers fixlet from Thomas Gleixner: "Add Frederic Weisbecker as NOHZ/dyntick maintainer" [ And an unmentioned and unrelated typo fix in the same commit? Hmm.. ] * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: MAINTAINERS: Add Frederic Weisbecker as nohz/dyntics maintainer
-rw-r--r--MAINTAINERS14
-rw-r--r--include/linux/sched/nohz.h2
2 files changed, 13 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4f4057c8ffca..01dffc0a9e1f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6116,7 +6116,7 @@ F: drivers/hid/hid-sensor-*
F: drivers/iio/*/hid-*
F: include/linux/hid-sensor-*
-HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
+HIGH-RESOLUTION TIMERS, CLOCKEVENTS
M: Thomas Gleixner <tglx@linutronix.de>
L: linux-kernel@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@ -6124,7 +6124,6 @@ S: Maintained
F: Documentation/timers/
F: kernel/time/hrtimer.c
F: kernel/time/clockevents.c
-F: kernel/time/tick*.*
F: kernel/time/timer_*.c
F: include/linux/clockchips.h
F: include/linux/hrtimer.h
@@ -9291,6 +9290,17 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
S: Maintained
F: arch/nios2/
+NOHZ, DYNTICKS SUPPORT
+M: Frederic Weisbecker <fweisbec@gmail.com>
+M: Thomas Gleixner <tglx@linutronix.de>
+M: Ingo Molnar <mingo@kernel.org>
+L: linux-kernel@vger.kernel.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz
+S: Maintained
+F: kernel/time/tick*.*
+F: include/linux/tick.h
+F: include/linux/sched/nohz.h
+
NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
M: Pavel Machek <pavel@ucw.cz>
M: Sakari Ailus <sakari.ailus@iki.fi>
diff --git a/include/linux/sched/nohz.h b/include/linux/sched/nohz.h
index 7d3f75db23e5..028d17b918a7 100644
--- a/include/linux/sched/nohz.h
+++ b/include/linux/sched/nohz.h
@@ -2,7 +2,7 @@
#define _LINUX_SCHED_NOHZ_H
/*
- * This is the interface between the scheduler and nohz/dyntics:
+ * This is the interface between the scheduler and nohz/dynticks:
*/
#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)