From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2016 02:05:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d6542d76ec88dde3305b06c03952d87b15bbc292;p=deliverable%2Flinux.git

Merge git://git./linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile updates from Chris Metcalf:
 "This is an even quieter cycle than usual"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  Fix typo
  Fix typo
  Fix typo
  tile: sort the "select" lines in the TILE/TILEGX configs
  tile: clarify barrier semantics of atomic_add_return
  tile/defconfigs: Remove CONFIG_IPV6_PRIVACY
---

d6542d76ec88dde3305b06c03952d87b15bbc292
diff --cc arch/tile/Kconfig
index 76989b878f3c,c3bbb295bc4a..4820a02838ac
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -35,17 -18,21 +18,23 @@@ config TIL
  	select GENERIC_STRNCPY_FROM_USER
  	select GENERIC_STRNLEN_USER
  	select HAVE_ARCH_SECCOMP_FILTER
- 
- # FIXME: investigate whether we need/want these options.
- #	select HAVE_IOREMAP_PROT
- #	select HAVE_OPTPROBES
- #	select HAVE_REGS_AND_STACK_ACCESS_API
- #	select HAVE_HW_BREAKPOINT
- #	select PERF_EVENTS
- #	select HAVE_USER_RETURN_NOTIFIER
- #	config NO_BOOTMEM
- #	config ARCH_SUPPORTS_DEBUG_PAGEALLOC
- #	config HUGETLB_PAGE_SIZE_VARIABLE
+ 	select HAVE_ARCH_TRACEHOOK
+ 	select HAVE_CONTEXT_TRACKING
+ 	select HAVE_DEBUG_BUGVERBOSE
+ 	select HAVE_DEBUG_KMEMLEAK
+ 	select HAVE_DEBUG_STACKOVERFLOW
+ 	select HAVE_DMA_API_DEBUG
++	select HAVE_EXIT_THREAD
+ 	select HAVE_KVM if !TILEGX
++	select HAVE_NMI if USE_PMC
+ 	select HAVE_PERF_EVENTS
+ 	select HAVE_SYSCALL_TRACEPOINTS
+ 	select MODULES_USE_ELF_RELA
+ 	select SYSCTL_EXCEPTION_TRACE
+ 	select SYS_HYPERVISOR
+ 	select USER_STACKTRACE_SUPPORT
+ 	select USE_PMC if PERF_EVENTS
+ 	select VIRT_TO_BUS
  
  config MMU
  	def_bool y