diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 11:55:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 11:55:42 -0400 |
| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch) | |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f /init/Kconfig | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index aef16f9b3d2..9b68fee8d79 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -308,7 +308,7 @@ menu "RCU Subsystem" | |||
| 308 | 308 | ||
| 309 | choice | 309 | choice |
| 310 | prompt "RCU Implementation" | 310 | prompt "RCU Implementation" |
| 311 | default CLASSIC_RCU | 311 | default TREE_RCU |
| 312 | 312 | ||
| 313 | config CLASSIC_RCU | 313 | config CLASSIC_RCU |
| 314 | bool "Classic RCU" | 314 | bool "Classic RCU" |