diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-01 10:32:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 12:58:53 +0100 |
| commit | 0fd2e9c53d82704a3ba87ea1980ec515188c5316 (patch) | |
| tree | a828c396110053feba9e65307a4e802b00966519 /scripts/Makefile.build | |
| parent | 1784f9144b143a1e8b19fe94083b040aa559182b (diff) | |
| parent | 1e4c4f610f774df6088d7c065b2dd4d22adba698 (diff) | |
| download | linux-0fd2e9c53d82704a3ba87ea1980ec515188c5316.tar.bz2 | |
Merge commit 'upstream-x86-entry' into WIP.x86/mm
Pull in a minimal set of v4.15 entry code changes, for a base for the MM isolation patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/Makefile.build')
| -rw-r--r-- | scripts/Makefile.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index bb831d49bcfd..e63af4e19382 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -259,7 +259,7 @@ ifneq ($(SKIP_STACK_VALIDATION),1) __objtool_obj := $(objtree)/tools/objtool/objtool -objtool_args = $(if $(CONFIG_ORC_UNWINDER),orc generate,check) +objtool_args = $(if $(CONFIG_UNWINDER_ORC),orc generate,check) ifndef CONFIG_FRAME_POINTER objtool_args += --no-fp |