Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next
This commit is contained in:

@@ -14,8 +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
|
||||
* [__start_ro_after_init, __end_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
|
||||
@@ -33,7 +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 __start_ro_after_init[], __end_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[];
|
||||
|
@@ -173,6 +173,7 @@
|
||||
KEEP(*(__##name##_of_table_end))
|
||||
|
||||
#define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc)
|
||||
#define CLKEVT_OF_TABLES() OF_TABLE(CONFIG_CLKEVT_OF, clkevt)
|
||||
#define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
|
||||
#define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk)
|
||||
#define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu)
|
||||
@@ -260,9 +261,9 @@
|
||||
*/
|
||||
#ifndef RO_AFTER_INIT_DATA
|
||||
#define RO_AFTER_INIT_DATA \
|
||||
__start_data_ro_after_init = .; \
|
||||
VMLINUX_SYMBOL(__start_ro_after_init) = .; \
|
||||
*(.data..ro_after_init) \
|
||||
__end_data_ro_after_init = .;
|
||||
VMLINUX_SYMBOL(__end_ro_after_init) = .;
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -559,6 +560,7 @@
|
||||
CLK_OF_TABLES() \
|
||||
RESERVEDMEM_OF_TABLES() \
|
||||
CLKSRC_OF_TABLES() \
|
||||
CLKEVT_OF_TABLES() \
|
||||
IOMMU_OF_TABLES() \
|
||||
CPU_METHOD_OF_TABLES() \
|
||||
CPUIDLE_METHOD_OF_TABLES() \
|
||||
@@ -566,7 +568,6 @@
|
||||
IRQCHIP_OF_MATCH_TABLE() \
|
||||
ACPI_PROBE_TABLE(irqchip) \
|
||||
ACPI_PROBE_TABLE(clksrc) \
|
||||
ACPI_PROBE_TABLE(iort) \
|
||||
EARLYCON_TABLE()
|
||||
|
||||
#define INIT_TEXT \
|
||||
|
Reference in New Issue
Block a user