From c7b8aced54feb58889ee065bbbfc280a808ce0dd Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Sat, 29 Jun 2013 16:25:14 -0700
Subject: [PATCH] --- yaml --- r: 377470 b: refs/heads/master c:
 8d5bc1a6ac40885078bbb0552b4283a3e58c462e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/kernel/devtree.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dbc92b3cd79c..81102f79329b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 133841cab7817f110c35fd97032a6a9d66a3e9e2
+refs/heads/master: 8d5bc1a6ac40885078bbb0552b4283a3e58c462e
diff --git a/trunk/arch/arm/kernel/devtree.c b/trunk/arch/arm/kernel/devtree.c
index 0905502bee15..5859c8bc727c 100644
--- a/trunk/arch/arm/kernel/devtree.c
+++ b/trunk/arch/arm/kernel/devtree.c
@@ -152,9 +152,10 @@ void __init arm_dt_init_cpu_maps(void)
 		tmp_map[i] = hwid;
 	}
 
-	if (WARN(!bootcpu_valid, "DT missing boot CPU MPIDR[23:0], "
-				 "fall back to default cpu_logical_map\n"))
+	if (!bootcpu_valid) {
+		pr_warn("DT missing boot CPU MPIDR[23:0], fall back to default cpu_logical_map\n");
 		return;
+	}
 
 	/*
 	 * Since the boot CPU node contains proper data, and all nodes have