diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-07-27 09:13:09 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-07-27 09:13:09 +0100 |
| commit | d7ac67b94390945872713f9bb0c141bf158c83aa (patch) | |
| tree | 6ece8ec7e74c0f2fe55c4a87a6d0c952738247b0 /arch/arm/kernel/vmlinux.lds.S | |
| parent | 657a292d679ae3a6c733ab0e939e24ae44b20faf (diff) | |
| parent | 2335c9cb831faba1a4efcc612886073b6f175fe4 (diff) | |
| download | linux-d7ac67b94390945872713f9bb0c141bf158c83aa.tar.gz linux-d7ac67b94390945872713f9bb0c141bf158c83aa.tar.bz2 linux-d7ac67b94390945872713f9bb0c141bf158c83aa.zip | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index bd9127c4b451..de373c6c2ae8 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -74,7 +74,7 @@ SECTIONS . = ALIGN(4); __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { __start___ex_table = .; - ARM_MMU_KEEP(*(__ex_table)) + ARM_MMU_KEEP(KEEP(*(__ex_table))) __stop___ex_table = .; } @@ -99,7 +99,7 @@ SECTIONS } .init.arch.info : { __arch_info_begin = .; - *(.arch.info.init) + KEEP(*(.arch.info.init)) __arch_info_end = .; } .init.tagtable : { @@ -116,7 +116,7 @@ SECTIONS #endif .init.pv_table : { __pv_table_begin = .; - *(.pv_table) + KEEP(*(.pv_table)) __pv_table_end = .; } |
