From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jan 2014 18:49:30 +0000 (-0800)
Subject: Merge tag 'xtensa-next-20140123' of git://github.com/czankel/xtensa-linux
X-Git-Tag: v3.14-rc1~99
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b83d851a2bdd021e2135999e5bce3eb8fef94e6;p=platform%2Fkernel%2Flinux-stable.git

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

9b83d851a2bdd021e2135999e5bce3eb8fef94e6
diff --cc arch/xtensa/Kconfig
index f8df0cc,c3ccf37..ba56e11
--- a/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 e1ee6b5,8e5e5c9..0a24b04
--- a/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 */