]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jul 2015 04:47:12 +0000 (21:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Jul 2015 04:47:12 +0000 (21:47 -0700)
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

1  2 
arch/tile/Kconfig
arch/tile/include/asm/uaccess.h
arch/tile/kernel/setup.c
arch/tile/mm/fault.c

index 59cf0b911898c6b800d375eb4c45d8f356e3547d,775db82afd3fc7d0d153bbf3550699ee182582a3..9def1f52d03a4f86e0cdfba6d90c0b83ec670c18
@@@ -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
Simple merge
Simple merge
Simple merge