kernel: fix 5.15.28 patch error

This commit is contained in:
lean 2022-03-12 01:41:16 +08:00
parent eafca6ea73
commit c78e255f56

View File

@ -103,28 +103,24 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
__stop_unwind_tab = .; \ __stop_unwind_tab = .; \
} }
@@ -112,14 +112,14 @@ @@ -126,13 +126,13 @@
#define ARM_VECTORS \
__vectors_lma = .; \ __vectors_lma = .; \
OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) { \ OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) { \
.vectors { \ .vectors { \
- *(.vectors) \ - *(.vectors) \
+ KEEP(*(.vectors)) \ + KEEP(*(.vectors)) \
} \ } \
.vectors.bhb.loop8 { \ .vectors.bhb.loop8 { \
- *(.vectors.bhb.loop8) \ - *(.vectors.bhb.loop8) \
+ KEEP(*(.vectors.bhb.loop8)) \ + KEEP(*(.vectors.bhb.loop8)) \
} \ } \
.vectors.bhb.bpiall { \ .vectors.bhb.bpiall { \
- *(.vectors.bhb.bpiall) \ - *(.vectors.bhb.bpiall) \
+ KEEP(*(.vectors.bhb.bpiall)) \ + KEEP(*(.vectors.bhb.bpiall)) \
} \ } \
} \
ARM_LMA(__vectors, .vectors); \ ARM_LMA(__vectors, .vectors); \
ARM_LMA(__vectors_bhb_loop8, .vectors.bhb.loop8); \ @@ -144,7 +144,7 @@
ARM_LMA(__vectors_bhb_bpiall, .vectors.bhb.bpiall); \
. = __vectors_lma + SIZEOF(.vectors) + \
SIZEOF(.vectors.bhb.loop8) + \
SIZEOF(.vectors.bhb.bpiall); \
\ \
__stubs_lma = .; \ __stubs_lma = .; \
.stubs ADDR(.vectors) + 0x1000 : AT(__stubs_lma) { \ .stubs ADDR(.vectors) + 0x1000 : AT(__stubs_lma) { \
@ -133,4 +129,3 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
} \ } \
ARM_LMA(__stubs, .stubs); \ ARM_LMA(__stubs, .stubs); \
. = __stubs_lma + SIZEOF(.stubs); \ . = __stubs_lma + SIZEOF(.stubs); \
\