diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 16:50:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 16:50:38 -0700 |
| commit | ce6a01c2d50e1d400cb6d492841f9b1932034fc2 (patch) | |
| tree | 16a8fd6f9250b019daa9afaacb33fe42e2d01a74 /arch/metag/include | |
| parent | bc231d9ede99518b67a77544d9084f15b898fe2e (diff) | |
| parent | 096a8b6d5e7ab9f8ca3d2474b3ca6a1fe79e0371 (diff) | |
| download | linux-ce6a01c2d50e1d400cb6d492841f9b1932034fc2.tar.gz linux-ce6a01c2d50e1d400cb6d492841f9b1932034fc2.tar.xz | |
Merge tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture updates from James Hogan:
"Three minor fixes:
- removal of stale comment
- fix build for Meta1 when perf events are enabled
- fix inline asm constraint in atomics"
* tag 'metag-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: Fix atomic_*_return inline asm constraints
metag: perf: fix build on Meta1
metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init
Diffstat (limited to 'arch/metag/include')
| -rw-r--r-- | arch/metag/include/asm/atomic_lnkget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/metag/include/asm/atomic_lnkget.h b/arch/metag/include/asm/atomic_lnkget.h index a62581815624..88fa25fae8bd 100644 --- a/arch/metag/include/asm/atomic_lnkget.h +++ b/arch/metag/include/asm/atomic_lnkget.h @@ -61,7 +61,7 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \ " CMPT %0, #HI(0x02000000)\n" \ " BNZ 1b\n" \ : "=&d" (temp), "=&da" (result) \ - : "da" (&v->counter), "bd" (i) \ + : "da" (&v->counter), "br" (i) \ : "cc"); \ \ smp_mb(); \ |