diff options
| author | Ingo Molnar | 2019-11-25 09:05:09 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2019-11-25 09:05:09 +0100 |
| commit | f01ec4fca8207e31b59a010c3de679c833f3a877 (patch) | |
| tree | 668813e1fe0dfffa5535b7531ba6ed489c912831 /arch/um | |
| parent | 45c08383141794a7e9b26f35d491b74f33ac469e (diff) | |
| parent | 66584ea6b70a6cbae661292702e56a07580dbbd4 (diff) | |
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/um')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S index d7086b985f27..7145ce699982 100644 --- a/arch/um/include/asm/common.lds.S +++ b/arch/um/include/asm/common.lds.S @@ -9,14 +9,13 @@ _sdata = .; PROVIDE (sdata = .); - RODATA + RO_DATA(4096) .unprotected : { *(.unprotected) } . = ALIGN(4096); PROVIDE (_unprotected_end = .); . = ALIGN(4096); - NOTES EXCEPTION_TABLE(0) BUG_TABLE |