diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-03-08 16:40:12 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-08 16:40:12 -0700 |
| commit | a2daeab5cffa4d81a8c9bfedf8e5576cbca00190 (patch) | |
| tree | 45f5b97cc0b29f1fbc8c7930e34e4099454a98ee /drivers/md/md.c | |
| parent | a76370690c3b382ee1c91a93a447c8e25865c8e2 (diff) | |
| parent | 7d959f6e978cbbca90e26a192cc39480e977182f (diff) | |
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.18/drivers
Pull MD fixes from Song:
"Most of these changes are minor fixes and clean-ups."
* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md: use msleep() in md_notify_reboot()
lib/raid6: Include <asm/ppc-opcode.h> for VPERMXOR
lib/raid6/test/Makefile: Use $(pound) instead of \# for Make 4.3
lib/raid6/test: fix multiple definition linking error
md: raid1/raid10: drop pending_cnt
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 f88a9e948f3e..d059e21f3c35 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9582,7 +9582,7 @@ static int md_notify_reboot(struct notifier_block *this, * driver, we do want to have a safe RAID driver ... */ if (need_delay) - mdelay(1000*1); + msleep(1000); return NOTIFY_DONE; } |