diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-07-01 10:20:58 (GMT) |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-07-01 10:20:58 (GMT) |
| commit | aa729dccb5e8dfbc78e2e235b8754d6acccee731 (patch) | |
| tree | f6123726a25957481e2528b9b6b0d0cfd992a5fb /arch/arm/xen | |
| parent | ee877b5321c4dfee9dc9f2a12b19ddcd33149f6a (diff) | |
| parent | af07484863e0c20796081e57093886c22dc16705 (diff) | |
| download | linux-aa729dccb5e8dfbc78e2e235b8754d6acccee731.tar.xz | |
Merge branch 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux into upstream-hugepages
* 'for-next/hugepages' of git://git.linaro.org/people/stevecapper/linux:
ARM64: mm: THP support.
ARM64: mm: Raise MAX_ORDER for 64KB pages and THP.
ARM64: mm: HugeTLB support.
ARM64: mm: Move PTE_PROT_NONE bit.
ARM64: mm: Make PAGE_NONE pages read only and no-execute.
ARM64: mm: Restore memblock limit when map_mem finished.
mm: thp: Correct the HPAGE_PMD_ORDER check.
x86: mm: Remove general hugetlb code from x86.
mm: hugetlb: Copy general hugetlb code from x86 to mm.
x86: mm: Remove x86 version of huge_pmd_share.
mm: hugetlb: Copy huge_pmd_share from x86 to mm.
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable-hwdef.h
arch/arm64/include/asm/pgtable.h
Diffstat (limited to 'arch/arm/xen')
0 files changed, 0 insertions, 0 deletions