diff options
| author | Ingo Molnar | 2018-10-06 15:51:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-10-06 15:51:56 +0200 |
| commit | 02678a582392111928650f116b34091bfdb6441e (patch) | |
| tree | b4a8d6ad38f7c405a362f597ff04871bfe20a81b /include/asm-generic | |
| parent | Merge branch 'x86/core' into x86/build, to avoid conflicts (diff) | |
| parent | jump_label: Fix NULL dereference bug in __jump_label_mod_update() (diff) | |
| download | kernel-qcow2-linux-02678a582392111928650f116b34091bfdb6441e.tar.gz kernel-qcow2-linux-02678a582392111928650f116b34091bfdb6441e.tar.xz kernel-qcow2-linux-02678a582392111928650f116b34091bfdb6441e.zip | |
Merge branch 'core/core' into x86/build, to prevent conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 7b75ff6e2fce..f09ee3c544bc 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -253,10 +253,6 @@ STRUCT_ALIGN(); \ *(__tracepoints) \ /* implement dynamic printk debug */ \ - . = ALIGN(8); \ - __start___jump_table = .; \ - KEEP(*(__jump_table)) \ - __stop___jump_table = .; \ . = ALIGN(8); \ __start___verbose = .; \ KEEP(*(__verbose)) \ @@ -300,6 +296,12 @@ . = __start_init_task + THREAD_SIZE; \ __end_init_task = .; +#define JUMP_TABLE_DATA \ + . = ALIGN(8); \ + __start___jump_table = .; \ + KEEP(*(__jump_table)) \ + __stop___jump_table = .; + /* * Allow architectures to handle ro_after_init data on their * own by defining an empty RO_AFTER_INIT_DATA. @@ -308,6 +310,7 @@ #define RO_AFTER_INIT_DATA \ __start_ro_after_init = .; \ *(.data..ro_after_init) \ + JUMP_TABLE_DATA \ __end_ro_after_init = .; #endif |