diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:19:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-07 10:19:31 +0100 |
| commit | ba3b8bb1263dfb87914ef0ccf5f3a78604b3686b (patch) | |
| tree | 142b9e56d8cae8f2c5514582bd767470a2b4147e /include/linux/pgtable.h | |
| parent | e0efb3168d34dc8c8c72718672b8902e40efff8f (diff) | |
| parent | 0477e92881850d44910a7e94fc2c46f96faa131f (diff) | |
Merge 5.10-rc7 into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/pgtable.h')
| -rw-r--r-- | include/linux/pgtable.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 71125a4676c4..e237004d498d 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1427,6 +1427,19 @@ typedef unsigned int pgtbl_mod_mask; #endif /* !__ASSEMBLY__ */ +#if !defined(MAX_POSSIBLE_PHYSMEM_BITS) && !defined(CONFIG_64BIT) +#ifdef CONFIG_PHYS_ADDR_T_64BIT +/* + * ZSMALLOC needs to know the highest PFN on 32-bit architectures + * with physical address space extension, but falls back to + * BITS_PER_LONG otherwise. + */ +#error Missing MAX_POSSIBLE_PHYSMEM_BITS definition +#else +#define MAX_POSSIBLE_PHYSMEM_BITS 32 +#endif +#endif + #ifndef has_transparent_hugepage #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define has_transparent_hugepage() 1 |