summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-07-25 12:33:53 +0200
committerDavid Howells <dhowells@redhat.com>2014-07-25 12:33:53 +0200
commit8f3438ccea149647ad1849651d1e14c7b8b85e63 (patch)
treef8f3b543b357439a38544e0f6a419133b7b5de56
parentMerge branch 'keys-fixes' into keys-next (diff)
downloadlinux-8f3438ccea149647ad1849651d1e14c7b8b85e63.tar.xz
linux-8f3438ccea149647ad1849651d1e14c7b8b85e63.zip
PKCS#7: Missing inclusion of linux/err.h
crypto/asymmetric_keys/pkcs7_key_type.c needs to #include linux/err.h rather than relying on getting it through other headers. Without this, the powerpc allyesconfig build fails. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--crypto/asymmetric_keys/pkcs7_key_type.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index c2091f7bd15d..197ecdc0a5a1 100644
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@@ -11,6 +11,7 @@
#define pr_fmt(fmt) "PKCS7key: "fmt
#include <linux/key.h>
+#include <linux/err.h>
#include <linux/key-type.h>
#include <crypto/pkcs7.h>
#include <keys/user-type.h>