From 1ae8292b75ed84465c13f4accfecaeb5bcf6e678 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Wed, 14 Jan 2009 13:42:41 +0000
Subject: [PATCH] --- yaml --- r: 129858 b: refs/heads/master c:
 b60c31d85a2a2f1a9c8623f1fb56e2688aa1e2b1 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/prom.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9657f8cb6adf..1e457fb0691e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ba0fdbfaed2e74005d87fab948c5522b86ff733
+refs/heads/master: b60c31d85a2a2f1a9c8623f1fb56e2688aa1e2b1
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
index c09cffafb6ee..f00f83109ab3 100644
--- a/trunk/arch/powerpc/kernel/prom.c
+++ b/trunk/arch/powerpc/kernel/prom.c
@@ -590,6 +590,11 @@ static void __init check_cpu_slb_size(unsigned long node)
 {
 	u32 *slb_size_ptr;
 
+	slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL);
+	if (slb_size_ptr != NULL) {
+		mmu_slb_size = *slb_size_ptr;
+		return;
+	}
 	slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL);
 	if (slb_size_ptr != NULL) {
 		mmu_slb_size = *slb_size_ptr;