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>

diff --git a/arch/s390/include/asm/kmsan.h b/arch/s390/include/asm/kmsan.h
index 27db65fbf3f67935d967a5846af42e9806f186fa..f73e181d09aeb1d09314bd1b5bc0cccdee43752c 100644 (file)
--- a/arch/s390/include/asm/kmsan.h
+++ b/arch/s390/include/asm/kmsan.h
@@ -12,8 +12,8 @@
 
 static inline bool is_lowcore_addr(void *addr)
 {
-       return addr >= (void *)&S390_lowcore &&
-              addr < (void *)(&S390_lowcore + 1);
+       return addr >= (void *)get_lowcore() &&
+              addr < (void *)(get_lowcore() + 1);
 }
 
 static inline void *arch_kmsan_get_meta_or_null(void *addr, bool is_origin)
@@ -25,7 +25,7 @@ static inline void *arch_kmsan_get_meta_or_null(void *addr, bool is_origin)
                 * order to get a distinct struct page.
                 */
                addr += (void *)lowcore_ptr[raw_smp_processor_id()] -
-                       (void *)&S390_lowcore;
+                       (void *)get_lowcore();
                if (KMSAN_WARN_ON(is_lowcore_addr(addr)))
                        return NULL;
                return kmsan_get_metadata(addr, is_origin);