]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Nov 2017 04:21:44 +0000 (20:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Nov 2017 04:21:44 +0000 (20:21 -0800)
commit1deab8ce2c91e3b16563b7a7ea150f82334262ec
tree954b2d9d27df9765b9579b10f87054e1effd6cb3
parent817002475046737877915d87889a012d851650fa
parent70f3c8b7c2e7ebcdde8354da004872e7c9184e97
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc updates from David Miller:

 1) Add missing cmpxchg64() for 32-bit sparc.

 2) Timer conversions from Allen Pais and Kees Cook.

 3) vDSO support, from Nagarathnam Muthusamy.

 4) Fix sparc64 huge page table walks based upon bug report by Al Viro,
    from Nitin Gupta.

 5) Optimized fls() for T4 and above, from Vijay Kumar.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix page table walk for PUD hugepages
  sparc64: Convert timers to user timer_setup()
  sparc64: convert mdesc_handle.refcnt from atomic_t to refcount_t
  sparc/led: Convert timers to use timer_setup()
  sparc64: Use sparc optimized fls and __fls for T4 and above
  sparc64: SPARC optimized __fls function
  sparc64: SPARC optimized fls function
  sparc64: Define SPARC default __fls function
  sparc64: Define SPARC default fls function
  vDSO for sparc
  sparc32: Add cmpxchg64().
  sbus: char: Move D7S_MINOR to include/linux/miscdevice.h
  sparc: time: Remove unneeded linux/miscdevice.h include
  sparc64: mmu_context: Add missing include files
18 files changed:
arch/sparc/Kconfig
arch/sparc/Makefile
arch/sparc/include/asm/bitops_64.h
arch/sparc/include/asm/cmpxchg_32.h
arch/sparc/include/asm/elf_64.h
arch/sparc/include/asm/mmu_64.h
arch/sparc/include/asm/mmu_context_64.h
arch/sparc/include/asm/processor_64.h
arch/sparc/include/asm/tsb.h
arch/sparc/kernel/Makefile
arch/sparc/kernel/head_64.S
arch/sparc/kernel/mdesc.c
arch/sparc/kernel/time_64.c
arch/sparc/kernel/viohs.c
arch/sparc/lib/Makefile
arch/sparc/lib/NG4patch.S
arch/sparc/lib/atomic32.c
include/linux/miscdevice.h