From d115a6d6a9377225d9d687ae6ebff866b2346a2a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 20 Jun 2008 21:50:20 +0200 Subject: [PATCH] --- yaml --- r: 99354 b: refs/heads/master c: 437a0a54eea7b101e8a5b70688009956f6522ed0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/bitops.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fc9178668af8..1e8dbec40079 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dbceaf9bb68919651901b101f44edd5391ee489 +refs/heads/master: 437a0a54eea7b101e8a5b70688009956f6522ed0 diff --git a/trunk/include/asm-x86/bitops.h b/trunk/include/asm-x86/bitops.h index 6c5054819719..96b1829cea15 100644 --- a/trunk/include/asm-x86/bitops.h +++ b/trunk/include/asm-x86/bitops.h @@ -58,7 +58,7 @@ static inline void set_bit(unsigned int nr, volatile unsigned long *addr) if (IS_IMMEDIATE(nr)) { asm volatile(LOCK_PREFIX "orb %1,%0" : CONST_MASK_ADDR(nr, addr) - : "i" (CONST_MASK(nr)) + : "iq" ((u8)CONST_MASK(nr)) : "memory"); } else { asm volatile(LOCK_PREFIX "bts %1,%0" @@ -95,7 +95,7 @@ static inline void clear_bit(int nr, volatile unsigned long *addr) if (IS_IMMEDIATE(nr)) { asm volatile(LOCK_PREFIX "andb %1,%0" : CONST_MASK_ADDR(nr, addr) - : "i" (~CONST_MASK(nr))); + : "iq" ((u8)~CONST_MASK(nr))); } else { asm volatile(LOCK_PREFIX "btr %1,%0" : BITOP_ADDR(addr)