diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2019-03-15 16:33:17 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-03-28 00:08:12 +0100 |
| commit | 9a973d908cea50d0625f7c19d80dfca9435a49d7 (patch) | |
| tree | 7b0f55541fcd4210d061ca00d2c30156ac716bc7 | |
| parent | f6a08448f05191582e2bfec564ceff146b4729e5 (diff) | |
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 <luciano.coelho@intel.com>
| -rw-r--r-- | backport/backport-include/linux/nospec.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 <linux/nospec.h> |