aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/boot
diff options
context:
space:
mode:
authorChen Gang <gang.chen@sunrus.com.cn>2015-01-03 04:29:07 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-01-08 04:02:51 -0500
commitfbf87dff6706d412fe69b8158f7ae415e5e7380b (patch)
tree8ee258dc488d5e321f778160c79423ca723739bb /arch/s390/boot
parent47523c983f55448c3a09cc3f1a885bf81cd422e3 (diff)
s390/sclp: fix declaration of _sclp_print_early()
_sclp_print_early() has return value: at present, return 0 for OK, 1 for failure. It returns '%r2', so use 'long' as return value (upper caller can check '%r2' directly). The related warning: CC arch/s390/boot/compressed/misc.o arch/s390/boot/compressed/misc.c:66:8: warning: type defaults to 'int' in declaration of '_sclp_print_early' [-Wimplicit-int] extern _sclp_print_early(const char *); ^ At present, _sclp_print_early() is only used by puts(), so can still remain its declaration in 'misc.c' file. [heiko.carstens@de.ibm.com]: move declaration to sclp.h header file Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot')
-rw-r--r--arch/s390/boot/compressed/misc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c
index 57cbaff1f397..42506b371b74 100644
--- a/arch/s390/boot/compressed/misc.c
+++ b/arch/s390/boot/compressed/misc.c
@@ -8,6 +8,7 @@
8 8
9#include <asm/uaccess.h> 9#include <asm/uaccess.h>
10#include <asm/page.h> 10#include <asm/page.h>
11#include <asm/sclp.h>
11#include <asm/ipl.h> 12#include <asm/ipl.h>
12#include "sizes.h" 13#include "sizes.h"
13 14
@@ -63,8 +64,6 @@ static unsigned long free_mem_end_ptr;
63#include "../../../../lib/decompress_unxz.c" 64#include "../../../../lib/decompress_unxz.c"
64#endif 65#endif
65 66
66extern _sclp_print_early(const char *);
67
68static int puts(const char *s) 67static int puts(const char *s)
69{ 68{
70 _sclp_print_early(s); 69 _sclp_print_early(s);