From 9a973d908cea50d0625f7c19d80dfca9435a49d7 Mon Sep 17 00:00:00 2001 From: Luca Coelho Date: Fri, 15 Mar 2019 16:33:17 +0200 Subject: backport: fix handling of nospec.h for 4.15.0 and 4.15.1 The patch that introduces nospec.h was cherry-picked for 4.15 only in 4.15.2, so we need to adjust the ifdefs of our stub. Signed-off-by: Luca Coelho --- backport/backport-include/linux/nospec.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backport/backport-include/linux/nospec.h b/backport/backport-include/linux/nospec.h index 50cf4673..07647241 100644 --- a/backport/backport-include/linux/nospec.h +++ b/backport/backport-include/linux/nospec.h @@ -1,7 +1,8 @@ #ifndef _BACKPORT_LINUX_NOSPEC_H #define _BACKPORT_LINUX_NOSPEC_H -#if LINUX_VERSION_IS_GEQ(4,14,18) || \ +#if LINUX_VERSION_IS_GEQ(4,15,2) || \ + LINUX_VERSION_IN_RANGE(4,14,18, 4,15,0) || \ LINUX_VERSION_IN_RANGE(4,9,81, 4,10,0) || \ LINUX_VERSION_IN_RANGE(4,4,118, 4,5,0) #include_next -- cgit v1.2.3