Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/kmsan: Fix merge conflict with get_lowcore() introduction

Resolve the conflict between commit 2a48c8c9cf87 ("s390/kmsan:
implement the architecture-specific functions") and commit 39976f1278a9
("s390: Remove S390_lowcore").

Fixes: 2a48c8c9cf87 ("s390/kmsan: implement the architecture-specific functions")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20240723124441.120044-2-iii@linux.ibm.com
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

authored by

Ilya Leoshkevich and committed by
Vasily Gorbik
ec25f99c e188e5d5

+3 -3
+3 -3
arch/s390/include/asm/kmsan.h
··· 12 12 13 13 static inline bool is_lowcore_addr(void *addr) 14 14 { 15 - return addr >= (void *)&S390_lowcore && 16 - addr < (void *)(&S390_lowcore + 1); 15 + return addr >= (void *)get_lowcore() && 16 + addr < (void *)(get_lowcore() + 1); 17 17 } 18 18 19 19 static inline void *arch_kmsan_get_meta_or_null(void *addr, bool is_origin) ··· 25 25 * order to get a distinct struct page. 26 26 */ 27 27 addr += (void *)lowcore_ptr[raw_smp_processor_id()] - 28 - (void *)&S390_lowcore; 28 + (void *)get_lowcore(); 29 29 if (KMSAN_WARN_ON(is_lowcore_addr(addr))) 30 30 return NULL; 31 31 return kmsan_get_metadata(addr, is_origin);