Patches contributed by Eötvös Lorand University
commit 84be58d4601c86306cd939ebf58a9b90989883a4
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 18 11:50:29 2009 +0100
dma-debug: fix dma_debug_add_bus() definition for !CONFIG_DMA_API_DEBUG
Impact: build fix
Fix:
arch/x86/kvm/x86.o: In function `dma_debug_add_bus':
(.text+0x0): multiple definition of `dma_debug_add_bus'
dma_debug_add_bus() should be a static inline function.
Cc: Joerg Roedel <joerg.roedel@amd.com>
LKML-Reference: <20090317120112.GP6159@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/include/linux/dma-debug.h b/include/linux/dma-debug.h
index e851d23e91eb..28d53cb7b5a2 100644
--- a/include/linux/dma-debug.h
+++ b/include/linux/dma-debug.h
@@ -83,7 +83,7 @@ extern void debug_dma_dump_mappings(struct device *dev);
#else /* CONFIG_DMA_API_DEBUG */
-void dma_debug_add_bus(struct bus_type *bus)
+static inline void dma_debug_add_bus(struct bus_type *bus)
{
}
commit 95f3c4ebffb5f5dd6c06bf48a8e24c7247b5139c
Merge: 04dfcfcb54b0 86f319529372
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 18 10:37:48 2009 +0100
Merge branch 'dma-api/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
commit 04dfcfcb54b073133bcca2c8f25b55e904558931
Merge: 0bd5c4f7c874 ee568b25ee9e
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 18 10:37:43 2009 +0100
Merge branch 'linus' into core/iommu
commit 37ba317c9ed19eb126e40bbf563f2711e191a636
Merge: 708dc5125309 ee568b25ee9e
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 18 09:57:02 2009 +0100
Merge branches 'sched/cleanups' and 'linus' into sched/core
commit 327019b01e068d66dada6a8b2571180ab3674d20
Merge: 03418c7efaa4 62524d55e5b9
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 18 06:59:56 2009 +0100
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
commit 03418c7efaa429dc7647ac93e3862e3fe1816873
Merge: 4176935b58ee ee568b25ee9e
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Mar 18 06:58:45 2009 +0100
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
commit 47239561e39bceefecc3cd67f71fcf86a198a8ff
Merge: ed681a91ab80 5bee17f18b59
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 17 16:21:20 2009 +0100
Merge branch 'linus' into core/printk
commit 4176935b58eeb636917e65a2c388e4607e36cce6
Merge: c269fc8c537d 6adaad14d7d4
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 17 10:37:37 2009 +0100
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
commit e4106133341121aeaad732d4613de06d9033b5ac
Merge: 7243f2145a9b 2fc1dfbe17e7
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Mar 17 08:37:20 2009 +0100
Merge branch 'tracing/syscalls' into tracing/core
commit edb35028e40515beb2f94808aff8b3e71fb9f35a
Merge: 8f8573ae9f5d cb065c06b6cc 5bee17f18b59
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Mar 16 09:20:13 2009 +0100
Merge branches 'irq/genirq' and 'linus' into irq/core
diff --cc arch/mips/kernel/irq.c
index 7c2dafa0f584,4b4007b3083a,4b4007b3083a..7b845ba9dff4
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@@@ -108,10 -108,9 -108,9 +108,9 @@@@ int show_interrupts(struct seq_file *p
seq_printf(p, "%10u ", kstat_irqs(i));
#else
for_each_online_cpu(j)
-- seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
++ seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif
seq_printf(p, " %14s", irq_desc[i].chip->name);
- seq_printf(p, "-%-8s", irq_desc[i].name);
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
diff --cc kernel/irq/manage.c
index cbc3828faf5f,8a22039a90ba,291f03664552..ea119effe096
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@@@ -709,7 -737,7 -709,7 +737,7 @@@@ int request_irq(unsigned int irq, irq_h
if (!handler)
return -EINVAL;
- action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
- action = kmalloc(sizeof(struct irqaction), GFP_ATOMIC);
+ + action = kzalloc(sizeof(struct irqaction), GFP_KERNEL);
if (!action)
return -ENOMEM;