61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
|
From 57746476c81359507743671addee330e303c1e02 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jens Remus <jremus@linux.ibm.com>
|
||
|
|
Date: Tue, 1 Oct 2024 17:36:16 +0200
|
||
|
|
Subject: [PATCH 22/38] pc-bios/s390-ccw: Clarify alignment is in bytes
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-MergeRequest: 278: Full boot order support for s390x [Centos 10]
|
||
|
|
RH-Jira: RHEL-58153
|
||
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [21/23] 17e89c1a3ca01b9de4683aebdbd06c5350422d27 (thuth/qemu-kvm-cs9)
|
||
|
|
|
||
|
|
The assembler directive .align [1] has architecture-dependent behavior,
|
||
|
|
which may be ambiguous for the reader. Some architectures perform the
|
||
|
|
alignment in bytes, others in power of two. s390 does in bytes.
|
||
|
|
|
||
|
|
Use the directive .balign [2] instead, to clarify that the alignment
|
||
|
|
request is in bytes. No functional change.
|
||
|
|
|
||
|
|
[1] https://sourceware.org/binutils/docs/as/Align.html
|
||
|
|
[2] https://sourceware.org/binutils/docs/as/Balign.html
|
||
|
|
|
||
|
|
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
|
||
|
|
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Message-ID: <20241001153618.17791-2-mhartmay@linux.ibm.com>
|
||
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
(cherry picked from commit c58df213af7ec8924d219025a593b8f3ac475f16)
|
||
|
|
---
|
||
|
|
pc-bios/s390-ccw/start.S | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
|
||
|
|
index 061b06591c..576fc12c06 100644
|
||
|
|
--- a/pc-bios/s390-ccw/start.S
|
||
|
|
+++ b/pc-bios/s390-ccw/start.S
|
||
|
|
@@ -112,7 +112,7 @@ io_new_code:
|
||
|
|
lctlg %c6,%c6,0(%r15)
|
||
|
|
br %r14
|
||
|
|
|
||
|
|
- .align 8
|
||
|
|
+ .balign 8
|
||
|
|
bss_start_literal:
|
||
|
|
.quad __bss_start
|
||
|
|
disabled_wait_psw:
|
||
|
|
@@ -125,7 +125,7 @@ io_new_mask:
|
||
|
|
.quad 0x0000000180000000
|
||
|
|
|
||
|
|
.bss
|
||
|
|
- .align 8
|
||
|
|
+ .balign 8
|
||
|
|
stack:
|
||
|
|
.space STACK_SIZE
|
||
|
|
.size stack,STACK_SIZE
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|