From b4aea7f9075245102c0c7543eb246f9aec58cd29 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 14 Jul 2008 08:08:45 -0500 Subject: [PATCH] --- yaml --- r: 101839 b: refs/heads/master c: 585583d95c5660973bc0cf64add517b040acd8a4 h: refs/heads/master i: 101837: 8fe52f750f540175ae4acda7b60f30592d6354a5 101835: 1a6392e8b2fcecc8db129ae3806b13b387a60ebf 101831: 2648e1a5840948fc3c6cdd228df4cde51a9986a2 101823: ea4d55ed7d063f58e1140a37427f522a9be9a182 v: v3 --- [refs] | 2 +- trunk/include/asm-powerpc/pgtable-ppc32.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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