From dad7fce7a10af6a17cef04fb9f161a4e029acabe Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Wed, 28 Jun 2023 07:43:14 +0200 Subject: [PATCH] zipl/boot: move load_wait_psw() location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `load_wait_psw` is defined in include/boot/s390.h but is implemented in zipl/boot/libc.c. This results in a dangling definition for s390.h users other than zipl, due to the missing implementation. Since the function is only relevant for zipl, move the definition to the corresponding header file zipl/boot/libc.h Reviewed-by: Marc Hartmayer Reviewed-by: Jan Höppner Signed-off-by: Steffen Eiden --- include/boot/s390.h | 2 -- zipl/boot/libc.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boot/s390.h b/include/boot/s390.h index eeef87f1..4be4dc8b 100644 --- a/include/boot/s390.h +++ b/include/boot/s390.h @@ -40,8 +40,6 @@ ".long (" #_target ")\n" \ ".previous\n" -void load_wait_psw(uint64_t, struct psw_t *); - struct subchannel_id { uint32_t cssid:8; uint32_t:4; diff --git a/zipl/boot/libc.h b/zipl/boot/libc.h index 93e1ed2e..47984078 100644 --- a/zipl/boot/libc.h +++ b/zipl/boot/libc.h @@ -15,6 +15,7 @@ #include #include "lib/zt_common.h" +#include "boot/psw.h" #define EPERM 1 /* Operation not permitted */ #define ENOENT 2 /* No such file or directory */ @@ -65,6 +66,7 @@ void __noreturn start(void); void pgm_check_handler(void); void pgm_check_handler_fn(void); void panic_notify(unsigned long reason); +void load_wait_psw(uint64_t, struct psw_t *); #define panic(reason, ...) \ do { \