diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-12 18:34:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-12 18:34:39 +0000 |
| commit | 2db6be6a7b3edc8a5acea99b817eb7b9e608e931 (patch) | |
| tree | 8a0faae65c8d4eb36d85e60e24bccdf236192d91 /kernel/stop_machine.c | |
| parent | a93f8e76a446e0a146a169cc2cc82bf1e145ad35 (diff) | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
Merge tag 'v3.9-rc2' into asoc-core
Linux 3.9-rc2
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 95d178c62d5..c09f2955ae3 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -336,7 +336,7 @@ static struct smp_hotplug_thread cpu_stop_threads = { .create = cpu_stop_create, .setup = cpu_stop_unpark, .park = cpu_stop_park, - .unpark = cpu_stop_unpark, + .pre_unpark = cpu_stop_unpark, .selfparking = true, }; |