dyntick: Remove last reminants of dyntick support (ee9c5785) · Commits · 戴 / test

kernel/hrtimer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1078,7 +1078,7 @@ ktime_t hrtimer_get_remaining(const struct hrtimer *timer)
		}
		EXPORT_SYMBOL_GPL(hrtimer_get_remaining);

		#if defined(CONFIG_NO_IDLE_HZ) \|\| defined(CONFIG_NO_HZ)
		#ifdef CONFIG_NO_HZ
		/**
		* hrtimer_get_next_event - get the time until next expiry event
		*

+0 −12

Original line number	Diff line number	Diff line
		@@ -131,8 +131,6 @@ extern int sysctl_userprocess_debug;
		extern int spin_retry;
		#endif

		extern int sysctl_hz_timer;

		#ifdef CONFIG_BSD_PROCESS_ACCT
		extern int acct_parm[];
		#endif
		@@ -561,16 +559,6 @@ static struct ctl_table kern_table[] = {
		.mode = 0644,
		.proc_handler = &proc_dointvec,
		},
		#endif
		#ifdef CONFIG_NO_IDLE_HZ
		{
		.ctl_name = KERN_HZ_TIMER,
		.procname = "hz_timer",
		.data = &sysctl_hz_timer,
		.maxlen = sizeof(int),
		.mode = 0644,
		.proc_handler = &proc_dointvec,
		},
		#endif
		{
		.ctl_name = KERN_S390_USER_DEBUG_LOGGING,

+1 −9

Original line number	Diff line number	Diff line
		@@ -812,7 +812,7 @@ static inline void __run_timers(struct tvec_base *base)
		spin_unlock_irq(&base->lock);
		}

		#if defined(CONFIG_NO_IDLE_HZ) \|\| defined(CONFIG_NO_HZ)
		#ifdef CONFIG_NO_HZ
		/*
		* Find out when the next timer event is due to happen. This
		* 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)

		return cmp_next_hrtimer_event(now, expires);
		}

		#ifdef CONFIG_NO_IDLE_HZ
		unsigned long next_timer_interrupt(void)
		{
		return get_next_timer_interrupt(jiffies);
		}
		#endif

		#endif

		#ifndef CONFIG_VIRT_CPU_ACCOUNTING