From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Jul 2015 04:47:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Tag: v5.15~15522
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=05a8256c586ab75bcd6b793737b2022a1a98cb1e;p=mirror_ubuntu-kernels.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile updates from Chris Metcalf:
 "These are a grab bag of changes to improve debugging and respond to a
  variety of issues raised on LKML over the last couple of months"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: avoid a "label not used" warning in do_page_fault()
  tile: vdso: use raw_read_seqcount_begin() in vdso
  tile: force CONFIG_TILEGX if ARCH != tilepro
  tile: improve stack backtrace
  tile: fix "odd fault" warning for stack backtraces
  tile: set up initial stack top to honor STACK_TOP_DELTA
  tile: support delivering NMIs for multicore backtrace
  drivers/tty/hvc/hvc_tile.c: properly return -EAGAIN
  tile: add <asm/word-at-a-time.h> and enable support functions
  tile: use READ_ONCE() in arch_spin_is_locked()
  tile: modify arch_spin_unlock_wait() semantics
---

05a8256c586ab75bcd6b793737b2022a1a98cb1e
diff --cc arch/tile/Kconfig
index 59cf0b911898,775db82afd3f..9def1f52d03a
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -28,7 -29,8 +29,9 @@@ config TIL
  	select HAVE_DEBUG_STACKOVERFLOW
  	select ARCH_WANT_FRAME_POINTERS
  	select HAVE_CONTEXT_TRACKING
 +	select EDAC_SUPPORT
+ 	select GENERIC_STRNCPY_FROM_USER
+ 	select GENERIC_STRNLEN_USER
  
  # FIXME: investigate whether we need/want these options.
  #	select HAVE_IOREMAP_PROT