From 52832bfcfd1905c50263df9243b9f263f74f733d Mon Sep 17 00:00:00 2001
From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Date: Tue, 12 Mar 2013 12:42:37 +0800
Subject: [PATCH] --- yaml --- r: 366281 b: refs/heads/master c:
 8c655c9b49d7dda92cf346fa74e9d542dddd3551 h: refs/heads/master i:   366279:
 89f76ebfe471e6c092aa43743c1a99380a3aacfc v: v3

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

diff --git a/[refs] b/[refs]
index 5348ef5bebaf..34c024717ff0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c03117574726750ea01508b7b89fe058eabe2251
+refs/heads/master: 8c655c9b49d7dda92cf346fa74e9d542dddd3551
diff --git a/trunk/arch/arm/kernel/topology.c b/trunk/arch/arm/kernel/topology.c
index 79282ebcd939..f10316b4ecdc 100644
--- a/trunk/arch/arm/kernel/topology.c
+++ b/trunk/arch/arm/kernel/topology.c
@@ -100,7 +100,7 @@ static void __init parse_dt_topology(void)
 	int alloc_size, cpu = 0;
 
 	alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity);
-	cpu_capacity = (struct cpu_capacity *)kzalloc(alloc_size, GFP_NOWAIT);
+	cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
 
 	while ((cn = of_find_node_by_type(cn, "cpu"))) {
 		const u32 *rate, *reg;