From 35e539a428421e9a399dc15971b6175e41e854ff Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Fri, 8 Aug 2025 09:30:49 +0000 Subject: [PATCH] zipl/boot: Declare 'magic' variable as static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Mikhail Zaslonko Reviewed-by: Stefan Haberland Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- zipl/boot/eckd2dump_mv.c | 2 +- zipl/boot/eckd2dump_sv.c | 2 +- zipl/boot/fba2dump.c | 2 +- zipl/boot/stage2.c | 4 ++-- zipl/boot/tape2dump.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zipl/boot/eckd2dump_mv.c b/zipl/boot/eckd2dump_mv.c index 758c9bab..34ae05bc 100644 --- a/zipl/boot/eckd2dump_mv.c +++ b/zipl/boot/eckd2dump_mv.c @@ -22,7 +22,7 @@ /* * Magic number at start of dump record */ -const uint64_t __used __section(.stage2.head) magic = 0x584d554c54363402ULL; /* XMULT64, version 2 */ +static const uint64_t __used __section(.stage2.head) magic = 0x584d554c54363402ULL; /* XMULT64, version 2 */ /* * Parameter format for ECKD MV dumper (13 bytes): diff --git a/zipl/boot/eckd2dump_sv.c b/zipl/boot/eckd2dump_sv.c index 2cad1818..8df4a51d 100644 --- a/zipl/boot/eckd2dump_sv.c +++ b/zipl/boot/eckd2dump_sv.c @@ -21,7 +21,7 @@ /* * Magic number at start of dump record */ -const uint64_t __used __section(.stage2.head) magic = 0x5845434b44363402ULL; /* "XECKD64", version 2 */ +static const uint64_t __used __section(.stage2.head) magic = 0x5845434b44363402ULL; /* "XECKD64", version 2 */ /* * Get device characteristics from zipl parameter block diff --git a/zipl/boot/fba2dump.c b/zipl/boot/fba2dump.c index 4ded60d6..58a79629 100644 --- a/zipl/boot/fba2dump.c +++ b/zipl/boot/fba2dump.c @@ -24,7 +24,7 @@ /* * Magic number at start of dump record */ -const uint64_t __used __section(.stage2.head) magic = 0x5844464241363401ULL; /* XDFBA64, version 1 */ +static const uint64_t __used __section(.stage2.head) magic = 0x5844464241363401ULL; /* XDFBA64, version 1 */ /* * FBA dump device partition specification diff --git a/zipl/boot/stage2.c b/zipl/boot/stage2.c index 6d6cd2fb..5952a97d 100644 --- a/zipl/boot/stage2.c +++ b/zipl/boot/stage2.c @@ -18,6 +18,8 @@ #include "boot/loaders_layout.h" #include "stage2.h" +static const uint64_t __used __section(.stage2.head) stage2_head; + static int is_null_descriptor(union disk_blockptr *address) { unsigned long long *value = (unsigned long long *)address; @@ -146,5 +148,3 @@ void __noreturn start(void) void panic_notify(unsigned long UNUSED(reason)) { } - -const uint64_t __used __section(.stage2.head) stage2_head; diff --git a/zipl/boot/tape2dump.c b/zipl/boot/tape2dump.c index 28a3484f..6ad795a4 100644 --- a/zipl/boot/tape2dump.c +++ b/zipl/boot/tape2dump.c @@ -38,7 +38,7 @@ struct tape_head { uint64_t ccw2; } __packed; -const struct tape_head __used __section(.stage2.head) tape_head = { +static const struct tape_head __used __section(.stage2.head) tape_head = { .psw = PSW_LOAD | STAGE2_ENTRY, /* Start code at 0x2018 */ .ccw1 = 0x0700000060000001ULL, /* Rewind ccw */ .ccw2 = 0x0200200020003000ULL, /* CCW to load dump tool to 0x2000 */