diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2020-11-25 23:17:31 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-11-25 23:17:31 +1100 |
| commit | 20fa40b147bda9b976227c11ea7afb369827e7d4 (patch) | |
| tree | 607c4002fc4662753ea7b85acd75868b3c18c4c9 /arch/powerpc/kernel/vmlinux.lds.S | |
| parent | powernv/memtrace: don't abuse memory hot(un)plug infrastructure for memory allocations (diff) | |
| parent | powerpc/64s: Fix allnoconfig build since uaccess flush (diff) | |
| download | wireguard-linux-20fa40b147bda9b976227c11ea7afb369827e7d4.tar.xz wireguard-linux-20fa40b147bda9b976227c11ea7afb369827e7d4.zip | |
Merge branch 'fixes' into next
Merge our fixes branch, in particular to bring in the changes for the
entry/uaccess flush.
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 5dc05f30349e..3b4c26e94328 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -132,6 +132,20 @@ SECTIONS } . = ALIGN(8); + __uaccess_flush_fixup : AT(ADDR(__uaccess_flush_fixup) - LOAD_OFFSET) { + __start___uaccess_flush_fixup = .; + *(__uaccess_flush_fixup) + __stop___uaccess_flush_fixup = .; + } + + . = ALIGN(8); + __entry_flush_fixup : AT(ADDR(__entry_flush_fixup) - LOAD_OFFSET) { + __start___entry_flush_fixup = .; + *(__entry_flush_fixup) + __stop___entry_flush_fixup = .; + } + + . = ALIGN(8); __stf_exit_barrier_fixup : AT(ADDR(__stf_exit_barrier_fixup) - LOAD_OFFSET) { __start___stf_exit_barrier_fixup = .; *(__stf_exit_barrier_fixup) |