Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -14,6 +14,8 @@
|
||||
* [_sdata, _edata]: contains .data.* sections, may also contain .rodata.*
|
||||
* and/or .init.* sections.
|
||||
* [__start_rodata, __end_rodata]: contains .rodata.* sections
|
||||
* [__start_data_ro_after_init, __end_data_ro_after_init]:
|
||||
* contains data.ro_after_init section
|
||||
* [__init_begin, __init_end]: contains .init.* sections, but .init.text.*
|
||||
* may be out of this range on some architectures.
|
||||
* [_sinittext, _einittext]: contains .init.text.* sections
|
||||
@@ -31,6 +33,7 @@ extern char _data[], _sdata[], _edata[];
|
||||
extern char __bss_start[], __bss_stop[];
|
||||
extern char __init_begin[], __init_end[];
|
||||
extern char _sinittext[], _einittext[];
|
||||
extern char __start_data_ro_after_init[], __end_data_ro_after_init[];
|
||||
extern char _end[];
|
||||
extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];
|
||||
extern char __kprobes_text_start[], __kprobes_text_end[];
|
||||
|
@@ -259,7 +259,10 @@
|
||||
* own by defining an empty RO_AFTER_INIT_DATA.
|
||||
*/
|
||||
#ifndef RO_AFTER_INIT_DATA
|
||||
#define RO_AFTER_INIT_DATA *(.data..ro_after_init)
|
||||
#define RO_AFTER_INIT_DATA \
|
||||
__start_data_ro_after_init = .; \
|
||||
*(.data..ro_after_init) \
|
||||
__end_data_ro_after_init = .;
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user