diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-01 04:32:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 06:58:53 -0500 |
| commit | 0fd2e9c53d82704a3ba87ea1980ec515188c5316 (patch) | |
| tree | a828c396110053feba9e65307a4e802b00966519 /include/asm-generic | |
| parent | 1784f9144b143a1e8b19fe94083b040aa559182b (diff) | |
| parent | 1e4c4f610f774df6088d7c065b2dd4d22adba698 (diff) | |
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 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 8acfc1e099e1..63e56f6c1877 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -687,7 +687,7 @@ | |||
| 687 | #define BUG_TABLE | 687 | #define BUG_TABLE |
| 688 | #endif | 688 | #endif |
| 689 | 689 | ||
| 690 | #ifdef CONFIG_ORC_UNWINDER | 690 | #ifdef CONFIG_UNWINDER_ORC |
| 691 | #define ORC_UNWIND_TABLE \ | 691 | #define ORC_UNWIND_TABLE \ |
| 692 | . = ALIGN(4); \ | 692 | . = ALIGN(4); \ |
| 693 | .orc_unwind_ip : AT(ADDR(.orc_unwind_ip) - LOAD_OFFSET) { \ | 693 | .orc_unwind_ip : AT(ADDR(.orc_unwind_ip) - LOAD_OFFSET) { \ |