diff options
| author | Jens Axboe | 2017-01-27 23:08:31 +0100 |
|---|---|---|
| committer | Jens Axboe | 2017-01-27 23:08:31 +0100 |
| commit | f924ba70c1b12706c6679d793202e8f4c125f7ae (patch) | |
| tree | 978f8f56ccfa7c6fdb4be4ac6e498d73d44bf14f /drivers/block | |
| parent | Linux 4.10-rc5 (diff) | |
| parent | blk-mq: fix debugfs compilation issues (diff) | |
| download | kernel-qcow2-linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.gz kernel-qcow2-linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.xz kernel-qcow2-linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.zip | |
Merge branch 'for-4.11/block' into for-4.11/rq-refactor
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index a391a3cfb3fe..184887af4b9f 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3119,7 +3119,7 @@ static int raw_cmd_copyin(int cmd, void __user *param, *rcmd = NULL; loop: - ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_USER); + ptr = kmalloc(sizeof(struct floppy_raw_cmd), GFP_KERNEL); if (!ptr) return -ENOMEM; *rcmd = ptr; |