diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 18:06:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 18:06:07 -0400 |
| commit | 4a1d7544fee5e601a4e642ce2720689f90428d65 (patch) | |
| tree | 2b79fe68b28e38183917606829d1bfce61f4e0be /arch/x86/include/asm | |
| parent | ecca5c3acc0d0933d89abc44e60afb0cc8170e35 (diff) | |
| parent | 8c91c5325e107ec17e40a59a47c6517387d64eb7 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner.
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Use correct byte-sized register constraint in __add()
x86: Use correct byte-sized register constraint in __xchg_op()
x86: vsyscall: Use NULL instead 0 for a pointer argument
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/cmpxchg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h index b3b733262909..99480e55973d 100644 --- a/arch/x86/include/asm/cmpxchg.h +++ b/arch/x86/include/asm/cmpxchg.h | |||
| @@ -43,7 +43,7 @@ extern void __add_wrong_size(void) | |||
| 43 | switch (sizeof(*(ptr))) { \ | 43 | switch (sizeof(*(ptr))) { \ |
| 44 | case __X86_CASE_B: \ | 44 | case __X86_CASE_B: \ |
| 45 | asm volatile (lock #op "b %b0, %1\n" \ | 45 | asm volatile (lock #op "b %b0, %1\n" \ |
| 46 | : "+r" (__ret), "+m" (*(ptr)) \ | 46 | : "+q" (__ret), "+m" (*(ptr)) \ |
| 47 | : : "memory", "cc"); \ | 47 | : : "memory", "cc"); \ |
| 48 | break; \ | 48 | break; \ |
| 49 | case __X86_CASE_W: \ | 49 | case __X86_CASE_W: \ |
| @@ -173,7 +173,7 @@ extern void __add_wrong_size(void) | |||
| 173 | switch (sizeof(*(ptr))) { \ | 173 | switch (sizeof(*(ptr))) { \ |
| 174 | case __X86_CASE_B: \ | 174 | case __X86_CASE_B: \ |
| 175 | asm volatile (lock "addb %b1, %0\n" \ | 175 | asm volatile (lock "addb %b1, %0\n" \ |
| 176 | : "+m" (*(ptr)) : "ri" (inc) \ | 176 | : "+m" (*(ptr)) : "qi" (inc) \ |
| 177 | : "memory", "cc"); \ | 177 | : "memory", "cc"); \ |
| 178 | break; \ | 178 | break; \ |
| 179 | case __X86_CASE_W: \ | 179 | case __X86_CASE_W: \ |