diff --git a/[refs] b/[refs]
index 15657df796b4..50713c6e521d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf44bbc26cf1361b692ab68c884f6a0df7da2fdb
+refs/heads/master: 95714e12dfb4794ee120f058fdf763e61baaad82
diff --git a/trunk/arch/sparc/kernel/of_device.c b/trunk/arch/sparc/kernel/of_device.c
index 13a70bd87817..3ebe6cc71e71 100644
--- a/trunk/arch/sparc/kernel/of_device.c
+++ b/trunk/arch/sparc/kernel/of_device.c
@@ -488,9 +488,9 @@ static void __init build_device_resources(struct of_device *op,
 	build_res:
 		memset(r, 0, sizeof(*r));
 		if (result != OF_BAD_ADDR) {
-			r->start = result;
+			r->start = result & 0xffffffff;
 			r->end = result + size - 1;
-			r->flags = flags;
+			r->flags = flags | ((result >> 32ULL) & 0xffUL);
 		} else {
 			r->start = ~0UL;
 			r->end = ~0UL;