From 14873ee18b8a10bdd9ee785c4e00f71f276de766 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 29 Jun 2006 19:58:28 -0700
Subject: [PATCH] --- yaml --- r: 31528 b: refs/heads/master c:
 1815aed5edbc79c6f3de6f022efb0af30dd0a70d h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc64/kernel/of_device.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 66a64a8529a8..72c70b045b8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1d22d3258aed732e1778ecb2e840e6c95cb668e
+refs/heads/master: 1815aed5edbc79c6f3de6f022efb0af30dd0a70d
diff --git a/trunk/arch/sparc64/kernel/of_device.c b/trunk/arch/sparc64/kernel/of_device.c
index 3670dc8a7d5f..169b017eec0b 100644
--- a/trunk/arch/sparc64/kernel/of_device.c
+++ b/trunk/arch/sparc64/kernel/of_device.c
@@ -602,6 +602,9 @@ static void __init build_device_resources(struct of_device *op,
 	build_res:
 		memset(r, 0, sizeof(*r));
 		if (result != OF_BAD_ADDR) {
+			if (tlb_type == hypervisor)
+				result &= 0x0fffffffffffffffUL;
+
 			r->start = result;
 			r->end = result + size - 1;
 			r->flags = flags;