aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-02 12:00:59 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-02 12:00:59 -0500
commit71a332e5603e000b907e66d172eae0e7a8c2c653 (patch)
tree79b5080144229e774edf0ea49464fc136e8872da
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff)
parent086cc1c31a0ec075dac02425367c871bb65bc2c9 (diff)
Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux
Pull Openrisc fix from Stafford Horne: "There was nothing much interesting here except a build fix pointed out by the test robots. Highlight: - Defined _text symbol to fix build error" * tag 'openrisc-for-linus' of git://github.com/openrisc/linux: openrisc: Add _text symbol to fix ksym build error
-rw-r--r--arch/openrisc/kernel/vmlinux.lds.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index ef31fc24344e..552544616b9d 100644
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@@ -44,6 +44,8 @@ SECTIONS
44 /* Read-only sections, merged into text segment: */ 44 /* Read-only sections, merged into text segment: */
45 . = LOAD_BASE ; 45 . = LOAD_BASE ;
46 46
47 _text = .;
48
47 /* _s_kernel_ro must be page aligned */ 49 /* _s_kernel_ro must be page aligned */
48 . = ALIGN(PAGE_SIZE); 50 . = ALIGN(PAGE_SIZE);
49 _s_kernel_ro = .; 51 _s_kernel_ro = .;