From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2016 19:22:07 +0000 (-0700)
Subject: Merge tag 'xtensa-next-20160320' of git://github.com/czankel/xtensa-linux
X-Git-Tag: v4.6-rc1~82
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=fffad3e1b34aaced7724ef513dff0d8232ad8d80

Merge tag 'xtensa-next-20160320' of git://github.com/czankel/xtensa-linux

Pull Xtensa updates from Chris Zankel:
 "Xtensa improvements for 4.6:

   - control whether perf IRQ is treated as NMI from Kconfig
   - implement ioremap for regions outside KIO segment
   - fix ISS serial port behaviour when EOF is reached
   - fix preemption in {clear,copy}_user_highpage
   - fix endianness issues for XTFPGA devices, big-endian cores are now
     fully functional
   - clean up debug infrastructure and add support for hardware
     breakpoints and watchpoints
   - add processor configurations for Three Core HiFi-2 MX and HiFi3
     cpus"

* tag 'xtensa-next-20160320' of git://github.com/czankel/xtensa-linux:
  xtensa: add test_kc705_hifi variant
  xtensa: add Three Core HiFi-2 MX Variant.
  xtensa: support hardware breakpoints/watchpoints
  xtensa: use context structure for debug exceptions
  xtensa: remove remaining non-functional KGDB bits
  xtensa: clear all DBREAKC registers on start
  xtensa: xtfpga: fix earlycon endianness
  xtensa: xtfpga: fix i2c controller register width and endianness
  xtensa: xtfpga: fix ethernet controller endianness
  xtensa: xtfpga: fix serial port register width and endianness
  xtensa: define CONFIG_CPU_{BIG,LITTLE}_ENDIAN
  xtensa: fix preemption in {clear,copy}_user_highpage
  xtensa: ISS: don't hang if stdin EOF is reached
  xtensa: support ioremap for memory outside KIO region
  xtensa: use XTENSA_INT_LEVEL macro in asm/timex.h
  xtensa: make fake NMI configurable
---

fffad3e1b34aaced7724ef513dff0d8232ad8d80
diff --cc arch/xtensa/Kconfig
index 7e9464b0fc00,b8e9de1e7832..e832d3e9835e
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -15,8 -15,10 +15,9 @@@ config XTENS
  	select GENERIC_PCI_IOMAP
  	select GENERIC_SCHED_CLOCK
  	select HAVE_DMA_API_DEBUG
 -	select HAVE_DMA_ATTRS
  	select HAVE_FUNCTION_TRACER
  	select HAVE_FUTEX_CMPXCHG if !MMU
+ 	select HAVE_HW_BREAKPOINT if PERF_EVENTS
  	select HAVE_IRQ_TIME_ACCOUNTING
  	select HAVE_OPROFILE
  	select HAVE_PERF_EVENTS