diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-24 06:42:00 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-24 06:42:00 +0100 |
| commit | a97a2d4d56ea596871b739d63d41b084733bd9fb (patch) | |
| tree | e28c9143d5bd4da978caccd137bd193297d5e13e /arch/sparc/vdso/vdso-layout.lds.S | |
| parent | 44786880df196a4200c178945c4d41675faf9fb7 (diff) | |
| parent | 8dbc450f76dc8f3b47fe117cd0cde166e1f21b64 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Mostly VDSO cleanups and optimizations"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Several small VDSO vclock_gettime.c improvements.
sparc: Validate VDSO for undefined symbols.
sparc: Really use linker with LDFLAGS.
sparc: Improve VDSO CFLAGS.
sparc: Set DISABLE_BRANCH_PROFILING in VDSO CFLAGS.
sparc: Don't bother masking out TICK_PRIV_BIT in VDSO code.
sparc: Inline VDSO gettime code aggressively.
sparc: Improve VDSO instruction patching.
sparc: Fix parport build warnings.
Diffstat (limited to 'arch/sparc/vdso/vdso-layout.lds.S')
| -rw-r--r-- | arch/sparc/vdso/vdso-layout.lds.S | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/sparc/vdso/vdso-layout.lds.S b/arch/sparc/vdso/vdso-layout.lds.S index f2c83abaca12..ed36d49e1617 100644 --- a/arch/sparc/vdso/vdso-layout.lds.S +++ b/arch/sparc/vdso/vdso-layout.lds.S @@ -73,11 +73,8 @@ SECTIONS .text : { *(.text*) } :text =0x90909090, - .vread_tick_patch : { - vread_tick_patch_start = .; - *(.vread_tick_patch) - vread_tick_patch_end = .; - } + .tick_patch : { *(.tick_patch) } :text + .tick_patch_insns : { *(.tick_patch_insns) } :text /DISCARD/ : { *(.discard) |