The patch titled
     Cast cmpxchg64 and cmpxchg64_local result for 386 and 486 - Fix missing 
parenthesis
has been added to the -mm tree.  Its filename is
     x86-cast-cmpxchg-and-cmpxchg_local-result-for-386-and-486-fix.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: Cast cmpxchg64 and cmpxchg64_local result for 386 and 486 - Fix 
missing parenthesis
From: Mathieu Desnoyers <[EMAIL PROTECTED]>

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]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/asm-x86/cmpxchg_32.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff -puN 
include/asm-x86/cmpxchg_32.h~x86-cast-cmpxchg-and-cmpxchg_local-result-for-386-and-486-fix
 include/asm-x86/cmpxchg_32.h
--- 
a/include/asm-x86/cmpxchg_32.h~x86-cast-cmpxchg-and-cmpxchg_local-result-for-386-and-486-fix
+++ a/include/asm-x86/cmpxchg_32.h
@@ -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;                                                          \
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
fix-frv-cmpxchg_local.patch
linux-kernel-markers-support-multiple-probes.patch
linux-kernel-markers-create-modpost-file.patch
x86-cast-cmpxchg-and-cmpxchg_local-result-for-386-and-486.patch
x86-cast-cmpxchg-and-cmpxchg_local-result-for-386-and-486-fix.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to