diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-04-04 11:02:15 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-04-04 11:02:15 +0200 |
| commit | cc46c03397c1865a181f1a4f66d4645806e5a943 (patch) | |
| tree | e3a762d8961219a61b96ae6e5ec875ba9fbe2314 /arch/powerpc/include/asm/page.h | |
| parent | d8a26d8fc37c5b8b9e95f2fa194f287cf8cab3f4 (diff) | |
| parent | 0e7e6198af28c1573267aba1be33dd0b7fb35691 (diff) | |
| download | kernel_replicant_linux-cc46c03397c1865a181f1a4f66d4645806e5a943.tar.gz kernel_replicant_linux-cc46c03397c1865a181f1a4f66d4645806e5a943.tar.bz2 kernel_replicant_linux-cc46c03397c1865a181f1a4f66d4645806e5a943.zip | |
Merge drm/drm-next into drm-misc-next-fixes
Alex needs v5.6 into drm-misc-next-fixes to merge a fix for a regression in
the scatterlist processing in PRIME.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
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__ |