diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-07 20:42:57 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-07 20:42:57 +0100 |
commit | b84449dc14d274a3f3c78cd734b702ca31aa4dd1 (patch) | |
tree | ab61e05babc155ed3b17c9d5d7898e2b860f84bd /Makefile | |
parent | Merge tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | parisc: qemu idle sleep support (diff) | |
download | linux-b84449dc14d274a3f3c78cd734b702ca31aa4dd1.tar.xz linux-b84449dc14d274a3f3c78cd734b702ca31aa4dd1.zip |
Merge branch 'parisc-4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
- Many small fixes to show the real physical addresses of devices
instead of hashed addresses.
- One important fix to unbreak 32-bit SMP support: We forgot to 16-byte
align the spinlocks in the assembler code.
- Qemu support: The host will get a chance to sleep when the parisc
guest is idle. We use the same mechanism as the power architecture by
overlaying the "or %r10,%r10,%r10" instruction which is simply a nop
on real hardware.
* 'parisc-4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: qemu idle sleep support
parisc: Fix alignment of pa_tlb_lock in assembly on 32-bit SMP kernel
parisc: Show unhashed EISA EEPROM address
parisc: Show unhashed HPA of Dino chip
parisc: Show initial kernel memory layout unhashed
parisc: Show unhashed hardware inventory
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions