Commit 847e5a4c authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Alexander Gordeev
Browse files

s390/boot: Make boot_printk() return int 



Modify boot_printk() to return int, aligning it with printk().

Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 816b5fea

arch/s390/boot/boot.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/s390/boot/printk.c

+2 −1
Original line number Diff line number Diff line
@@ -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 @@ void boot_printk(const char *fmt, ...) 
		boot_rb_add(buf, len);

		boot_console_earlyprintk(buf);

	}

	return len;

}