Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[mirror_ubuntu-artful-kernel.git] / include / linux / compat.h

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 8172b03685f9651045521f9f3d1a7f0ac0ba68b6..1c5f3152cbb57796caf1a587103ed3d092324a04 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -295,6 +295,13 @@ struct compat_old_sigaction {
 };
 #endif
 
+struct compat_keyctl_kdf_params {
+       compat_uptr_t hashname;
+       compat_uptr_t otherinfo;
+       __u32 otherinfolen;
+       __u32 __spare[8];
+};
+
 struct compat_statfs;
 struct compat_statfs64;
 struct compat_old_linux_dirent;