aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2013-02-04 18:48:46 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2013-02-04 18:48:46 -0500
commit077931446b85e7858bf9dc0927cd116669b965d2 (patch)
tree02fbdf4a42b30b841a61aca399bd0ac6a5c308e6 /init
parentf7c819c020db9796ae3a662b82a310617f92b15b (diff)
parent74876a98a87a115254b3a66a14b27320b7f0acaa (diff)
Merge branch 'nohz/printk-v8' into irq/core
Conflicts: kernel/irq_work.c Add support for printk in full dynticks CPU. * Don't stop tick with irq works pending. This fix is generally useful and concerns archs that can't raise self IPIs. * Flush irq works before CPU offlining. * Introduce "lazy" irq works that can wait for the next tick to be executed, unless it's stopped. * Implement klogd wake up using irq work. This removes the ad-hoc printk_tick()/printk_needs_cpu() hooks and make it working even in dynticks mode. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index e3227d7ba35d..a98e1acc122d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1259,6 +1259,7 @@ config HOTPLUG
1259config PRINTK 1259config PRINTK
1260 default y 1260 default y
1261 bool "Enable support for printk" if EXPERT 1261 bool "Enable support for printk" if EXPERT
1262 select IRQ_WORK
1262 help 1263 help
1263 This option enables normal printk support. Removing it 1264 This option enables normal printk support. Removing it
1264 eliminates most of the message strings from the kernel image 1265 eliminates most of the message strings from the kernel image