Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (dae57fb6) · Commits · 戴 / test

Pull timer fix from Ingo Molnar: "Fix for a misplaced export that can cause build failures in certain (rare) Kconfig situations" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tick: Move the export of tick_broadcast_oneshot_control to the proper place

kernel/time/tick-broadcast.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -839,7 +839,6 @@ out:
		raw_spin_unlock(&tick_broadcast_lock);
		return ret;
		}
		EXPORT_SYMBOL_GPL(tick_broadcast_oneshot_control);

		/*
		* Reset the one shot broadcast for a cpu

kernel/time/tick-common.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,7 @@ int tick_broadcast_oneshot_control(enum tick_broadcast_state state)

		return __tick_broadcast_oneshot_control(state);
		}
		EXPORT_SYMBOL_GPL(tick_broadcast_oneshot_control);

		#ifdef CONFIG_HOTPLUG_CPU
		/*

Admin message