linux/sizes.h: sync from kernel

The kernel added SZ_4G macro in commit f2b9ba871b (arm64/kernel: kaslr:
reduce module randomization range to 4 GB).

Include linux/const.h for the _AC macro.

Drop a local SZ_4G definition in tegra code.

Cc: Tom Warren <twarren@nvidia.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c b/arch/arm/mach-tegra/tegra186/nvtboot_mem.c
index 5c9467bfe8be31f68e9265b5814620c30f0bb1d2..62142821a5958b2a93b27828ad803916cf7cdb1d 100644 (file)
--- a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c
+++ b/arch/arm/mach-tegra/tegra186/nvtboot_mem.c
@@ -6,11 +6,10 @@
 #include <common.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
+#include <linux/sizes.h>
 #include <asm/arch/tegra.h>
 #include <asm/armv8/mmu.h>
 
-#define SZ_4G 0x100000000ULL
-
 /*
  * Size of a region that's large enough to hold the relocated U-Boot and all
  * other allocations made around it (stack, heap, page tables, etc.)

diff --git a/include/linux/sizes.h b/include/linux/sizes.h
index ce3e8150c1745a3a877ec0cf42a1b3f294f8df81..fbde0bc7e882b2b3a18a48331664a142ee3bdd4d 100644 (file)
--- a/include/linux/sizes.h
+++ b/include/linux/sizes.h
@@ -8,6 +8,8 @@
 #ifndef __LINUX_SIZES_H__
 #define __LINUX_SIZES_H__
 
+#include <linux/const.h>
+
 #define SZ_1                           0x00000001
 #define SZ_2                           0x00000002
 #define SZ_4                           0x00000004
@@ -44,4 +46,6 @@
 #define SZ_1G                          0x40000000
 #define SZ_2G                          0x80000000
 
+#define SZ_4G                          _AC(0x100000000, ULL)
+
 #endif /* __LINUX_SIZES_H__ */