[U-Boot,v3,4/5] linux/sizes.h: sync from kernel

Message ID 80da5f6fb1aa4c09fc2a5177b47bd500fefe2128.1541679854.git.baruch@tkos.co.il
State Changes Requested
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot,v3,1/5] MIPS: drop asm/const.h
Related show

Commit Message

Baruch Siach Nov. 8, 2018, 12:24 p.m.
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>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v3: Use linux/const.h

v2: No change
---
 arch/arm/mach-tegra/tegra186/nvtboot_mem.c | 3 +--
 include/linux/sizes.h                      | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

Tom Rini Nov. 8, 2018, 12:56 p.m. | #1
On Thu, Nov 08, 2018 at 02:24:13PM +0200, Baruch Siach wrote:

> 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>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Reviewed-by: Tom Rini <trini@konsulko.com>

Patch

diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c b/arch/arm/mach-tegra/tegra186/nvtboot_mem.c
index 5c9467bfe8be..62142821a595 100644
--- 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 ce3e8150c174..fbde0bc7e882 100644
--- 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__ */