Skip to content

Commit 847e5a4

Browse files
Vasily GorbikAlexander Gordeev
authored andcommitted
s390/boot: Make boot_printk() return int
Modify boot_printk() to return int, aligning it with printk(). Signed-off-by: Vasily Gorbik <[email protected]> Acked-by: Heiko Carstens <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent 816b5fe commit 847e5a4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/s390/boot/boot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void print_pgm_check_info(void);
7272
unsigned long randomize_within_range(unsigned long size, unsigned long align,
7373
unsigned long min, unsigned long max);
7474
void setup_vmem(unsigned long kernel_start, unsigned long kernel_end, unsigned long asce_limit);
75-
void __printf(1, 2) boot_printk(const char *fmt, ...);
75+
int __printf(1, 2) boot_printk(const char *fmt, ...);
7676
void print_stacktrace(unsigned long sp);
7777
void error(char *m);
7878
int get_random(unsigned long limit, unsigned long *value);

arch/s390/boot/printk.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static void boot_console_earlyprintk(const char *buf)
174174
(lenmod == 'z') ? va_arg(args, typemod long) : \
175175
va_arg(args, typemod int))
176176

177-
void boot_printk(const char *fmt, ...)
177+
int boot_printk(const char *fmt, ...)
178178
{
179179
char buf[1024] = { 0 };
180180
char *end = buf + sizeof(buf) - 1; /* make sure buf is 0 terminated */
@@ -248,4 +248,5 @@ void boot_printk(const char *fmt, ...)
248248
boot_rb_add(buf, len);
249249
boot_console_earlyprintk(buf);
250250
}
251+
return len;
251252
}

0 commit comments

Comments
 (0)