diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-02 11:44:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-02 11:44:51 +0200 |
| commit | ea019fdf1a2aa4134ce90801f7b36680d0fbd785 (patch) | |
| tree | ab44af35ae3e75f7fe60391274aa8a0a09a15c15 /kernel/stop_machine.c | |
| parent | 55a63d4da3b8850480a1c5b222f77c739e30e346 (diff) | |
| parent | 40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a (diff) | |
Merge tag 'asoc-fix-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.9
A few more fixes here and there, including quite a few nasty driver
specific ones, but nothing that has a major general impact.
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, }; |