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

Conflicts:
	arch/arm64/kernel/Makefile
	drivers/cpuidle/Makefile

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm64/include/asm/cpu_ops.h
Simple merge

diff --cc arch/arm64/kernel/Makefile
index ac389d32ccde1c626f5f0de5ed02cf6bb03c6dfc,fc6d2710556317f7c82ac8f4050acaabcac4eec5..a8ad571c4758fd06593b6b2ac0dff8307379c9e9
--- 1/arch/arm64/kernel/Makefile
--- 2/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -19,19 -13,13 +19,20 @@@ arm64-obj-y                := cputable.o debug-monito
  
  arm64-obj-$(CONFIG_COMPAT)            += sys32.o kuser32.o signal32.o         \
                                           sys_compat.o
 +arm64-obj-$(CONFIG_FUNCTION_TRACER)   += ftrace.o entry-ftrace.o
  arm64-obj-$(CONFIG_MODULES)           += arm64ksyms.o module.o
  arm64-obj-$(CONFIG_SMP)                       += smp.o smp_spin_table.o
 +arm64-obj-$(CONFIG_SMP)                       += topology.o
 +arm64-obj-$(CONFIG_PERF_EVENTS)               += perf_regs.o
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)    += perf_event.o
 -arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
 +arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)        += hw_breakpoint.o
  arm64-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 +arm64-obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
 +arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND) += sleep.o suspend.o
 +arm64-obj-$(CONFIG_JUMP_LABEL)                += jump_label.o
+ arm64-obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
  arm64-obj-$(CONFIG_KGDB)              += kgdb.o
 +arm64-obj-$(CONFIG_EFI)                       += efi.o efi-stub.o efi-entry.o
  
  obj-y                                 += $(arm64-obj-y) vdso/
  obj-m                                 += $(arm64-obj-m)

diff --cc drivers/cpuidle/Makefile
index 2d97bcfecd00cfa02f4239960abb5f37e5a6639c,825433777ef2814ccdf61edc6d581c263cc6d782..0bd32cd03f0af843d2917dbce105419a7cdae0eb
--- 1/drivers/cpuidle/Makefile
--- 2/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -4,8 -4,7 +4,8 @@@
  
  obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
  obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
- obj-$(CONFIG_OF_IDLE_STATES)            += of_idle_states.o
 +obj-$(CONFIG_BIG_LITTLE) += arm_big_little.o
+ obj-$(CONFIG_DT_IDLE_STATES)            += dt_idle_states.o
  
  obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
  obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o