From 2bc0262ddd047ace9ef731e18684503d52cf0be6 Mon Sep 17 00:00:00 2001
From: Richard Kuo <rkuo@codeaurora.org>
Date: Tue, 3 Apr 2012 18:15:42 -0500
Subject: [PATCH] --- yaml --- r: 367940 b: refs/heads/master c:
 53debcd518e72d01bfe0364f1504fa585826941c h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/hexagon/Kconfig           |  1 +
 trunk/arch/hexagon/kernel/Makefile   |  2 +-
 trunk/arch/hexagon/kernel/topology.c | 52 ----------------------------
 4 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 trunk/arch/hexagon/kernel/topology.c

diff --git a/[refs] b/[refs]
index 2411a7df3469..0cc1e531d4e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b03dbfe605c2566cff55bde35372030aa4b3d0
+refs/heads/master: 53debcd518e72d01bfe0364f1504fa585826941c
diff --git a/trunk/arch/hexagon/Kconfig b/trunk/arch/hexagon/Kconfig
index d90a495ab791..b059d8c29fb5 100644
--- a/trunk/arch/hexagon/Kconfig
+++ b/trunk/arch/hexagon/Kconfig
@@ -29,6 +29,7 @@ config HEXAGON
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS_BROADCAST
 	select MODULES_USE_ELF_RELA
+	select GENERIC_CPU_DEVICES
 	---help---
 	  Qualcomm Hexagon is a processor architecture designed for high
 	  performance and low power across a wide variety of applications.
diff --git a/trunk/arch/hexagon/kernel/Makefile b/trunk/arch/hexagon/kernel/Makefile
index 6c19501b487c..29fc933a7722 100644
--- a/trunk/arch/hexagon/kernel/Makefile
+++ b/trunk/arch/hexagon/kernel/Makefile
@@ -1,6 +1,6 @@
 extra-y := head.o vmlinux.lds
 
-obj-$(CONFIG_SMP) += smp.o topology.o
+obj-$(CONFIG_SMP) += smp.o
 
 obj-y += setup.o irq_cpu.o traps.o syscalltab.o signal.o time.o
 obj-y += process.o trampoline.o reset.o ptrace.o vdso.o
diff --git a/trunk/arch/hexagon/kernel/topology.c b/trunk/arch/hexagon/kernel/topology.c
deleted file mode 100644
index 352f27e809fd..000000000000
--- a/trunk/arch/hexagon/kernel/topology.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * CPU topology for Hexagon
- *
- * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <linux/cpu.h>
-#include <linux/cpumask.h>
-#include <linux/init.h>
-#include <linux/node.h>
-#include <linux/nodemask.h>
-#include <linux/percpu.h>
-
-/*  Swiped from MIPS.  */
-
-static DEFINE_PER_CPU(struct cpu, cpu_devices);
-
-static int __init topology_init(void)
-{
-	int i, ret;
-
-	for_each_present_cpu(i) {
-
-		/*
-		 * register_cpu takes a per_cpu pointer and
-		 * just points it at another per_cpu struct...
-		 */
-
-		ret = register_cpu(&per_cpu(cpu_devices, i), i);
-		if (ret)
-			printk(KERN_WARNING "topology_init: register_cpu %d "
-			       "failed (%d)\n", i, ret);
-	}
-
-	return 0;
-}
-
-subsys_initcall(topology_init);