Linux backports project
 help / color / mirror / Atom feed
From: Felix Fietkau <nbd@nbd.name>
To: backports@vger.kernel.org
Subject: [PATCH 4/4] backports: fix missing linux/verification.h error on < 4.7
Date: Thu, 16 Nov 2017 15:38:55 +0100	[thread overview]
Message-ID: <20171116143855.12307-4-nbd@nbd.name> (raw)
In-Reply-To: <20171116143855.12307-1-nbd@nbd.name>

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 backport/backport-include/linux/verification.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backport/backport-include/linux/verification.h b/backport/backport-include/linux/verification.h
index 10e1bcfb..5fd0a2d3 100644
--- a/backport/backport-include/linux/verification.h
+++ b/backport/backport-include/linux/verification.h
@@ -1,7 +1,7 @@
 #ifndef __BP_VERIFICATION_H
 #define __BP_VERIFICATION_H
 #include <linux/version.h>
-#ifndef CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION
+#if LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION)
 #include_next <linux/verification.h>
 #else
 #include <linux/key.h>
@@ -24,5 +24,5 @@ extern int verify_pkcs7_signature(const void *data, size_t len,
 						      const void *data, size_t len,
 						      size_t asn1hdrlen),
 				  void *ctx);
-#endif /* LINUX_VERSION_IS_GEQ(4,7,0) */
+#endif /* LINUX_VERSION_IS_GEQ(4,7,0) && !defined(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) */
 #endif /* __BP_VERIFICATION_H */
-- 
2.14.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in

  parent reply	other threads:[~2017-11-16 14:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-16 14:38 [PATCH 1/4] kconf: sync with upstream version 37861ffa8c28 Felix Fietkau
2017-11-16 14:38 ` [PATCH 2/4] backport-include: backport skb_get_hash_perturb Felix Fietkau
2017-11-16 14:38 ` [PATCH 3/4] backports: fix events with extack backport Felix Fietkau
2017-11-16 14:38 ` Felix Fietkau [this message]
2017-11-17  9:47 ` [PATCH 1/4] kconf: sync with upstream version 37861ffa8c28 Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171116143855.12307-4-nbd@nbd.name \
    --to=nbd@nbd.name \
    --cc=backports@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox