summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2023-02-02 21:43:28 +0300
committerKees Cook <keescook@chromium.org>2023-02-02 21:43:28 +0300
commit5c0f220e1b2d349b6241375e19887b5c865a84a1 (patch)
treee6f473fcc9d2b7929276408a39b46b3c7452a337 /scripts
parent5a6b64adc18d9adfb497a529ff004d59b6df151f (diff)
parentbe0d8f48ad97f5b775b0af3310343f676dbf318a (diff)
downloadlinux-5c0f220e1b2d349b6241375e19887b5c865a84a1.tar.xz
Merge branch 'for-linus/hardening' into for-next/hardening
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.vmlinux1
-rw-r--r--scripts/gcc-plugins/gcc-common.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
index 49946cb96844..10176dec97ea 100644
--- a/scripts/Makefile.vmlinux
+++ b/scripts/Makefile.vmlinux
@@ -18,6 +18,7 @@ quiet_cmd_cc_o_c = CC $@
$(call if_changed_dep,cc_o_c)
ifdef CONFIG_MODULES
+KASAN_SANITIZE_.vmlinux.export.o := n
targets += .vmlinux.export.o
vmlinux: .vmlinux.export.o
endif
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
index 9a1895747b15..84c730da36dd 100644
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -71,7 +71,9 @@
#include "varasm.h"
#include "stor-layout.h"
#include "internal-fn.h"
+#include "gimple.h"
#include "gimple-expr.h"
+#include "gimple-iterator.h"
#include "gimple-fold.h"
#include "context.h"
#include "tree-ssa-alias.h"
@@ -85,10 +87,8 @@
#include "tree-eh.h"
#include "stmt.h"
#include "gimplify.h"
-#include "gimple.h"
#include "tree-phinodes.h"
#include "tree-cfg.h"
-#include "gimple-iterator.h"
#include "gimple-ssa.h"
#include "ssa-iterators.h"