Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild

diff --cc arch/powerpc/include/asm/smp.h
index e807e9d8e3f7ea60b184da83176d54b3bbb40dcd,b625a1a9ad16db620f2a5e8cb88d12c803feee00..5a4e437c238d814ad421c4c0c3eff12391cf316f
--- 1/arch/powerpc/include/asm/smp.h
--- 2/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@@ -65,8 -65,15 +65,16 @@@ int generic_cpu_disable(void)
  void generic_cpu_die(unsigned int cpu);
  void generic_mach_cpu_die(void);
  void generic_set_cpu_dead(unsigned int cpu);
 +void generic_set_cpu_up(unsigned int cpu);
  int generic_check_cpu_restart(unsigned int cpu);
+ 
+ extern void inhibit_secondary_onlining(void);
+ extern void uninhibit_secondary_onlining(void);
+ 
+ #else /* HOTPLUG_CPU */
+ static inline void inhibit_secondary_onlining(void) {}
+ static inline void uninhibit_secondary_onlining(void) {}
+ 
  #endif
  
  #ifdef CONFIG_PPC64

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

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge