2018-04-29 11:54:34

by Chris Wilson

Subject: [PATCH] x86: Mark up large pm4/5 constants with UL

To silence sparse while maintaining compatibility with the assembly, use
_UL which conditionally only appends the UL suffix for C code.

Fixes: a7412546d8cb ("x86/mm: Adjust vmalloc base and size at boot-time")
Signed-off-by: Chris Wilson <[email protected]>
Cc: Kirill A. Shutemov <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
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..40caf5eb9c18 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 _UL(0xffffc90000000000)
+#define __VMALLOC_BASE_L5 _UL(0xffa0000000000000)

#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 _UL(0xffffea0000000000)
+#define __VMEMMAP_BASE_L5 _UL(0xffd4000000000000)

#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT
# define VMALLOC_START vmalloc_base
--
2.17.0

2018-04-29 16:52:50

by Kirill A. Shutemov

Subject: Re: [PATCH] x86: Mark up large pm4/5 constants with UL

On Sun, Apr 29, 2018 at 12:48:32PM +0100, Chris Wilson wrote:
> To silence sparse while maintaining compatibility with the assembly, use
> _UL which conditionally only appends the UL suffix for C code.

http://lkml.kernel.org/r/[email protected]

--
Kirill A. Shutemov