From 0d8e740b93777b471bb301d21a9065a40750978e Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 16 Oct 2012 12:00:29 +0100
Subject: [PATCH] --- yaml --- r: 334670 b: refs/heads/master c:
 f71a1a42667f576ec736bb1200eba2118fee3a22 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm64/kernel/setup.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 18dbb2be2e0a..a793617ed576 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c60b0c2817bd6a990b08a7651e9cf630414665f5
+refs/heads/master: f71a1a42667f576ec736bb1200eba2118fee3a22
diff --git a/trunk/arch/arm64/kernel/setup.c b/trunk/arch/arm64/kernel/setup.c
index 48ffb9fb3fe3..7665a9bfdb1e 100644
--- a/trunk/arch/arm64/kernel/setup.c
+++ b/trunk/arch/arm64/kernel/setup.c
@@ -170,7 +170,19 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
 
 void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
+	base &= PAGE_MASK;
 	size &= PAGE_MASK;
+	if (base + size < PHYS_OFFSET) {
+		pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
+			   base, base + size);
+		return;
+	}
+	if (base < PHYS_OFFSET) {
+		pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
+			   base, PHYS_OFFSET);
+		size -= PHYS_OFFSET - base;
+		base = PHYS_OFFSET;
+	}
 	memblock_add(base, size);
 }