diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-24 19:21:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-24 19:21:58 -0700 |
| commit | 19725496da5602b401eae389736ab00d1817e264 (patch) | |
| tree | 4c1a94bf0121769110f1b9c08ee337a55679a48a /kernel/stop_machine.c | |
| parent | aea5f654e6b78a0c976f7a25950155932c77a53f (diff) | |
| parent | 9981b4fb8684883dcc0daf088891ff32260b9794 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index f89014a2c238..1ff523dae6e2 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -270,7 +270,11 @@ unlock: goto retry; } - wake_up_q(&wakeq); + if (!err) { + preempt_disable(); + wake_up_q(&wakeq); + preempt_enable(); + } return err; } |