diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:05:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:05:09 +0100 |
| commit | f01ec4fca8207e31b59a010c3de679c833f3a877 (patch) | |
| tree | 668813e1fe0dfffa5535b7531ba6ed489c912831 /arch/riscv/kernel | |
| parent | x86/entry/64: Remove pointless jump in paranoid_exit (diff) | |
| parent | x86/build/vdso: Remove meaningless CFLAGS_REMOVE_*.o (diff) | |
| download | linux-f01ec4fca8207e31b59a010c3de679c833f3a877.tar.xz linux-f01ec4fca8207e31b59a010c3de679c833f3a877.zip | |
Merge branch 'x86/build' into x86/asm, to pick up completed topic branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/riscv/kernel')
| -rw-r--r-- | arch/riscv/kernel/vmlinux.lds.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S index 23cd1a9e52a1..12f42f96d46e 100644 --- a/arch/riscv/kernel/vmlinux.lds.S +++ b/arch/riscv/kernel/vmlinux.lds.S @@ -52,12 +52,12 @@ SECTIONS /* Start of data section */ _sdata = .; - RO_DATA_SECTION(L1_CACHE_BYTES) + RO_DATA(L1_CACHE_BYTES) .srodata : { *(.srodata*) } - RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) + RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) .sdata : { __global_pointer$ = . + 0x800; *(.sdata*) @@ -69,7 +69,6 @@ SECTIONS BSS_SECTION(PAGE_SIZE, PAGE_SIZE, 0) EXCEPTION_TABLE(0x10) - NOTES .rel.dyn : { *(.rel.dyn*) |