From: Colin Cross <ccross@android.com>
Date: Thu, 30 Sep 2010 01:35:48 +0000 (-0700)
Subject: [ARM] tegra: stingray: Convert from bootmem to memblock
X-Git-Tag: firefly_0821_release~9834^2~491
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6c52071b3edb33b999498c692f0de1f63a6c4fda;p=firefly-linux-kernel-4.4.55.git

[ARM] tegra: stingray: Convert from bootmem to memblock

Change-Id: I57f22c22875c4bcfc3a5d4790aef0c59e310c2ca
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c
index 772435d352cb..2b26aeec2d97 100644
--- a/arch/arm/mach-tegra/board-stingray.c
+++ b/arch/arm/mach-tegra/board-stingray.c
@@ -30,7 +30,7 @@
 #include <linux/reboot.h>
 #include <linux/i2c-tegra.h>
 #include <linux/spi/cpcap.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -1043,14 +1043,16 @@ static void __init tegra_stingray_init(void)
 
 void __init stingray_map_io(void)
 {
-	if (reserve_bootmem(0x0, 4096, BOOTMEM_EXCLUSIVE) != 0) {
-		printk(KERN_WARNING "Cannot reserve first 4K of memory for safety\n");
-	}
-
 	tegra_map_common_io();
 	stingray_fb_alloc();
 }
 
+void __init stingray_reserve(void)
+{
+	if (memblock_reserve(0x0, 4096) < 0)
+		pr_warn("Cannot reserve first 4K of memory for safety\n");
+}
+
 MACHINE_START(STINGRAY, "stingray")
 	.boot_params	= 0x00000100,
 	.phys_io	= IO_APB_PHYS,
@@ -1059,5 +1061,6 @@ MACHINE_START(STINGRAY, "stingray")
 	.init_irq	= tegra_init_irq,
 	.init_machine	= tegra_stingray_init,
 	.map_io		= stingray_map_io,
+	.reserve	= stingray_reserve,
 	.timer		= &tegra_timer,
 MACHINE_END