diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-01 23:38:55 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-01 23:38:55 +0300 |
| commit | d861f6e6829ce586bcf5823ab7d348f09be3c8fb (patch) | |
| tree | e3743eee3537371fd23aaf1fe8bf3b42a610ce0a /Documentation | |
| parent | 58ff3b7604a461a766a84348e620834dce9834a9 (diff) | |
| parent | fb7fb84a0c4e8021ddecb157802d58241a3f1a40 (diff) | |
| download | linux-d861f6e6829ce586bcf5823ab7d348f09be3c8fb.tar.xz | |
Merge tag 'smp-core-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull SMP updates from Ingo Molnar:
"Misc cleanups in the SMP hotplug and cross-call code"
* tag 'smp-core-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Remove __freeze_secondary_cpus()
cpu/hotplug: Remove disable_nonboot_cpus()
cpu/hotplug: Fix a typo in comment "broadacasted"->"broadcasted"
smp: Use smp_call_func_t in on_each_cpu()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/power/suspend-and-cpuhotplug.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/power/suspend-and-cpuhotplug.rst b/Documentation/power/suspend-and-cpuhotplug.rst index 572d968c5375..ebedb6c75db9 100644 --- a/Documentation/power/suspend-and-cpuhotplug.rst +++ b/Documentation/power/suspend-and-cpuhotplug.rst @@ -48,7 +48,7 @@ More details follow:: | | v - disable_nonboot_cpus() + freeze_secondary_cpus() /* start */ | v @@ -83,7 +83,7 @@ More details follow:: Release cpu_add_remove_lock | v - /* disable_nonboot_cpus() complete */ + /* freeze_secondary_cpus() complete */ | v Do suspend @@ -93,7 +93,7 @@ More details follow:: Resuming back is likewise, with the counterparts being (in the order of execution during resume): -* enable_nonboot_cpus() which involves:: +* thaw_secondary_cpus() which involves:: | Acquire cpu_add_remove_lock | Decrease cpu_hotplug_disabled, thereby enabling regular cpu hotplug |