diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 16:49:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 16:49:46 +0200 |
| commit | 636bf35880e5a79c2ecb10640137bbd9a4681cb7 (patch) | |
| tree | 919ea9ac007b72acb92a99fb7e28c8238a69573f /drivers/md/md.c | |
| parent | 276c87054751bb6adfa160a6e68e47b97592a897 (diff) | |
| parent | 8d31f80eb38819e4f2905ad21c0e8998382a08f7 (diff) | |
Merge branch 'linus' into x86/platform, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 8cdca0296749..c99634612fc4 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2287,7 +2287,7 @@ static void export_array(struct mddev *mddev) static bool set_in_sync(struct mddev *mddev) { - WARN_ON_ONCE(!spin_is_locked(&mddev->lock)); + WARN_ON_ONCE(NR_CPUS != 1 && !spin_is_locked(&mddev->lock)); if (!mddev->in_sync) { mddev->sync_checkers++; spin_unlock(&mddev->lock); |