Subject: linux-next: build failure after final merge (arm tree)

From: Stephen Rothwell <[email-masked]>
Date: Fri, 19 Feb 2010 17:39:29 +1100

Hi Russell,

After merging the scsi-post-merge tree, today's linux-next build (sparc32
defconfig) failed like this:

arch/sparc/mm/sun4c.c: In function 'sun4c_update_mmu_cache':
arch/sparc/mm/sun4c.c:1943: error: 'pte' undeclared (first use
 in this function)

Caused by commit 2dca0ca96ac340fbf4f9e0741dcf58ff3677e994 ("MM: Pass a
PTE pointer to update_mmu_cache() rather than the PTE itself").

I applied the following patch for today. It may not be correct.

From: Stephen Rothwell <[email-masked]>
Date: Fri, 19 Feb 2010 17:33:16 +1100
Subject: [PATCH] sparc: fix fallout from update_mmu_cache API change

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 arch/sparc/mm/sun4c.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 171f823..1865253 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -1929,7 +1929,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
 			start += PAGE_SIZE;
 		}
 #ifndef SUN4C_PRELOAD_PSEG
-		sun4c_put_pte(address, pte_val(pte));
+		sun4c_put_pte(address, pte_val(*ptep));
 #endif
 		local_irq_restore(flags);
 		return;
@@ -1940,7 +1940,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
 		add_lru(entry);
 	}
 
-	sun4c_put_pte(address, pte_val(pte));
+	sun4c_put_pte(address, pte_val(*ptep));
 	local_irq_restore(flags);
 }
 
-- 
1.6.6.2

-- 
Cheers,
Stephen Rothwell                    [email-masked]