summaryrefslogtreecommitdiffstats
path: root/block/compat_ioctl.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
committerJoel Becker <joel.becker@oracle.com>2010-04-30 22:37:29 +0200
commitf9221fd80343285514568da6c5dbda0f87109de8 (patch)
tree3a2f0077ebea9d094bdeedb319c97cb591d51c51 /block/compat_ioctl.c
parentocfs2_dlmfs: Fix math error when reading LVB. (diff)
parentocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff)
downloadlinux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz
linux-f9221fd80343285514568da6c5dbda0f87109de8.zip
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'block/compat_ioctl.c')
-rw-r--r--block/compat_ioctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 4eb8e9ea4af5..f26051f44681 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -6,6 +6,7 @@
#include <linux/elevator.h>
#include <linux/fd.h>
#include <linux/hdreg.h>
+#include <linux/slab.h>
#include <linux/syscalls.h>
#include <linux/smp_lock.h>
#include <linux/types.h>