diff options
| author | Chen Gang <gang.chen@sunrus.com.cn> | 2015-01-03 04:29:07 -0500 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-01-08 04:02:51 -0500 |
| commit | fbf87dff6706d412fe69b8158f7ae415e5e7380b (patch) | |
| tree | 8ee258dc488d5e321f778160c79423ca723739bb /arch | |
| parent | 47523c983f55448c3a09cc3f1a885bf81cd422e3 (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')
| -rw-r--r-- | arch/s390/boot/compressed/misc.c | 3 | ||||
| -rw-r--r-- | arch/s390/include/asm/sclp.h | 2 |
2 files changed, 3 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 | ||
| 66 | extern _sclp_print_early(const char *); | ||
| 67 | |||
| 68 | static int puts(const char *s) | 67 | static int puts(const char *s) |
| 69 | { | 68 | { |
| 70 | _sclp_print_early(s); | 69 | _sclp_print_early(s); |
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index 1aba89b53cb9..b6f8066789c1 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h | |||
| @@ -68,4 +68,6 @@ void sclp_early_detect(void); | |||
| 68 | int sclp_has_siif(void); | 68 | int sclp_has_siif(void); |
| 69 | unsigned int sclp_get_ibc(void); | 69 | unsigned int sclp_get_ibc(void); |
| 70 | 70 | ||
| 71 | long _sclp_print_early(const char *); | ||
| 72 | |||
| 71 | #endif /* _ASM_S390_SCLP_H */ | 73 | #endif /* _ASM_S390_SCLP_H */ |
