Patches contributed by Eötvös Lorand University
commit c656d9ca48d3ef1a11449e892ce488ee0bb5a335
Merge: 71ab6b245fda a73ad3331fdb
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Dec 26 09:21:05 2008 +0100
Merge branch 'x86/fpu' into x86/cleanups
commit 32e8d18683adb322c994d1a0fe02d66380991f45
Merge: 4a6908a3a050 0a57b783018a 39c04b552403 b2e3c0adec91 001474491fab c29541b24fb2 8187926bdae9 a5a64498c194
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 18:02:25 2008 +0100
Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/rtc' into timers/core
diff --cc kernel/sched.c
index e4bb1dd7b308,e4bb1dd7b308,9b1e79371c20,5ac5e9536168,e4bb1dd7b308,e4bb1dd7b308,e4bb1dd7b308,57c933ffbee1..22c532a6f82c
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@@@@@@@@ -1453,12 -1453,12 -1453,11 -1451,11 -1453,12 -1453,12 -1453,12 -1445,9 +1451,12 @@@@@@@@@ static int task_hot(struct task_struct
static unsigned long cpu_avg_load_per_task(int cpu)
{
struct rq *rq = cpu_rq(cpu);
++ + unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
-- - if (rq->nr_running)
-- - rq->avg_load_per_task = rq->load.weight / rq->nr_running;
++ + if (nr_running)
++ + rq->avg_load_per_task = rq->load.weight / nr_running;
+ else
+ rq->avg_load_per_task = 0;
return rq->avg_load_per_task;
}
commit 860cf8894b326e4b89720f520540604834337b72
Merge: e262a7ba31f0 973656fe1afb f2b662da8d6b 4a6908a3a050
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 16:27:54 2008 +0100
Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into irq/core
diff --cc include/linux/irq.h
index 838a977885e1,7fa7f30fccb6,3dddfa703ebd,3dddfa703ebd..98564dc64476
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@@@@ -128,9 -129,14 -129,9 -129,9 +129,14 @@@@@ struct irq_chip
const char *typename;
};
+ ++struct timer_rand_state;
+ ++struct irq_2_iommu;
/**
* struct irq_desc - interrupt descriptor
- *
+ * @irq: interrupt number for this descriptor
+ ++ * @timer_rand_state: pointer to timer rand state struct
+ ++ * @kstat_irqs: irq stats per cpu
+ ++ * @irq_2_iommu: iommu with this irq
* @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()]
* @chip: low level interrupt hardware access
* @msi_desc: MSI descriptor
commit 973656fe1afb4adf95d7b9ab75d4660cd3821ea1
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 16:26:47 2008 +0100
x86, sparseirq: clean up Kconfig entry
Impact: improve help text
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d14a8806227d..e4c038abb71c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -242,10 +242,14 @@ config SPARSE_IRQ
bool "Support sparse irq numbering"
depends on PCI_MSI || HT_IRQ
help
- This enables support for sparse irq, esp for msi/msi-x. You may need
- if you have lots of cards supports msi-x installed.
+ This enables support for sparse irqs. This is useful for distro
+ kernels that want to define a high CONFIG_NR_CPUS value but still
+ want to have low kernel memory footprint on smaller machines.
- If you don't know what to do here, say Y.
+ ( Sparse IRQs can also be beneficial on NUMA boxes, as they spread
+ out the irq_desc[] array in a more NUMA-friendly way. )
+
+ If you don't know what to do here, say N.
config NUMA_MIGRATE_IRQ_DESC
bool "Move irq desc when changing irq smp_affinity"
commit 6638101c1124c19c8a65b1645e4ecd09e0572f3e
Merge: cc37d3d20604 3ae7020543db a08636690d06 00ef9f7348df 26cc271db798 12d79bafb756 3ac52669c7a2 8b752e3ef6e3 9212ddb5eada
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 14:06:29 2008 +0100
Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/printk', 'core/rcu', 'core/resources', 'core/softirq' and 'core/stacktrace' into core/core
diff --cc lib/Kconfig.debug
index 1e3fd3e3436a,124ece1e67ad,b0f239e443bc,b0f239e443bc,b0f239e443bc,465d822f3f5d,b0f239e443bc,b0f239e443bc,b0f239e443bc..eae594cb6ea9
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@@@@@@@@ -544,17 -552,7 -544,7 -544,7 -544,7 -544,7 -544,7 -544,7 -544,7 +552,17 @@@@@@@@@@ config DEBUG_S
their sg tables.
If unsure, say N.
+
++++++++config DEBUG_NOTIFIERS
++++++++ bool "Debug notifier call chains"
++++++++ depends on DEBUG_KERNEL
++++++++ help
++++++++ Enable this to turn on sanity checking for notifier call chains.
++++++++ This is most useful for kernel developers to make sure that
++++++++ modules properly unregister themselves from notifier chains.
++++++++ This is a relatively cheap check but if you care about maximum
++++++++ performance, say N.
++++ +++
config FRAME_POINTER
bool "Compile the kernel with frame pointers"
depends on DEBUG_KERNEL && \
commit cc37d3d20604f3759d269247b022616f710aa52d
Merge: b594deb0cc54 b56863630ddb
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 13:54:14 2008 +0100
Merge branch 'core/futexes' into core/core
commit b594deb0cc54d857828d2e33b2e9d5a9f02f0e89
Merge: 0b271ef45217 ec5679e51330
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 13:53:11 2008 +0100
Merge branch 'core/debug' into core/core
commit 0b271ef4521756010675b1611bef20fd3096790d
Merge: b19b3c74c7bb 4a6908a3a050
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 13:51:46 2008 +0100
Merge commit 'v2.6.28' into core/core
commit 4e202284e6ac1695df3eb4a0e549ea78addfb663
Merge: 826e08b0157c 80f40ee4a075 4a6908a3a050
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 13:42:23 2008 +0100
Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core
commit 5250d329e38cdf7580faeb9c53c17d3588d7d19c
Merge: a3eeeefbf1cd 468a15bb4cc6 67be403d897f 98db8df77743 4a6908a3a050
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Dec 25 13:11:00 2008 +0100
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core