mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-23 07:01:23 +00:00
Merge branch 'linus' into cpus4096
Conflicts: drivers/acpi/processor_throttling.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
commit
bb2c018b09
1704 changed files with 104278 additions and 193470 deletions
|
@ -299,6 +299,7 @@ int __ref cpu_down(unsigned int cpu)
|
|||
cpu_maps_update_done();
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(cpu_down);
|
||||
#endif /*CONFIG_HOTPLUG_CPU*/
|
||||
|
||||
/* Requires cpu_add_remove_lock to be held */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue