Hi Mark and Alex,
Please pull the ARM Transparent Hugepages support to LSK based on v3.10. These are a prerequisite for KVM/ARM/arm64 support.
For the resolution of any conflicts, see my example merge of these branches here: http://git.linaro.org/git-ro/people/christoffer.dall/linux-kvm-arm.git lsk/lsk-with-kvm-v3.10
The following changes since commit 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376:
Linux 3.10 (2013-06-30 15:13:29 -0700)
are available in the git repository at:
http://git.linaro.org/git-ro/people/christoffer.dall/linux-kvm-arm.git arm-thp-for-lsk-v3.10-v1
for you to fetch changes up to 3b132a8c46e7d0a95ceb75098aeeb06958fa7670:
ARM: mm: Transparent huge page support for LPAE systems. (2014-10-02 20:24:59 +0200)
---------------------------------------------------------------- ARM Transparent hugepages support for LSK v3.10 support
---------------------------------------------------------------- Catalin Marinas (2): ARM: mm: HugeTLB support for LPAE systems. ARM: mm: Transparent huge page support for LPAE systems.
Steve Capper (2): ARM: mm: correct pte_same behaviour for LPAE. ARM: mm: Add support for flushing HugeTLB pages.
arch/arm/Kconfig | 8 +++ arch/arm/include/asm/hugetlb-3level.h | 71 +++++++++++++++++++ arch/arm/include/asm/hugetlb.h | 84 +++++++++++++++++++++++ arch/arm/include/asm/pgtable-3level-hwdef.h | 4 ++ arch/arm/include/asm/pgtable-3level.h | 88 ++++++++++++++++++++++++ arch/arm/include/asm/pgtable.h | 3 + arch/arm/include/asm/tlb.h | 6 ++ arch/arm/include/asm/tlbflush.h | 2 + arch/arm/mm/Makefile | 1 + arch/arm/mm/dma-mapping.c | 2 +- arch/arm/mm/flush.c | 25 ++++--- arch/arm/mm/fsr-3level.c | 4 +- arch/arm/mm/hugetlbpage.c | 101 ++++++++++++++++++++++++++++ 13 files changed, 386 insertions(+), 13 deletions(-) create mode 100644 arch/arm/include/asm/hugetlb-3level.h create mode 100644 arch/arm/include/asm/hugetlb.h create mode 100644 arch/arm/mm/hugetlbpage.c
On 8 October 2014 19:16, Christoffer Dall christoffer.dall@linaro.org wrote:
for you to fetch changes up to 3b132a8c46e7d0a95ceb75098aeeb06958fa7670:
ARM: mm: Transparent huge page support for LPAE systems. (2014-10-02 20:24:59 +0200)
Also looks good to me, again pushed out for test. I'll let you know if anything comes up there.
linaro-kernel@lists.linaro.org