diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-08-26 16:02:38 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-08-26 16:02:38 -0400 |
| commit | fe3af705eed7127535d4aafaf0d34cbd43f53a90 (patch) | |
| tree | 406fb276ec5801b3c5f5b7f777043215b9dc9a81 /block/compat_ioctl.c | |
| parent | 4f1589607c38ffbb065a960d8915d9ebe1dae9a2 (diff) | |
| parent | d83a3234d2e1e2a55e7f2430fc9ca29a9bd315e7 (diff) | |
Merge tag 'v3.12.26' into v3.12-rt
This is the 3.12.26 stable release
Conflicts:
kernel/Kconfig.locks
kernel/trace/trace.c
Diffstat (limited to 'block/compat_ioctl.c')
| -rw-r--r-- | block/compat_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index fbd5a67cb773..a0926a6094b2 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -690,6 +690,7 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) case BLKROSET: case BLKDISCARD: case BLKSECDISCARD: + case BLKZEROOUT: /* * the ones below are implemented in blkdev_locked_ioctl, * but we call blkdev_ioctl, which gets the lock for us |