Merge tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp into upstream

* tag 'arm64-suspend' of git://linux-arm.org/linux-2.6-lp:
  arm64: add CPU power management menu/entries
  arm64: kernel: add PM build infrastructure
  arm64: kernel: add CPU idle call
  arm64: enable generic clockevent broadcast
  arm64: kernel: implement HW breakpoints CPU PM notifier
  arm64: kernel: refactor code to install/uninstall breakpoints
  arm: kvm: implement CPU PM notifier
  arm64: kernel: implement fpsimd CPU PM notifier
  arm64: kernel: cpu_{suspend/resume} implementation
  arm64: kernel: suspend/resume registers save/restore
  arm64: kernel: build MPIDR_EL1 hash function data structure
  arm64: kernel: add MPIDR_EL1 accessors macros

Conflicts:
	arch/arm64/Kconfig

diff --cc arch/arm64/Kconfig
index 101683d336c915ef93081038870d10eec766a2ce,99589e782834f5fd76344da64ee64e1b95994b98..249acb9da4e3560a10731ac217402014175ba73c
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -11,8 -12,9 +12,10 @@@ config ARM6
        select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
        select COMMON_CLK
+       select CPU_PM if (SUSPEND || CPU_IDLE)
 +      select DCACHE_WORD_ACCESS
        select GENERIC_CLOCKEVENTS
+       select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_IOMAP
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW

diff --cc arch/arm64/include/asm/cputype.h
index e1af1b4200d58b3eb76a326c9d62311e1a0c63e3,e371936b8ab2ed2a66a73a3f148af16bba50a40b..c404fb0df3a673710285603c8ba7571fa42a86f8
--- 1/arch/arm64/include/asm/cputype.h
--- 2/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@@ -20,9 -30,19 +20,19 @@@
  
  #define MPIDR_HWID_BITMASK    0xff00ffffff
  
+ #define MPIDR_LEVEL_BITS_SHIFT        3
+ #define MPIDR_LEVEL_BITS      (1 << MPIDR_LEVEL_BITS_SHIFT)
+ #define MPIDR_LEVEL_MASK      ((1 << MPIDR_LEVEL_BITS) - 1)
+ 
+ #define MPIDR_LEVEL_SHIFT(level) \
+       (((1 << level) >> 1) << MPIDR_LEVEL_BITS_SHIFT)
+ 
+ #define MPIDR_AFFINITY_LEVEL(mpidr, level) \
+       ((mpidr >> MPIDR_LEVEL_SHIFT(level)) & MPIDR_LEVEL_MASK)
+ 
  #define read_cpuid(reg) ({                                            \
        u64 __val;                                                      \
 -      asm("mrs        %0, " reg : "=r" (__val));                      \
 +      asm("mrs        %0, " #reg : "=r" (__val));                     \
        __val;                                                          \
  })
  

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

diff --cc arch/arm64/kernel/smp.c
Simple merge