diff options
| author | Greg Kroah-Hartman | 2019-04-21 23:18:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-21 23:18:44 +0200 |
| commit | 817de6b85914a3dda72b971c074d4d342965fba0 (patch) | |
| tree | df0a4563a04aadb8f8595f72392d66d65797c455 /drivers/block/null_blk_main.c | |
| parent | staging: kpc2000: add initial set of Daktronics drivers (diff) | |
| parent | Linux 5.1-rc6 (diff) | |
| download | kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.gz kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.tar.xz kernel-qcow2-linux-817de6b85914a3dda72b971c074d4d342965fba0.zip | |
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge
issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/block/null_blk_main.c')
| -rw-r--r-- | drivers/block/null_blk_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 417a9f15c116..d7ac09c092f2 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c @@ -1748,6 +1748,11 @@ static int __init null_init(void) return -EINVAL; } + if (g_home_node != NUMA_NO_NODE && g_home_node >= nr_online_nodes) { + pr_err("null_blk: invalid home_node value\n"); + g_home_node = NUMA_NO_NODE; + } + if (g_queue_mode == NULL_Q_RQ) { pr_err("null_blk: legacy IO path no longer available\n"); return -EINVAL; |