From 305235a7bce814f71ec113a612b6117c96894e23 Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Wed, 26 Feb 2020 08:00:34 +0100 Subject: [PATCH] include/boot/s390.h: fixes for -Werror=sign-conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Errors fixed: ../../include/boot/s390.h: In function '__stfle_asm': ../../include/boot/s390.h:424:41: error: conversion to 'long unsigned int' from 'int' may change the sign of the result [-Werror=sign-conversion] register unsigned long reg0 asm("0") = size - 1; ../../include/boot/s390.h: In function 'stfle': ../../include/boot/s390.h:453:31: error: conversion to 'long unsigned int' from 'int' may change the sign of the result [-Werror=sign-conversion] nr = MIN((nr + 1) * 8, size * 8UL); ../../include/boot/s390.h: In function 'diag308': ../../include/boot/s390.h:296:9: error: conversion from 'long unsigned int' to 'int' may change value [-Werror=conversion] return _rc; Reviewed-by: Philipp Rudo Reviewed-by: Stefan Haberland Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- include/boot/s390.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boot/s390.h b/include/boot/s390.h index ea1493e5..af842e1c 100644 --- a/include/boot/s390.h +++ b/include/boot/s390.h @@ -269,7 +269,7 @@ enum diag308_subcode { DIAG308_STORE = 6, }; -static __always_inline int diag308(unsigned long subcode, void *addr) +static __always_inline unsigned long diag308(unsigned long subcode, void *addr) { register unsigned long _addr asm("0") = (unsigned long) addr; register unsigned long _rc asm("1") = 0; @@ -403,7 +403,7 @@ static __always_inline int test_facility(unsigned long nr) return __test_facility(nr, &S390_lowcore.stfle_fac_list); } -static __always_inline unsigned long __stfle_asm(uint64_t *stfle_fac_list, int size) +static __always_inline unsigned long __stfle_asm(uint64_t *stfle_fac_list, unsigned int size) { register unsigned long reg0 asm("0") = size - 1; @@ -420,7 +420,7 @@ static __always_inline unsigned long __stfle_asm(uint64_t *stfle_fac_list, int s * @stfle_fac_list: array where facility list can be stored * @size: size of passed in array in double words */ -static __always_inline void stfle(uint64_t *stfle_fac_list, int size) +static __always_inline void stfle(uint64_t *stfle_fac_list, unsigned int size) { unsigned long nr;