linux-next: build failure after merge of the security tree

[Stephen Rothwell]

Hi James,

After merging the security tree, today's linux-next build (powerpc
allyesconfig) failed like this:

crypto/asymmetric_keys/pkcs7_key_type.c: In function 'pkcs7_preparse':
crypto/asymmetric_keys/pkcs7_key_type.c:36:2: error: implicit declaration of function 'IS_ERR' [-Werror=implicit-function-declaration]
  if (IS_ERR(pkcs7)) {
  ^
crypto/asymmetric_keys/pkcs7_key_type.c:37:3: error: implicit declaration of function 'PTR_ERR' [-Werror=implicit-function-declaration]
   ret = PTR_ERR(pkcs7);
   ^

Caused by commit 22d01afb210f ("PKCS#7: Provide a key type for testing
PKCS#7").  See Rule 1 in Documentation/SubmitChecklist.

I have added this fix patch for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 25 Jul 2014 19:17:04 +1000
Subject: [PATCH] PKCS#7: include linux-err.h for PTR_ERR and IS_ERR

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 crypto/asymmetric_keys/pkcs7_key_type.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index c2091f7bd15d..8605ff6cf869 100644
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@@ -10,6 +10,7 @@
  */
 
 #define pr_fmt(fmt) "PKCS7key: "fmt
+#include <linux/err.h>
 #include <linux/key.h>
 #include <linux/key-type.h>
 #include <crypto/pkcs7.h>
-- 
2.0.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature