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/arc/kernel | |
| parent | 45c08383141794a7e9b26f35d491b74f33ac469e (diff) | |
| parent | 66584ea6b70a6cbae661292702e56a07580dbbd4 (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/arc/kernel')
| -rw-r--r-- | arch/arc/kernel/vmlinux.lds.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S index 6c693a9d29b6..54139a6f469b 100644 --- a/arch/arc/kernel/vmlinux.lds.S +++ b/arch/arc/kernel/vmlinux.lds.S @@ -95,13 +95,13 @@ SECTIONS _etext = .; _sdata = .; - RO_DATA_SECTION(PAGE_SIZE) + RO_DATA(PAGE_SIZE) /* * 1. this is .data essentially * 2. THREAD_SIZE for init.task, must be kernel-stk sz aligned */ - RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) + RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) _edata = .; @@ -118,8 +118,6 @@ SECTIONS /DISCARD/ : { *(.eh_frame) } #endif - NOTES - . = ALIGN(PAGE_SIZE); _end = . ; |