diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-12 20:44:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-12 20:44:11 +0100 |
| commit | 35239e23c66f1614c76739b62a299c3c92d6eb68 (patch) | |
| tree | 7b1e068df888ec9a00b43c1dd7517a6490da6a94 /arch/alpha/include/asm | |
| parent | 3f33ab1c0c741bfab2138c14ba1918a7905a1e8b (diff) | |
| parent | 87e24f4b67e68d9fd8df16e0bf9c66d1ad2a2533 (diff) | |
| download | lwn-35239e23c66f1614c76739b62a299c3c92d6eb68.tar.gz lwn-35239e23c66f1614c76739b62a299c3c92d6eb68.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We are going to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/include/asm')
| -rw-r--r-- | arch/alpha/include/asm/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/futex.h b/arch/alpha/include/asm/futex.h index e8a761aee088..f939794363ac 100644 --- a/arch/alpha/include/asm/futex.h +++ b/arch/alpha/include/asm/futex.h @@ -108,7 +108,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, " lda $31,3b-2b(%0)\n" " .previous\n" : "+r"(ret), "=&r"(prev), "=&r"(cmp) - : "r"(uaddr), "r"((long)oldval), "r"(newval) + : "r"(uaddr), "r"((long)(int)oldval), "r"(newval) : "memory"); *uval = prev; |