summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-07-14 08:08:45 -0500
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 15:44:02 +1000
commit585583d95c5660973bc0cf64add517b040acd8a4 (patch)
tree4885b69235f5d34bd76260747dcf93f51a362b50 /include
parent7ff86b0317bc40c665aab62f3b7669713ade07c5 (diff)
downloadop-kernel-dev-585583d95c5660973bc0cf64add517b040acd8a4.zip
op-kernel-dev-585583d95c5660973bc0cf64add517b040acd8a4.tar.gz
powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES
Because the pte is now 64-bits the compiler was optimizing the update to always clear the upper 32-bits of the pte. We need to ensure the clr mask is treated as an unsigned long long to get the proper behavior. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/pgtable-ppc32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h
index 11eede4..73015f0 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/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
OpenPOWER on IntegriCloud