diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-10 19:39:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-10 19:39:04 +0100 |
| commit | c32c2cb27268f0adad0b6afbebe860ac5250c388 (patch) | |
| tree | 046bc27d2b62c19cb31a1510ddae8e8f61e2a97a /fs/jffs2/dir.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | arm64: hugetlb: partial revert of 66b3923a1a0f (diff) | |
| download | linux-c32c2cb27268f0adad0b6afbebe860ac5250c388.tar.xz linux-c32c2cb27268f0adad0b6afbebe860ac5250c388.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon:
"I thought we were done for 4.5, but then the 64k-page chaps came
crawling out of the woodwork. *sigh*
The vmemmap fix I sent for -rc7 caused a regression with 64k pages and
sparsemem and at some point during the release cycle the new hugetlb
code using contiguous ptes started failing the libhugetlbfs tests with
64k pages enabled.
So here are a couple of patches that fix the vmemmap alignment and
disable the new hugetlb page sizes whilst a proper fix is being
developed:
- Temporarily disable huge pages built using contiguous ptes
- Ensure vmemmap region is sufficiently aligned for sparsemem
sections"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: hugetlb: partial revert of 66b3923a1a0f
arm64: account for sparsemem section alignment when choosing vmemmap offset
Diffstat (limited to 'fs/jffs2/dir.c')
0 files changed, 0 insertions, 0 deletions