summaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorHeiko Carstens <hca@linux.ibm.com>2023-02-08 19:16:45 +0100
committerHeiko Carstens <hca@linux.ibm.com>2023-02-09 20:11:24 +0100
commit2f09c2ea6c649cb010e0782aed3c96108e693cff (patch)
tree6f7b164d81db3718fc405003fbb722b35a0a7cc6 /arch/s390/include
parentbe76ea61446095c045641404128bc6862545cda1 (diff)
downloadlinux-stable-2f09c2ea6c649cb010e0782aed3c96108e693cff.tar.gz
linux-stable-2f09c2ea6c649cb010e0782aed3c96108e693cff.tar.bz2
linux-stable-2f09c2ea6c649cb010e0782aed3c96108e693cff.zip
Revert "s390/mem_detect: do not update output parameters on failure"
This reverts commit cbc29f107e51b1cc7d1e7b0bbe0691a1224205f1. Get rid of the following smatch warnings: arch/s390/include/asm/mem_detect.h:86 get_mem_detect_end() error: uninitialized symbol 'end'. arch/s390/include/asm/mem_detect.h:86 get_mem_detect_end() error: uninitialized symbol 'end'. arch/s390/boot/vmem.c:256 setup_vmem() error: uninitialized symbol 'start'. arch/s390/boot/vmem.c:258 setup_vmem() error: uninitialized symbol 'end'. Note that there is no bug in the code. This is purely to silence smatch. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/mem_detect.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/include/asm/mem_detect.h b/arch/s390/include/asm/mem_detect.h
index 08798ddf5143..decd8c4cb799 100644
--- a/arch/s390/include/asm/mem_detect.h
+++ b/arch/s390/include/asm/mem_detect.h
@@ -40,8 +40,11 @@ void add_mem_detect_block(u64 start, u64 end);
static inline int __get_mem_detect_block(u32 n, unsigned long *start,
unsigned long *end)
{
- if (n >= mem_detect.count)
+ if (n >= mem_detect.count) {
+ *start = 0;
+ *end = 0;
return -1;
+ }
if (n < MEM_INLINED_ENTRIES) {
*start = (unsigned long)mem_detect.entries[n].start;