diff options
author | 2019-11-25 09:05:09 +0100 | |
---|---|---|
committer | 2019-11-25 09:05:09 +0100 | |
commit | f01ec4fca8207e31b59a010c3de679c833f3a877 (patch) | |
tree | 668813e1fe0dfffa5535b7531ba6ed489c912831 /arch/parisc | |
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.gz linux-f01ec4fca8207e31b59a010c3de679c833f3a877.tar.bz2 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/parisc')
-rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 99cd24f2ea01..53e29d88f99c 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -19,6 +19,7 @@ *(.data..vm0.pte) #define CC_USING_PATCHABLE_FUNCTION_ENTRY +#define RO_EXCEPTION_TABLE_ALIGN 8 #include <asm-generic/vmlinux.lds.h> @@ -109,7 +110,7 @@ SECTIONS _sdata = .; /* Architecturally we need to keep __gp below 0x1000000 and thus - * in front of RO_DATA_SECTION() which stores lots of tracepoint + * in front of RO_DATA() which stores lots of tracepoint * and ftrace symbols. */ #ifdef CONFIG_64BIT . = ALIGN(16); @@ -127,11 +128,7 @@ SECTIONS } #endif - RO_DATA_SECTION(8) - - /* RO because of BUILDTIME_EXTABLE_SORT */ - EXCEPTION_TABLE(8) - NOTES + RO_DATA(8) /* unwind info */ .PARISC.unwind : { @@ -149,7 +146,7 @@ SECTIONS data_start = .; /* Data */ - RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, PAGE_SIZE) + RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, PAGE_SIZE) /* PA-RISC locks requires 16-byte alignment */ . = ALIGN(16); |