From 79ad80123e8ce494ef8a33b4e79482b7a7ce6260 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Wed, 6 Sep 2006 14:34:41 -0500
Subject: [PATCH] --- yaml --- r: 34096 b: refs/heads/master c:
 5a2fe38d2844ba2f2dd8f4946d795e09d8f7e095 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/head_64.S  | 2 +-
 trunk/arch/powerpc/kernel/setup_64.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fd4aaf9fcaf2..7450ae67b8dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7e89214aadf82fa5eaff28f50f2078fa6ae773c
+refs/heads/master: 5a2fe38d2844ba2f2dd8f4946d795e09d8f7e095
diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S
index e9963d9f335a..3065b472b95d 100644
--- a/trunk/arch/powerpc/kernel/head_64.S
+++ b/trunk/arch/powerpc/kernel/head_64.S
@@ -1748,7 +1748,7 @@ _STATIC(__after_prom_start)
 _GLOBAL(copy_and_flush)
 	addi	r5,r5,-8
 	addi	r6,r6,-8
-4:	li	r0,16			/* Use the least common		*/
+4:	li	r0,8			/* Use the smallest common	*/
 					/* denominator cache line	*/
 					/* size.  This results in	*/
 					/* extra cache line flushes	*/
diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c
index 77efe19ccd2c..00d6b8addd78 100644
--- a/trunk/arch/powerpc/kernel/setup_64.c
+++ b/trunk/arch/powerpc/kernel/setup_64.c
@@ -78,10 +78,10 @@ u64 ppc64_pft_size;
  * before we've read this from the device tree.
  */
 struct ppc64_caches ppc64_caches = {
-	.dline_size = 0x80,
-	.log_dline_size = 7,
-	.iline_size = 0x80,
-	.log_iline_size = 7
+	.dline_size = 0x40,
+	.log_dline_size = 6,
+	.iline_size = 0x40,
+	.log_iline_size = 6
 };
 EXPORT_SYMBOL_GPL(ppc64_caches);