aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-19 20:47:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-19 20:47:58 -0500
commitb7133a9a103655cda254987a3c0975fd9d8c443f (patch)
tree85422ad8c32f1782a2ed3b87b7264b1b3953c105 /init
parente84cf5d0fd53badf3a93c790e280cc92a69ed999 (diff)
parent36a5df85e9a3c218b73f6cf80098016ca3f0410d (diff)
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq core changes from Ingo Molnar: "The biggest changes are the IRQ-work and printk changes from Frederic Weisbecker, which prepare the code for 'full dynticks' (the ability to stop or slow down the periodic tick arbitrarily, not just in idle time as today): - 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. - Cleanups and fixes." * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Export enable/disable_percpu_irq() arch Kconfig: Remove references to IRQ_PER_CPU irq_work: Remove return value from the irq_work_queue() function genirq: Avoid deadlock in spurious handling printk: Wake up klogd using irq_work irq_work: Make self-IPIs optable irq_work: Warn if there's still work on cpu_down irq_work: Flush work on CPU_DYING irq_work: Don't stop the tick with pending works nohz: Add API to check tick state irq_work: Remove CONFIG_HAVE_IRQ_WORK irq_work: Fix racy check on work pending flag irq_work: Fix racy IRQ_WORK_BUSY flag setting
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig
index b023334df142..dcb68ac42b78 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -20,12 +20,8 @@ config CONSTRUCTORS
20 bool 20 bool
21 depends on !UML 21 depends on !UML
22 22
23config HAVE_IRQ_WORK
24 bool
25
26config IRQ_WORK 23config IRQ_WORK
27 bool 24 bool
28 depends on HAVE_IRQ_WORK
29 25
30config BUILDTIME_EXTABLE_SORT 26config BUILDTIME_EXTABLE_SORT
31 bool 27 bool
@@ -1273,6 +1269,7 @@ config HOTPLUG
1273config PRINTK 1269config PRINTK
1274 default y 1270 default y
1275 bool "Enable support for printk" if EXPERT 1271 bool "Enable support for printk" if EXPERT
1272 select IRQ_WORK
1276 help 1273 help
1277 This option enables normal printk support. Removing it 1274 This option enables normal printk support. Removing it
1278 eliminates most of the message strings from the kernel image 1275 eliminates most of the message strings from the kernel image