From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Mar 2019 21:27:53 +0000 (-0800)
Subject: Merge tag 'xtensa-20190307' of git://github.com/jcmvbkbc/linux-xtensa
X-Git-Tag: v5.4-rc1~1492
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd1c3ed76f26504621b5ce08b894666aafa38e47;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'xtensa-20190307' of git://github.com/jcmvbkbc/linux-xtensa

Pull xtensa updates from Max Filippov:

 - use generic spinlock/rwlock implementations

 - clean up IPI processing

 - document boot parameters passing to the kernel

 - fix get_wchan

 - various cleanups in time.c, process.c, traps.c and thread_info.h

* tag 'xtensa-20190307' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: simplify trap_init
  xtensa: drop unused definitions
  xtensa: fix get_wchan
  xtensa: use generic spinlock/rwlock implementation
  xtensa: provide xchg for sizes 1 and 2
  xtensa: clean up arch/xtensa/kernel/time.c
  xtensa: SMP: rework IPI processing
  xtensa: document boot parameter passing
---

dd1c3ed76f26504621b5ce08b894666aafa38e47
diff --cc arch/xtensa/include/asm/Kbuild
index 809f39c,27bd3d3..d939e13
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@@ -23,9 -23,10 +23,11 @@@ generic-y += mm-arch-hooks.
  generic-y += param.h
  generic-y += percpu.h
  generic-y += preempt.h
+ generic-y += qrwlock.h
+ generic-y += qspinlock.h
  generic-y += rwsem.h
  generic-y += sections.h
 +generic-y += socket.h
  generic-y += topology.h
  generic-y += trace_clock.h
  generic-y += vga.h