Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14d12bb8 authored by Jiri Kosina's avatar Jiri Kosina Committed by Thomas Gleixner
Browse files

x86/mm: Make vmemmap and vmalloc base address constants unsigned long 



Commits 9b46a051 ("x86/mm: Initialize vmemmap_base at boot-time") and 
a7412546 ("x86/mm: Adjust vmalloc base and size at boot-time") lost the 
type information for __VMALLOC_BASE_L4, __VMALLOC_BASE_L5, 
__VMEMMAP_BASE_L4 and __VMEMMAP_BASE_L5 constants.

Declare them explicitly unsigned long again.

Fixes: 9b46a051 ("x86/mm: Initialize vmemmap_base at boot-time")
Fixes: a7412546 ("x86/mm: Adjust vmalloc base and size at boot-time")
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatar"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Link: https://lkml.kernel.org/r/nycvar.YFH.7.76.1804121437350.28129@cbobk.fhfr.pm
parent 7d878817

arch/x86/include/asm/pgtable_64_types.h

+4 −4
Original line number Diff line number Diff line
@@ -105,14 +105,14 @@ extern unsigned int ptrs_per_p4d; 
#define LDT_PGD_ENTRY		(pgtable_l5_enabled ? LDT_PGD_ENTRY_L5 : LDT_PGD_ENTRY_L4)

#define LDT_BASE_ADDR		(LDT_PGD_ENTRY << PGDIR_SHIFT)



#define __VMALLOC_BASE_L4	0xffffc90000000000

#define __VMALLOC_BASE_L5 	0xffa0000000000000

#define __VMALLOC_BASE_L4	0xffffc90000000000UL

#define __VMALLOC_BASE_L5 	0xffa0000000000000UL



#define VMALLOC_SIZE_TB_L4	32UL

#define VMALLOC_SIZE_TB_L5	12800UL



#define __VMEMMAP_BASE_L4	0xffffea0000000000

#define __VMEMMAP_BASE_L5	0xffd4000000000000

#define __VMEMMAP_BASE_L4	0xffffea0000000000UL

#define __VMEMMAP_BASE_L5	0xffd4000000000000UL



#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT

# define VMALLOC_START		vmalloc_base