Merge "rcu: update: Make RCU_EXPEDITE_BOOT be the default" into msm-4.9 (9aed5b05) · Commits · e / devices / android_kernel_fairphone_FP3

init/Kconfig

+0 −13

Original line number	Diff line number	Diff line
		@@ -795,19 +795,6 @@ config RCU_NOCB_CPU_ALL

		endchoice

		config RCU_EXPEDITE_BOOT
		bool
		default n
		help
		This option enables expedited grace periods at boot time,
		as if rcu_expedite_gp() had been invoked early in boot.
		The corresponding rcu_unexpedite_gp() is invoked from
		rcu_end_inkernel_boot(), which is intended to be invoked
		at the end of the kernel-only boot sequence, just before
		init is exec'ed.

		Accept the default if unsure.

		endmenu # "RCU Subsystem"

		config BUILD_BIN2C

+2 −4

Original line number	Diff line number	Diff line
		@@ -132,8 +132,7 @@ bool rcu_gp_is_normal(void)
		}
		EXPORT_SYMBOL_GPL(rcu_gp_is_normal);

		static atomic_t rcu_expedited_nesting =
		ATOMIC_INIT(IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT) ? 1 : 0);
		static atomic_t rcu_expedited_nesting = ATOMIC_INIT(1);

		/*
		* Should normal grace-period primitives be expedited? Intended for
		@@ -182,7 +181,6 @@ EXPORT_SYMBOL_GPL(rcu_unexpedite_gp);
		*/
		void rcu_end_inkernel_boot(void)
		{
		if (IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT))
		rcu_unexpedite_gp();
		if (rcu_normal_after_boot)
		WRITE_ONCE(rcu_normal, 1);