From 89c47a0ad48f0da8e2984ce0f273019a64a3f518 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 25 Jul 2012 21:19:50 +0000
Subject: [PATCH] --- yaml --- r: 330236 b: refs/heads/master c:
 70267a7f47a5565519da5ca2dde35d3ebf7d6ffb h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/mm/hash_utils_64.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47500f0ca8b2..cce2a19d9b6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa97c32c1e6d6564cc385c36bfd28a2663a9bad6
+refs/heads/master: 70267a7f47a5565519da5ca2dde35d3ebf7d6ffb
diff --git a/trunk/arch/powerpc/mm/hash_utils_64.c b/trunk/arch/powerpc/mm/hash_utils_64.c
index 377e5cbedbbb..ba45739bdfe8 100644
--- a/trunk/arch/powerpc/mm/hash_utils_64.c
+++ b/trunk/arch/powerpc/mm/hash_utils_64.c
@@ -43,7 +43,6 @@
 #include <asm/uaccess.h>
 #include <asm/machdep.h>
 #include <asm/prom.h>
-#include <asm/abs_addr.h>
 #include <asm/tlbflush.h>
 #include <asm/io.h>
 #include <asm/eeh.h>
@@ -651,7 +650,7 @@ static void __init htab_initialize(void)
 		DBG("Hash table allocated at %lx, size: %lx\n", table,
 		    htab_size_bytes);
 
-		htab_address = abs_to_virt(table);
+		htab_address = __va(table);
 
 		/* htab absolute addr + encoded htabsize */
 		_SDR1 = table + __ilog2(pteg_count) - 11;