From 80e7d5a7d2220643646b179aa6ff75536cabb550 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 18 Nov 2010 14:39:24 +1100
Subject: [PATCH] --- yaml --- r: 222189 b: refs/heads/master c:
 acbfd58e8a1f24ef644a90a90825c3f435b990f5 h: refs/heads/master i:   222187:
 e615ad3dfd6746dce26601652986ecc6a8e3b11b v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/boot/div64.S | 3 ++-
 trunk/include/linux/hardirq.h   | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2f2308668486..590e1a3baea7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89
+refs/heads/master: acbfd58e8a1f24ef644a90a90825c3f435b990f5
diff --git a/trunk/arch/powerpc/boot/div64.S b/trunk/arch/powerpc/boot/div64.S
index 722f360a32a9..d271ab542673 100644
--- a/trunk/arch/powerpc/boot/div64.S
+++ b/trunk/arch/powerpc/boot/div64.S
@@ -33,9 +33,10 @@ __div64_32:
 	cntlzw	r0,r5		# we are shifting the dividend right
 	li	r10,-1		# to make it < 2^32, and shifting
 	srw	r10,r10,r0	# the divisor right the same amount,
-	add	r9,r4,r10	# rounding up (so the estimate cannot
+	addc	r9,r4,r10	# rounding up (so the estimate cannot
 	andc	r11,r6,r10	# ever be too large, only too small)
 	andc	r9,r9,r10
+	addze	r9,r9
 	or	r11,r5,r11
 	rotlw	r9,r9,r0
 	rotlw	r11,r11,r0
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 714da7e5d10c..bea1612d8f5c 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -2,6 +2,8 @@
 #define LINUX_HARDIRQ_H
 
 #include <linux/preempt.h>
+#ifdef CONFIG_PREEMPT
+#endif
 #include <linux/lockdep.h>
 #include <linux/ftrace_irq.h>
 #include <asm/hardirq.h>