Two pairs of parenthesis were missing around the result cast of cmpxchg64 and cmpxchg64_local. This is a rather stupid mistake in "Cast cmpxchg and cmpxchg_local result for 386 and 486". My bad. This fix should be folded with the previous.
Sorry for this trivial bug which should have never appeared in the first place. The aim was to fix cmpxchg and cmpxchg_local, which were used in slub. cmpxchg64 and cmpxchg64_local happen to be only used in LTTng currently. Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]> Cc: Christoph Lameter <[EMAIL PROTECTED]> Cc: Vegard Nossum <[EMAIL PROTECTED]> Cc: Pekka Enberg <[EMAIL PROTECTED]> Cc: Ingo Molnar <[EMAIL PROTECTED]> Cc: Thomas Gleixner <[EMAIL PROTECTED]> CC: [EMAIL PROTECTED] --- include/asm-x86/cmpxchg_32.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6-lttng/include/asm-x86/cmpxchg_32.h =================================================================== --- linux-2.6-lttng.orig/include/asm-x86/cmpxchg_32.h 2008-02-12 17:49:32.000000000 -0500 +++ linux-2.6-lttng/include/asm-x86/cmpxchg_32.h 2008-02-12 17:50:18.000000000 -0500 @@ -305,11 +305,11 @@ extern unsigned long long cmpxchg_486_u6 ({ \ __typeof__(*(ptr)) __ret; \ if (likely(boot_cpu_data.x86 > 4)) \ - __ret = __typeof__(*(ptr))__cmpxchg64((ptr), \ + __ret = (__typeof__(*(ptr)))__cmpxchg64((ptr), \ (unsigned long long)(o), \ (unsigned long long)(n)); \ else \ - __ret = __typeof__(*(ptr))cmpxchg_486_u64((ptr), \ + __ret = (__typeof__(*(ptr)))cmpxchg_486_u64((ptr), \ (unsigned long long)(o), \ (unsigned long long)(n)); \ __ret; \ @@ -318,11 +318,11 @@ extern unsigned long long cmpxchg_486_u6 ({ \ __typeof__(*(ptr)) __ret; \ if (likely(boot_cpu_data.x86 > 4)) \ - __ret = __typeof__(*(ptr))__cmpxchg64_local((ptr), \ + __ret = (__typeof__(*(ptr)))__cmpxchg64_local((ptr), \ (unsigned long long)(o), \ (unsigned long long)(n)); \ else \ - __ret = __typeof__(*(ptr))cmpxchg_486_u64((ptr), \ + __ret = (__typeof__(*(ptr)))cmpxchg_486_u64((ptr), \ (unsigned long long)(o), \ (unsigned long long)(n)); \ __ret; \ -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/