diff options
| -rw-r--r-- | arm64-remove-special-treatment-for-the-link-order-of.patch | 38 | ||||
| -rwxr-xr-x | kernel.spec | 4 |
2 files changed, 42 insertions, 0 deletions
diff --git a/arm64-remove-special-treatment-for-the-link-order-of.patch b/arm64-remove-special-treatment-for-the-link-order-of.patch new file mode 100644 index 000000000..5b350734d --- /dev/null +++ b/arm64-remove-special-treatment-for-the-link-order-of.patch @@ -0,0 +1,38 @@ +From 994b7ac1697b4581b7726d2ac64321e3c840229b Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada <masahiroy@kernel.org> +Date: Thu, 13 Oct 2022 08:35:00 +0900 +Subject: [PATCH] arm64: remove special treatment for the link order of head.o + +In the previous discussion (see the Link tag), Ard pointed out that +arm/arm64/kernel/head.o does not need any special treatment - the only +piece that must appear right at the start of the binary image is the +image header which is emitted into .head.text. + +The linker script does the right thing to do. The build system does +not need to manipulate the link order of head.o. + +Link: https://lore.kernel.org/lkml/CAMj1kXH77Ja8bSsq2Qj8Ck9iSZKw=1F8Uy-uAWGVDm4-CG=EuA@mail.gmail.com/ +Suggested-by: Ard Biesheuvel <ardb@kernel.org> +Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> +Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> +Link: https://lore.kernel.org/r/20221012233500.156764-1-masahiroy@kernel.org +Signed-off-by: Will Deacon <will@kernel.org> +--- + scripts/head-object-list.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/head-object-list.txt b/scripts/head-object-list.txt +index b16326a92c45..f226e45e3b7b 100644 +--- a/scripts/head-object-list.txt ++++ b/scripts/head-object-list.txt +@@ -15,7 +15,6 @@ arch/alpha/kernel/head.o + arch/arc/kernel/head.o + arch/arm/kernel/head-nommu.o + arch/arm/kernel/head.o +-arch/arm64/kernel/head.o + arch/csky/kernel/head.o + arch/hexagon/kernel/head.o + arch/ia64/kernel/head.o +-- +2.38.1 + diff --git a/kernel.spec b/kernel.spec index 8620c3e4a..de64a3fb8 100755 --- a/kernel.spec +++ b/kernel.spec @@ -864,6 +864,8 @@ Source4002: gating.yaml ## Patches needed for building this package +Patch100: arm64-remove-special-treatment-for-the-link-order-of.patch + %if !%{nopatches} Patch1: patch-%{patchversion}-redhat.patch @@ -1437,6 +1439,8 @@ mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . +patch -R -p1 < "$RPM_SOURCE_DIR/"arm64-remove-special-treatment-for-the-link-order-of.patch + %if !%{nopatches} ApplyOptionalPatch patch-%{patchversion}-redhat.patch |