srcu: Make SRCU be once again optional

Commit d160a727c4 ("srcu: Make SRCU be built by default") in response
to build errors, which were caused by code that included srcu.h
despite !SRCU.  However, srcutiny.o is almost 2K of code, which is not
insignificant for those attempting to run the Linux kernel on IoT devices.
This commit therefore makes SRCU be once again optional, and adjusts
srcu.h to allow error-free inclusion in !SRCU kernel builds.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
This commit is contained in:
Paul E. McKenney 2017-04-28 13:53:04 -07:00
parent ea9b0c8a26
commit 07f6e64bf2
2 changed files with 6 additions and 2 deletions

View file

@ -62,8 +62,13 @@ int init_srcu_struct(struct srcu_struct *sp);
#include <linux/srcutree.h> #include <linux/srcutree.h>
#elif defined(CONFIG_CLASSIC_SRCU) #elif defined(CONFIG_CLASSIC_SRCU)
#include <linux/srcuclassic.h> #include <linux/srcuclassic.h>
#else #elif defined(CONFIG_SRCU)
#error "Unknown SRCU implementation specified to kernel configuration" #error "Unknown SRCU implementation specified to kernel configuration"
#else
/* Dummy definition for things like notifiers. Actual use gets link error. */
struct srcu_struct { };
#endif #endif
/** /**

View file

@ -521,7 +521,6 @@ config RCU_EXPERT
config SRCU config SRCU
bool bool
default y
help help
This option selects the sleepable version of RCU. This version This option selects the sleepable version of RCU. This version
permits arbitrary sleeping or blocking within RCU read-side critical permits arbitrary sleeping or blocking within RCU read-side critical