diff --git a/[refs] b/[refs]
index 2f7645d949a2..ea7176fe67a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a60715f58907d4e1db7be6c31fa050c993e119b5
+refs/heads/master: 70da2d96306bea9ab56a1c6907b19f889dcdda5c
diff --git a/trunk/arch/parisc/include/asm/mmu_context.h b/trunk/arch/parisc/include/asm/mmu_context.h
index 93028975e2cf..354b2aca990e 100644
--- a/trunk/arch/parisc/include/asm/mmu_context.h
+++ b/trunk/arch/parisc/include/asm/mmu_context.h
@@ -34,7 +34,7 @@ destroy_context(struct mm_struct *mm)
 	mm->context = 0;
 }
 
-static inline unsigned long __space_to_prot(mm_context_t ctx)
+static inline unsigned long __space_to_prot(mm_context_t context)
 {
 #if SPACEID_SHIFT == 0
 	return context << 1;