diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-31 17:44:53 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-03-31 17:44:53 +0300 |
| commit | cf39d37539068d53e015d8b4f1dcf42c65306b0d (patch) | |
| tree | c8dcbbc3a5c92beee82e83e2a2b597f328a919a6 /arch/powerpc/include/asm/page.h | |
| parent | 830948eb68265ac7f3f364aa9801550feafec0d6 (diff) | |
| parent | 463050599742a89e0508355e626e032e8d0dab8d (diff) | |
| download | linux-cf39d37539068d53e015d8b4f1dcf42c65306b0d.tar.xz | |
Merge tag 'kvmarm-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for Linux 5.7
- GICv4.1 support
- 32bit host removal
Diffstat (limited to 'arch/powerpc/include/asm/page.h')
| -rw-r--r-- | arch/powerpc/include/asm/page.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 86332080399a..080a0bf8e54b 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -295,8 +295,13 @@ static inline bool pfn_valid(unsigned long pfn) /* * Some number of bits at the level of the page table that points to * a hugepte are used to encode the size. This masks those bits. + * On 8xx, HW assistance requires 4k alignment for the hugepte. */ +#ifdef CONFIG_PPC_8xx +#define HUGEPD_SHIFT_MASK 0xfff +#else #define HUGEPD_SHIFT_MASK 0x3f +#endif #ifndef __ASSEMBLY__ |