diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-21 00:12:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-21 00:12:21 -0500 |
| commit | f49028292c13b958fdf4f36c8cc8119d0dde187b (patch) | |
| tree | ea1f92969a8aca7083f19c4ef07dd3674509554f /drivers/net | |
| parent | eef8f4c2acac6fae84f2d959a145fa3cad4d00c9 (diff) | |
| parent | 78e691f4ae2d5edea0199ca802bb505b9cdced88 (diff) | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Documentation updates.
- Miscellaneous fixes.
- Preemptible-RCU fixes, including fixing an old bug in the
interaction of RCU priority boosting and CPU hotplug.
- SRCU updates.
- RCU CPU stall-warning updates.
- RCU torture-test updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d6607ee9c855..84673ebcf428 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -197,6 +197,7 @@ config NETCONSOLE_DYNAMIC | |||
| 197 | 197 | ||
| 198 | config NETPOLL | 198 | config NETPOLL |
| 199 | def_bool NETCONSOLE | 199 | def_bool NETCONSOLE |
| 200 | select SRCU | ||
| 200 | 201 | ||
| 201 | config NET_POLL_CONTROLLER | 202 | config NET_POLL_CONTROLLER |
| 202 | def_bool NETPOLL | 203 | def_bool NETPOLL |