diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 10:56:18 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 10:56:18 +0100 |
| commit | edc39c9b4589a4ce9a69273b5a27a1459c3423d4 (patch) | |
| tree | e5850fe4a533579b0de12c02e48f7dcdd60e8e38 /arch/x86/kernel/vmlinux.lds.S | |
| parent | a06cc94f3f8dfab74fe7fac3a6e9f15d77566d00 (diff) | |
| parent | 1b5f3ba415fe4cf8b8b39c8d104ed44cde330658 (diff) | |
| download | op-kernel-dev-edc39c9b4589a4ce9a69273b5a27a1459c3423d4.zip op-kernel-dev-edc39c9b4589a4ce9a69273b5a27a1459c3423d4.tar.gz | |
Merge branch 'linus' into x86/build to pick up dependencies
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 1c43a2e..795f3a8 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -117,9 +117,11 @@ SECTIONS #ifdef CONFIG_X86_64 . = ALIGN(PAGE_SIZE); + VMLINUX_SYMBOL(__entry_trampoline_start) = .; _entry_trampoline = .; *(.entry_trampoline) . = ALIGN(PAGE_SIZE); + VMLINUX_SYMBOL(__entry_trampoline_end) = .; ASSERT(. - _entry_trampoline == PAGE_SIZE, "entry trampoline is too big"); #endif |
