diff --git a/[refs] b/[refs]
index f647f4a8fea8..0cb19bdb5f81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41832a08feca695158e15a6e58c26b224a7bfae2
+refs/heads/master: 6a800d456a81a9046634bcd26d868fd537f0c9ae
diff --git a/trunk/arch/sparc64/kernel/irq.c b/trunk/arch/sparc64/kernel/irq.c
index 4dcb8af94090..a38cb5036df0 100644
--- a/trunk/arch/sparc64/kernel/irq.c
+++ b/trunk/arch/sparc64/kernel/irq.c
@@ -756,7 +756,7 @@ void handler_irq(int irq, struct pt_regs *regs)
 		clear_softint(clr_mask);
 	}
 #else
-	int should_forward = 0;
+	int should_forward = 1;
 
 	clear_softint(1 << irq);
 #endif
@@ -1007,10 +1007,10 @@ static int retarget_one_irq(struct irqaction *p, int goal_cpu)
 	}
 	upa_writel(tid | IMAP_VALID, imap);
 
-	do {
+	while (!cpu_online(goal_cpu)) {
 		if (++goal_cpu >= NR_CPUS)
 			goal_cpu = 0;
-	} while (!cpu_online(goal_cpu));
+	}
 
 	return goal_cpu;
 }
diff --git a/trunk/include/net/addrconf.h b/trunk/include/net/addrconf.h
index f1e5af4be98e..a0ed93672176 100644
--- a/trunk/include/net/addrconf.h
+++ b/trunk/include/net/addrconf.h
@@ -17,6 +17,8 @@
 
 #define IPV6_MAX_ADDRESSES		16
 
+#include <linux/in6.h>
+
 struct prefix_info {
 	__u8			type;
 	__u8			length;
@@ -43,7 +45,6 @@ struct prefix_info {
 
 #ifdef __KERNEL__
 
-#include <linux/in6.h>
 #include <linux/netdevice.h>
 #include <net/if_inet6.h>
 #include <net/ipv6.h>