diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 09:09:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 09:09:37 -0800 |
| commit | b3a0d9a232c72c38c9db6fe1456015a82119afc3 (patch) | |
| tree | 3bcb2ad7f749ca2aabca73b0acfd3cb72d7364ed /arch/arc/include | |
| parent | 63f4f7e8df6c504f39c6493799b54775916030d6 (diff) | |
| parent | 30b9dbee895ff0d5cbf155bd1ef3f0f5992bca6f (diff) | |
| download | linux-b3a0d9a232c72c38c9db6fe1456015a82119afc3.tar.bz2 | |
Merge tag 'arc-4.4-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
"Found a couple of brown paper bag bugs with the prev pull request
(including a SMP build breakage report from Guenter). Since these are
urgent I also decided to send over a bunch of other pending fixes
which could have otherwise waited an rc or two.
Summary:
- A bunch of brown paper bag bugs (MAINTAINERS list email, SMP build
failure)
- cpu_relax() now compiler barrier for UP as well
- handling of userspace Bus Errors for ARCompact builds"
* tag 'arc-4.4-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: Fix silly typo in MAINTAINERS file
ARC: cpu_relax() to be compiler barrier even for UP
ARC: use ASL assembler mnemonic
ARC: [arcompact] Handle bus error from userspace as Interrupt not exception
ARC: remove extraneous header include
ARCv2: lib: memcpy: use local symbols
Diffstat (limited to 'arch/arc/include')
| -rw-r--r-- | arch/arc/include/asm/processor.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index 44545354e9e8..1d694c1ef6d6 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h @@ -57,11 +57,7 @@ struct task_struct; * A lot of busy-wait loops in SMP are based off of non-volatile data otherwise * get optimised away by gcc */ -#ifdef CONFIG_SMP #define cpu_relax() __asm__ __volatile__ ("" : : : "memory") -#else -#define cpu_relax() do { } while (0) -#endif #define cpu_relax_lowlatency() cpu_relax() |