diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-05 17:11:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-05 17:11:48 +1000 |
| commit | f03ee46be9401e3434f52bb15e92d1e640f76438 (patch) | |
| tree | f0a1819bd3e44902578b80e1a03d1dde1c6099b8 /include/linux/compiler-gcc.h | |
| parent | 0d5320fc194128a1a584a7e91a606cb3af2ded80 (diff) | |
| parent | 3e5de27e940d00d8d504dfb96625fb654f641509 (diff) | |
| download | op-kernel-dev-f03ee46be9401e3434f52bb15e92d1e640f76438.zip op-kernel-dev-f03ee46be9401e3434f52bb15e92d1e640f76438.tar.gz | |
Backmerge tag 'v4.9-rc8' into drm-next
Linux 4.9-rc8
Daniel requested this so we could apply some follow on fixes cleanly to -next.
Diffstat (limited to 'include/linux/compiler-gcc.h')
| -rw-r--r-- | include/linux/compiler-gcc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 432f5c9..928e5ca 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -263,7 +263,9 @@ #endif #endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP && !__CHECKER__ */ -#if GCC_VERSION >= 50000 +#if GCC_VERSION >= 70000 +#define KASAN_ABI_VERSION 5 +#elif GCC_VERSION >= 50000 #define KASAN_ABI_VERSION 4 #elif GCC_VERSION >= 40902 #define KASAN_ABI_VERSION 3 |
