diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 18:49:30 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 18:49:30 (GMT) |
| commit | 9b83d851a2bdd021e2135999e5bce3eb8fef94e6 (patch) | |
| tree | b8703e813b1d8d66fb262cd757f54f3c05966d50 /arch/xtensa/include/asm/barrier.h | |
| parent | 2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d (diff) | |
| parent | 9ed82c6866e2ab671935a75ea454047e8bddb177 (diff) | |
| download | linux-9b83d851a2bdd021e2135999e5bce3eb8fef94e6.tar.xz | |
Merge tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux
Pull Xtensa patches from Chris Zankel:
"The major changes are adding support for SMP for Xtensa, fixing and
cleaning up the ISS (simulator) network driver, and better support for
device trees"
* tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux: (40 commits)
xtensa: implement ndelay
xtensa: clean up udelay
xtensa: enable HAVE_PERF_EVENTS
xtensa: remap io area defined in device tree
xtensa: support default device tree buses
xtensa: initialize device tree clock sources
xtensa: xtfpga: fix definitions of platform devices
xtensa: standardize devicetree cpu compatible strings
xtensa: avoid duplicate of IO range definitions
xtensa: fix ATOMCTL register documentation
xtensa: Enable irqs after cpu is set online
xtensa: ISS: raise network polling rate to 10 times/sec
xtensa: remove unused XTENSA_ISS_NETWORK Kconfig parameter
xtensa: ISS: avoid simple_strtoul usage
xtensa: Switch to sched_clock_register()
xtensa: implement CPU hotplug
xtensa: add SMP support
xtensa: add MX irqchip
xtensa: clear timer IRQ unconditionally in its handler
xtensa: clean up do_interrupt/do_IRQ
...
Diffstat (limited to 'arch/xtensa/include/asm/barrier.h')
| -rw-r--r-- | arch/xtensa/include/asm/barrier.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/xtensa/include/asm/barrier.h b/arch/xtensa/include/asm/barrier.h index e1ee6b5..0a24b04 100644 --- a/arch/xtensa/include/asm/barrier.h +++ b/arch/xtensa/include/asm/barrier.h @@ -13,10 +13,6 @@ #define rmb() barrier() #define wmb() mb() -#ifdef CONFIG_SMP -#error smp_* not defined -#endif - #include <asm-generic/barrier.h> #endif /* _XTENSA_SYSTEM_H */ |