diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 12:38:28 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-30 12:38:28 +0200 |
| commit | d7e25c66c9bf882450060fd9464e784bd229d3ae (patch) | |
| tree | 0fb9525f91b11226a5a4b861cefd9fc5679f5c9b /arch/sh | |
| parent | 907241dccb4ce5d9413cf3c030b32b0cfc184914 (diff) | |
| parent | e4aad64597d7a2455a541f904365b48d607916db (diff) | |
| download | linux-d7e25c66c9bf882450060fd9464e784bd229d3ae.tar.bz2 | |
Merge branch 'x86/urgent' into x86/asm
Get the cr4 fixes so we can apply the final cleanup
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/atomic-llsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/atomic-llsc.h b/arch/sh/include/asm/atomic-llsc.h index caea2c45f6c2..1d159ce50f5a 100644 --- a/arch/sh/include/asm/atomic-llsc.h +++ b/arch/sh/include/asm/atomic-llsc.h @@ -60,7 +60,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ " movco.l %0, @%3 \n" \ " bf 1b \n" \ " synco \n" \ - : "=&z" (temp), "=&z" (res) \ + : "=&z" (temp), "=&r" (res) \ : "r" (i), "r" (&v->counter) \ : "t"); \ \ |