From: Mark Brown <broonie@linaro.org>
Date: Fri, 9 May 2014 21:57:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hmp' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~132^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cd4c4a096c14dece853de1e1bdc6b5d1fa1928e8;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hmp' into linux-linaro-lsk

Conflicts:
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/topology.c
---

cd4c4a096c14dece853de1e1bdc6b5d1fa1928e8
diff --cc arch/arm64/kernel/Makefile
index c6172392b20d,5a9ed500704f..79008f6315aa
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -14,7 -14,8 +14,8 @@@ arm64-obj-y		:= cputable.o debug-monito
  arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\
  					   sys_compat.o
  arm64-obj-$(CONFIG_MODULES)		+= arm64ksyms.o module.o
 -arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o smp_psci.o
 +arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o
+ arm64-obj-$(CONFIG_SMP)			+= topology.o
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
  arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
  arm64-obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
diff --cc arch/arm64/kernel/topology.c
index 0460ba0573f8,49c94ff29479..db8bb29c3852
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@@ -21,15 -22,9 +22,11 @@@
  #include <linux/sched.h>
  #include <linux/slab.h>
  
- #include <asm/topology.h>
 -#include <asm/smp_plat.h>
 +#include <asm/cputype.h>
+ #include <asm/topology.h>
 +#include <asm/smp_plat.h>
 +
  
- /*
-  * cpu power scale management
-  */
- 
  /*
   * cpu power table
   * This per cpu data structure describes the relative capacity of each core.