diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:51:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:51:35 +0200 |
| commit | de66ee979d0ea45171cc2501750e9f9f22f5a690 (patch) | |
| tree | 5ab1a5c6b596b9b786902fb380274e1e1f4ceb13 /kernel/hrtimer.c | |
| parent | 916f676f8dc016103f983c7ec54c18ecdbb6e349 (diff) | |
| parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) | |
| download | op-kernel-dev-de66ee979d0ea45171cc2501750e9f9f22f5a690.zip op-kernel-dev-de66ee979d0ea45171cc2501750e9f9f22f5a690.tar.gz | |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index c541ee5..a9205e3 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -748,7 +748,7 @@ static inline void retrigger_next_event(void *arg) { } */ void clock_was_set(void) { -#ifdef CONFIG_HIGHRES_TIMERS +#ifdef CONFIG_HIGH_RES_TIMERS /* Retrigger the CPU local events everywhere */ on_each_cpu(retrigger_next_event, NULL, 1); #endif |
