diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-21 10:47:13 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-21 10:47:13 -0800 |
commit | 0c961c5511fe48834c73215d2203bdac3353dcae (patch) | |
tree | a27fe6de2c087f4f72eb9e2f6ce7af8ea3cd6b51 /fs/dlm/rcom.c | |
parent | bc1ecd626bedfa6b8cb09bacd56756ad18aed08f (diff) | |
parent | 160494d381373cfa21208484aea4e5db2d3cb0a8 (diff) | |
download | linux-0c961c5511fe48834c73215d2203bdac3353dcae.tar.bz2 |
Merge branch 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
- add Kernel address space layout randomization support
- re-enable interrupts earlier now that we have a working IRQ stack
- optimize the timer interrupt function to better cope with missed
timer irqs
- fix error return code in parisc perf code (by Dan Carpenter)
- fix PAT debug code
* 'parisc-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Optimize timer interrupt function
parisc: perf: return -EFAULT on error
parisc: Enhance CPU detection code on PAT machines
parisc: Re-enable interrupts early
parisc: Enable KASLR
Diffstat (limited to 'fs/dlm/rcom.c')
0 files changed, 0 insertions, 0 deletions