diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-22 21:50:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-22 21:50:58 +0100 |
commit | 94521b2fd27b5ef43573f9f425a48839fa80ebaa (patch) | |
tree | f7eb4c2f26c29a11a5aded14172d4c6e74e64a63 /arch/mips/include/asm/local.h | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | parisc: Map kernel text and data on huge pages (diff) | |
download | linux-94521b2fd27b5ef43573f9f425a48839fa80ebaa.tar.xz linux-94521b2fd27b5ef43573f9f425a48839fa80ebaa.zip |
Merge branch 'parisc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc update from Helge Deller:
"This patchset adds Huge Page and HUGETLBFS support for parisc"
Honestly, the hugepage support should have gone through in the merge
window, and is not really an rc-time fix. But it only touches
arch/parisc, and I cannot find it in myself to care. If one of the
three parisc users notices a breakage, I will point at Helge and make
rude farting noises.
* 'parisc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Map kernel text and data on huge pages
parisc: Add Huge Page and HUGETLBFS support
parisc: Use long branch to do_syscall_trace_exit
parisc: Increase initial kernel mapping to 32MB on 64bit kernel
parisc: Initialize the fault vector earlier in the boot process.
parisc: Add defines for Huge page support
parisc: Drop unused MADV_xxxK_PAGES flags from asm/mman.h
parisc: Drop definition of start_thread_som for HP-UX SOM binaries
parisc: Fix wrong comment regarding first pmd entry flags
Diffstat (limited to 'arch/mips/include/asm/local.h')
0 files changed, 0 insertions, 0 deletions