mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
Merge branch 'acpi-hotplug'
* acpi-hotplug: ACPI / memhotplug: Use defined marco METHOD_NAME__STA ACPI / hotplug: Use kobject_init_and_add() instead of _init() and _add() ACPI / hotplug: Don't set kobject parent pointer explicitly ACPI / hotplug: Set kobject name via kobject_add(), not kobject_set_name() hotplug, powerpc, x86: Remove cpu_hotplug_driver_lock() hotplug / x86: Disable ARCH_CPU_PROBE_RELEASE on x86 hotplug / x86: Add hotplug lock to missing places hotplug / x86: Fix online state in cpu0 debug interface
This commit is contained in:
commit
5c2aae8355
9 changed files with 53 additions and 104 deletions
|
|
@ -185,19 +185,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) {}
|
||||
|
|
|
|||
Loading…
Reference in a new issue