diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-24 11:27:40 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-24 11:27:40 +0800 |
| commit | 6cfa28eca52e58f4ee4b007babe03cd7d61ebad3 (patch) | |
| tree | 5b70c1b569081b68379090393e2815a00b593289 /include/asm-generic | |
| parent | 11d2c48e817d331a87efc4d45bdf510351198628 (diff) | |
| parent | a34cb2390f7f28f4a44568cccbc2c65a9bdff721 (diff) | |
Merge branch 'v4.4/topic/ro-vdso' into linux-linaro-lsk-v4.4
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 71581125e604..a65eedc15e93 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -249,6 +249,14 @@ *(.data..init_task) /* + * Allow architectures to handle ro_after_init data on their + * own by defining an empty RO_AFTER_INIT_DATA. + */ +#ifndef RO_AFTER_INIT_DATA +#define RO_AFTER_INIT_DATA *(.data..ro_after_init) +#endif + +/* * Read only Data */ #define RO_DATA_SECTION(align) \ @@ -256,7 +264,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ *(.rodata) *(.rodata.*) \ - *(.data..ro_after_init) /* Read only after init */ \ + RO_AFTER_INIT_DATA /* Read only after init */ \ *(__vermagic) /* Kernel version magic */ \ . = ALIGN(8); \ VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \ |