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
  ...

diff --cc arch/xtensa/Kconfig
index f8df0cc70cb63bf2f0fa5e509f474f92cacc112c,c3ccf379289a5f88840642063386bbac1c3e5c4d..ba56e11cbf77697f4e972fadd7dd3281f07d4376
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -64,9 -65,9 +65,12 @@@ config MM
  config VARIANT_IRQ_SWITCH
        def_bool n
  
 +config HAVE_XTENSA_GPIO32
 +      def_bool n
 +
+ config MAY_HAVE_SMP
+       def_bool n
+ 
  menu "Processor type and features"
  
  choice

diff --cc arch/xtensa/include/asm/barrier.h
index e1ee6b51dfc586abd8dc04d1188385a1b6d16d3b,8e5e5c980a7a4b1b01708c8160e0559f5ad63963..0a24b04d6b217b6e5a355005edeb65c7a4f8985d
--- 1/arch/xtensa/include/asm/barrier.h
--- 2/arch/xtensa/include/asm/barrier.h
+++ b/arch/xtensa/include/asm/barrier.h
@@@ -13,10 -16,16 +13,6 @@@
  #define rmb() barrier()
  #define wmb() mb()
  
--#ifdef CONFIG_SMP
- #error smp_* not defined
 -#define smp_mb()      mb()
 -#define smp_rmb()     rmb()
 -#define smp_wmb()     wmb()
 -#else
 -#define smp_mb()      barrier()
 -#define smp_rmb()     barrier()
 -#define smp_wmb()     barrier()
--#endif
--
 -#define set_mb(var, value)    do { var = value; mb(); } while (0)
 +#include <asm-generic/barrier.h>
  
  #endif /* _XTENSA_SYSTEM_H */

diff --cc drivers/irqchip/Kconfig
Simple merge

diff --cc drivers/irqchip/Makefile
Simple merge