Merge commit 'v3.5-rc2' into next

[firefly-linux-kernel-4.4.55.git] / security / keys / internal.h

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 3dcbf86b0d31b9c7c9c889c80dacf34f9b33adc6..c990b8c8ef1d6946725b0de2ea8deab01d0e787c 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -242,7 +242,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
 extern long keyctl_invalidate_key(key_serial_t);
 
 extern long keyctl_instantiate_key_common(key_serial_t,
-                                         const struct iovec __user *,
+                                         const struct iovec *,
                                          unsigned, size_t, key_serial_t);
 
 /*