diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-25 14:08:57 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-25 14:08:57 +0200 |
| commit | 62cf20b32aee4ae889a2eb40fd41c0eab73de970 (patch) | |
| tree | a3bd7d28b380b0a3e52398542910027c6c8a92cb /kernel | |
| parent | fc0830fe017d02b7b4995b5c402b484b65d9dfc6 (diff) | |
| download | kernel_goldelico_gta04-62cf20b32aee4ae889a2eb40fd41c0eab73de970.zip kernel_goldelico_gta04-62cf20b32aee4ae889a2eb40fd41c0eab73de970.tar.gz kernel_goldelico_gta04-62cf20b32aee4ae889a2eb40fd41c0eab73de970.tar.bz2 | |
tick: Move skew_tick option into the HIGH_RES_TIMER section
commit 5307c95 (tick: Add tick skew boot option) broke the
!CONFIG_HIGH_RES_TIMERS build.
Move the boot option parsing into the CONFIG_HIGH_RES_TIMERS section.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Mike Galbraith <mgalbraith@suse.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/tick-sched.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 4eddbb5..efd3866 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -816,6 +816,14 @@ static enum hrtimer_restart tick_sched_timer(struct hrtimer *timer) static int sched_skew_tick; +static int __init skew_tick(char *str) +{ + get_option(&str, &sched_skew_tick); + + return 0; +} +early_param("skew_tick", skew_tick); + /** * tick_setup_sched_timer - setup the tick emulation timer */ @@ -920,11 +928,3 @@ int tick_check_oneshot_change(int allow_nohz) tick_nohz_switch_to_nohz(); return 0; } - -static int __init skew_tick(char *str) -{ - get_option(&str, &sched_skew_tick); - - return 0; -} -early_param("skew_tick", skew_tick); |