From: Paul Mackerras <paulus@samba.org>
Date: Sun, 25 Sep 2005 12:51:50 +0000 (+1000)
Subject: Merge from Linus' tree.
X-Git-Tag: v2.6.15-rc1~59^2~250
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e5baa396af7560382d2cf3f0871d616b61fc284c;p=linux-2.6-omap-h63xx.git

Merge from Linus' tree.
---

e5baa396af7560382d2cf3f0871d616b61fc284c
diff --cc arch/ppc64/mm/hash_native.c
index 29b074505d3,eb1bbb5b6c1..874cf96938f
--- a/arch/ppc64/mm/hash_native.c
+++ b/arch/ppc64/mm/hash_native.c
@@@ -350,7 -349,14 +348,8 @@@ static void native_flush_hash_range(uns
  
  	j = 0;
  	for (i = 0; i < number; i++) {
 -		if (batch->addr[i] < KERNELBASE)
 -			vsid = get_vsid(context, batch->addr[i]);
 -		else
 -			vsid = get_kernel_vsid(batch->addr[i]);
 -
 -		va = (vsid << 28) | (batch->addr[i] & 0x0fffffff);
 -		batch->vaddr[j] = va;
 +		va = batch->vaddr[j];
+ 		large = pte_huge(batch->pte[i]);
  		if (large)
  			vpn = va >> HPAGE_SHIFT;
  		else