diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /arch/s390/kernel | |
parent | 353c50ebe329daaf2c94dc41c1c481cbba2a31fd (diff) | |
parent | 81bcfe5e48f9b8c42cf547f1c74c7f60c44c34c8 (diff) |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 000e6e91f6a0..3667d20e997f 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .; |