[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    x86/mm: Make vmemmap and vmalloc base address constants unsigned long
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2018-04-29 17:18:07
Message-ID: 20180429171807.1A977227F7 () pdx-korg-gitolite-1 ! ci ! codeaurora ! org
[Download RAW message or body]

Web:        https://git.kernel.org/torvalds/c/14d12bb8582e158006c35cce0f8ae1706094f9a4
Commit:     14d12bb8582e158006c35cce0f8ae1706094f9a4
Parent:     7d878817db22f64c2b2c241335ec03e4c3fd5476
Refname:    refs/heads/master
Author:     Jiri Kosina <jkosina@suse.cz>
AuthorDate: Thu Apr 12 14:39:10 2018 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu Apr 26 14:56:24 2018 +0200

    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
---
 arch/x86/include/asm/pgtable_64_types.h | 8 ++++----
 1 file 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;
 #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
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]