linux-next: manual merge of the tip tree with the rr tree

From: Stephen Rothwell
Date: Thu Sep 03 2009 - 04:25:56 EST

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/setup.c between commit
("cpumask:remove-last-remaining-irqaction-mask") from the rr tree and
commit 845b3944bbdf9e9247849bf037f27ff3a3f26d87 ("x86: Add timer_init to
x86_init_ops") from the tip tree.

The latter moves the code that the former removes. I fixed it up using
the following patch (which I can carry as necessary).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: tip: fix merge for cupmask update

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index fcece00..7883cf9 100644
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -93,7 +93,6 @@ static struct irqaction irq0 = {

void __init setup_default_timer_irq(void)
- irq0.mask = cpumask_of_cpu(0);
setup_irq(0, &irq0);

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at