From: Vasily Gorbik Date: Wed, 20 Nov 2024 19:36:46 +0000 (+0100) Subject: s390/boot: Make boot_printk() return int X-Git-Tag: v6.14-rc1~36^2~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=847e5a4c713747e8c0e9e25bda00aea782d1062b;p=thirdparty%2Flinux.git s390/boot: Make boot_printk() return int Modify boot_printk() to return int, aligning it with printk(). Signed-off-by: Vasily Gorbik Acked-by: Heiko Carstens Signed-off-by: Alexander Gordeev --- diff --git a/arch/s390/boot/boot.h b/arch/s390/boot/boot.h index 80e86387bee55..dbfba6822d6fd 100644 --- a/arch/s390/boot/boot.h +++ b/arch/s390/boot/boot.h @@ -72,7 +72,7 @@ void print_pgm_check_info(void); unsigned long randomize_within_range(unsigned long size, unsigned long align, unsigned long min, unsigned long max); void setup_vmem(unsigned long kernel_start, unsigned long kernel_end, unsigned long asce_limit); -void __printf(1, 2) boot_printk(const char *fmt, ...); +int __printf(1, 2) boot_printk(const char *fmt, ...); void print_stacktrace(unsigned long sp); void error(char *m); int get_random(unsigned long limit, unsigned long *value); diff --git a/arch/s390/boot/printk.c b/arch/s390/boot/printk.c index e49a9be6d555e..311fb45c097c5 100644 --- a/arch/s390/boot/printk.c +++ b/arch/s390/boot/printk.c @@ -174,7 +174,7 @@ static void boot_console_earlyprintk(const char *buf) (lenmod == 'z') ? va_arg(args, typemod long) : \ va_arg(args, typemod int)) -void boot_printk(const char *fmt, ...) +int boot_printk(const char *fmt, ...) { char buf[1024] = { 0 }; char *end = buf + sizeof(buf) - 1; /* make sure buf is 0 terminated */ @@ -248,4 +248,5 @@ out: boot_rb_add(buf, len); boot_console_earlyprintk(buf); } + return len; }