diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-25 08:08:57 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-25 08:08:57 -0400 |
commit | 62cf20b32aee4ae889a2eb40fd41c0eab73de970 (patch) | |
tree | a3bd7d28b380b0a3e52398542910027c6c8a92cb /kernel/time | |
parent | fc0830fe017d02b7b4995b5c402b484b65d9dfc6 (diff) |
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/time')
-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 4eddbb5ea9c5..efd386667536 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) | |||
816 | 816 | ||
817 | static int sched_skew_tick; | 817 | static int sched_skew_tick; |
818 | 818 | ||
819 | static int __init skew_tick(char *str) | ||
820 | { | ||
821 | get_option(&str, &sched_skew_tick); | ||
822 | |||
823 | return 0; | ||
824 | } | ||
825 | early_param("skew_tick", skew_tick); | ||
826 | |||
819 | /** | 827 | /** |
820 | * tick_setup_sched_timer - setup the tick emulation timer | 828 | * tick_setup_sched_timer - setup the tick emulation timer |
821 | */ | 829 | */ |
@@ -920,11 +928,3 @@ int tick_check_oneshot_change(int allow_nohz) | |||
920 | tick_nohz_switch_to_nohz(); | 928 | tick_nohz_switch_to_nohz(); |
921 | return 0; | 929 | return 0; |
922 | } | 930 | } |
923 | |||
924 | static int __init skew_tick(char *str) | ||
925 | { | ||
926 | get_option(&str, &sched_skew_tick); | ||
927 | |||
928 | return 0; | ||
929 | } | ||
930 | early_param("skew_tick", skew_tick); | ||