Merge remote-tracking branch 'devicetree/devicetree/next'

diff --combined include/linux/cpu.h
index 3434ef7de017de0d5a33e7dd5dbfb173678c58c0,fbd25c3c2923aa091676448256e001400bf3c1af..03e235ad1bba31bf4ba7fe155d9d64566179866c
--- 1/include/linux/cpu.h
--- 2/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@@ -18,6 -18,7 +18,7 @@@
  #include <linux/cpumask.h>
  
  struct device;
+ struct device_node;
  
  struct cpu {
        int node_id;            /* The node which contains the CPU */
@@@ -29,6 -30,8 +30,8 @@@ extern int register_cpu(struct cpu *cpu
  extern struct device *get_cpu_device(unsigned cpu);
  extern bool cpu_is_hotpluggable(unsigned cpu);
  extern bool arch_match_cpu_phys_id(int cpu, u64 phys_id);
+ extern bool arch_find_n_match_cpu_physical_id(struct device_node *cpun,
+                                             int cpu, unsigned int *thread);
  
  extern int cpu_add_dev_attr(struct device_attribute *attr);
  extern void cpu_remove_dev_attr(struct device_attribute *attr);
@@@ -185,6 -188,19 +188,6 @@@ extern void cpu_hotplug_enable(void)
  void clear_tasks_mm_cpumask(int cpu);
  int cpu_down(unsigned int cpu);
  
 -#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
 -extern void cpu_hotplug_driver_lock(void);
 -extern void cpu_hotplug_driver_unlock(void);
 -#else
 -static inline void cpu_hotplug_driver_lock(void)
 -{
 -}
 -
 -static inline void cpu_hotplug_driver_unlock(void)
 -{
 -}
 -#endif
 -
  #else         /* CONFIG_HOTPLUG_CPU */
  
  static inline void cpu_hotplug_begin(void) {}