diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/hrtimer.c | 2 | ||||
-rw-r--r-- | kernel/sysctl.c | 12 | ||||
-rw-r--r-- | kernel/timer.c | 10 |
3 files changed, 2 insertions, 22 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index ab80515008f4..3c00794bc88e 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1086,7 +1086,7 @@ ktime_t hrtimer_get_remaining(const struct hrtimer *timer) | |||
1086 | } | 1086 | } |
1087 | EXPORT_SYMBOL_GPL(hrtimer_get_remaining); | 1087 | EXPORT_SYMBOL_GPL(hrtimer_get_remaining); |
1088 | 1088 | ||
1089 | #if defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ) | 1089 | #ifdef CONFIG_NO_HZ |
1090 | /** | 1090 | /** |
1091 | * hrtimer_get_next_event - get the time until next expiry event | 1091 | * hrtimer_get_next_event - get the time until next expiry event |
1092 | * | 1092 | * |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 29116652dca8..f6d2e57b99a0 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -132,8 +132,6 @@ extern int sysctl_userprocess_debug; | |||
132 | extern int spin_retry; | 132 | extern int spin_retry; |
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | extern int sysctl_hz_timer; | ||
136 | |||
137 | #ifdef CONFIG_BSD_PROCESS_ACCT | 135 | #ifdef CONFIG_BSD_PROCESS_ACCT |
138 | extern int acct_parm[]; | 136 | extern int acct_parm[]; |
139 | #endif | 137 | #endif |
@@ -563,16 +561,6 @@ static struct ctl_table kern_table[] = { | |||
563 | .proc_handler = &proc_dointvec, | 561 | .proc_handler = &proc_dointvec, |
564 | }, | 562 | }, |
565 | #endif | 563 | #endif |
566 | #ifdef CONFIG_NO_IDLE_HZ | ||
567 | { | ||
568 | .ctl_name = KERN_HZ_TIMER, | ||
569 | .procname = "hz_timer", | ||
570 | .data = &sysctl_hz_timer, | ||
571 | .maxlen = sizeof(int), | ||
572 | .mode = 0644, | ||
573 | .proc_handler = &proc_dointvec, | ||
574 | }, | ||
575 | #endif | ||
576 | { | 564 | { |
577 | .ctl_name = KERN_S390_USER_DEBUG_LOGGING, | 565 | .ctl_name = KERN_S390_USER_DEBUG_LOGGING, |
578 | .procname = "userprocess_debug", | 566 | .procname = "userprocess_debug", |
diff --git a/kernel/timer.c b/kernel/timer.c index ceacc6626572..ef3fa6906e8f 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -812,7 +812,7 @@ static inline void __run_timers(struct tvec_base *base) | |||
812 | spin_unlock_irq(&base->lock); | 812 | spin_unlock_irq(&base->lock); |
813 | } | 813 | } |
814 | 814 | ||
815 | #if defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ) | 815 | #ifdef CONFIG_NO_HZ |
816 | /* | 816 | /* |
817 | * Find out when the next timer event is due to happen. This | 817 | * Find out when the next timer event is due to happen. This |
818 | * is used on S/390 to stop all activity when a cpus is idle. | 818 | * is used on S/390 to stop all activity when a cpus is idle. |
@@ -947,14 +947,6 @@ unsigned long get_next_timer_interrupt(unsigned long now) | |||
947 | 947 | ||
948 | return cmp_next_hrtimer_event(now, expires); | 948 | return cmp_next_hrtimer_event(now, expires); |
949 | } | 949 | } |
950 | |||
951 | #ifdef CONFIG_NO_IDLE_HZ | ||
952 | unsigned long next_timer_interrupt(void) | ||
953 | { | ||
954 | return get_next_timer_interrupt(jiffies); | ||
955 | } | ||
956 | #endif | ||
957 | |||
958 | #endif | 950 | #endif |
959 | 951 | ||
960 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING | 952 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING |