diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-18 06:10:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-18 06:10:40 +1000 |
| commit | e64826561e2820c1aec69ff01598a15db7a38fa1 (patch) | |
| tree | 56d3ed8319caf9b2b947c74333b379e5ba410a0e /arch | |
| parent | 4266af651ed1e719d0dd48753de751166d9114e6 (diff) | |
| parent | 0eaeb361a8942eafa6028b0bf47ea3a9b3651a21 (diff) | |
Merge remote-tracking branch 'kbuild/for-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5d0bf1aa9dcb..8e9de8cc300d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -542,7 +542,7 @@ config X86_32_IRIS config SCHED_OMIT_FRAME_POINTER def_bool y - prompt "Single-depth WCHAN output" + prompt "Single-depth WCHAN output" if !LTO && !FRAME_POINTER depends on X86 ---help--- Calculate simpler /proc/<PID>/wchan values. If this option |