[PATCH 5/6] backport: fix handling of nospec.h for 4.15.0 and 4.15.1
Luca Coelho <[email protected]>
| Newsgroups | org.kernel.vger.backports |
|---|---|
| Message-ID | <[email protected]> |
From: Luca Coelho <[email protected]> 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 <[email protected]> --- 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 50cf46737cbb..07647241f78f 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 <linux/nospec.h> -- 2.20.1 -- To unsubscribe from this list: send the line "unsubscribe backports" in