diff --git a/[refs] b/[refs]
index 021710fc2e98..44c2afeeba05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ff86b0317bc40c665aab62f3b7669713ade07c5
+refs/heads/master: 585583d95c5660973bc0cf64add517b040acd8a4
diff --git a/trunk/include/asm-powerpc/pgtable-ppc32.h b/trunk/include/asm-powerpc/pgtable-ppc32.h
index 11eede4a2906..73015f0139de 100644
--- a/trunk/include/asm-powerpc/pgtable-ppc32.h
+++ b/trunk/include/asm-powerpc/pgtable-ppc32.h
@@ -624,7 +624,7 @@ static inline unsigned long long pte_update(pte_t *p,
 	: "cc" );
 #else /* PTE_ATOMIC_UPDATES */
 	unsigned long long old = pte_val(*p);
-	*p = __pte((old & ~clr) | set);
+	*p = __pte((old & ~(unsigned long long)clr) | set);
 #endif /* !PTE_ATOMIC_UPDATES */
 
 #ifdef CONFIG_44x