Commit 8d97a6c3 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4d3c4a42 86d35afb
...@@ -6116,7 +6116,7 @@ F: drivers/hid/hid-sensor-* ...@@ -6116,7 +6116,7 @@ F: drivers/hid/hid-sensor-*
F: drivers/iio/*/hid-* F: drivers/iio/*/hid-*
F: include/linux/hid-sensor-* F: include/linux/hid-sensor-*
HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS HIGH-RESOLUTION TIMERS, CLOCKEVENTS
M: Thomas Gleixner <tglx@linutronix.de> M: Thomas Gleixner <tglx@linutronix.de>
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
...@@ -6124,7 +6124,6 @@ S: Maintained ...@@ -6124,7 +6124,6 @@ S: Maintained
F: Documentation/timers/ F: Documentation/timers/
F: kernel/time/hrtimer.c F: kernel/time/hrtimer.c
F: kernel/time/clockevents.c F: kernel/time/clockevents.c
F: kernel/time/tick*.*
F: kernel/time/timer_*.c F: kernel/time/timer_*.c
F: include/linux/clockchips.h F: include/linux/clockchips.h
F: include/linux/hrtimer.h F: include/linux/hrtimer.h
...@@ -9291,6 +9290,17 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git ...@@ -9291,6 +9290,17 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
S: Maintained S: Maintained
F: arch/nios2/ 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) NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
M: Pavel Machek <pavel@ucw.cz> M: Pavel Machek <pavel@ucw.cz>
M: Sakari Ailus <sakari.ailus@iki.fi> M: Sakari Ailus <sakari.ailus@iki.fi>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _LINUX_SCHED_NOHZ_H #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) #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment