aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-04-12 08:39:10 -0400
committerThomas Gleixner <tglx@linutronix.de>2018-04-26 08:56:24 -0400
commit14d12bb8582e158006c35cce0f8ae1706094f9a4 (patch)
treed877811d7bdd86e18a724d291a67d5bc1cf68105
parent7d878817db22f64c2b2c241335ec03e4c3fd5476 (diff)
x86/mm: Make vmemmap and vmalloc base address constants unsigned long
Commits 9b46a051e4 ("x86/mm: Initialize vmemmap_base at boot-time") and a7412546d8 ("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: 9b46a051e4 ("x86/mm: Initialize vmemmap_base at boot-time") Fixes: a7412546d8 ("x86/mm: Adjust vmalloc base and size at boot-time") Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Link: https://lkml.kernel.org/r/nycvar.YFH.7.76.1804121437350.28129@cbobk.fhfr.pm
-rw-r--r--arch/x86/include/asm/pgtable_64_types.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
index d5c21a382475..adb47552e6bb 100644
--- a/arch/x86/include/asm/pgtable_64_types.h
+++ b/arch/x86/include/asm/pgtable_64_types.h
@@ -105,14 +105,14 @@ extern unsigned int ptrs_per_p4d;
105#define LDT_PGD_ENTRY (pgtable_l5_enabled ? LDT_PGD_ENTRY_L5 : LDT_PGD_ENTRY_L4) 105#define LDT_PGD_ENTRY (pgtable_l5_enabled ? LDT_PGD_ENTRY_L5 : LDT_PGD_ENTRY_L4)
106#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT) 106#define LDT_BASE_ADDR (LDT_PGD_ENTRY << PGDIR_SHIFT)
107 107
108#define __VMALLOC_BASE_L4 0xffffc90000000000 108#define __VMALLOC_BASE_L4 0xffffc90000000000UL
109#define __VMALLOC_BASE_L5 0xffa0000000000000 109#define __VMALLOC_BASE_L5 0xffa0000000000000UL
110 110
111#define VMALLOC_SIZE_TB_L4 32UL 111#define VMALLOC_SIZE_TB_L4 32UL
112#define VMALLOC_SIZE_TB_L5 12800UL 112#define VMALLOC_SIZE_TB_L5 12800UL
113 113
114#define __VMEMMAP_BASE_L4 0xffffea0000000000 114#define __VMEMMAP_BASE_L4 0xffffea0000000000UL
115#define __VMEMMAP_BASE_L5 0xffd4000000000000 115#define __VMEMMAP_BASE_L5 0xffd4000000000000UL
116 116
117#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT 117#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT
118# define VMALLOC_START vmalloc_base 118# define VMALLOC_START vmalloc_base