Skip to contentSkip to conversation

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

PATCH New Ilya Leoshkevich 1 participant 1 message Jun 27, 2024

Subsystems (3)
Linux-next tree s390 KMSAN
lore
Share & tools
lore

Ilya Leoshkevich

author
#0 lore raw

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

Resolve linux-next conflict between commit 10ff0f8ec5d2 ("s390/kmsan:
implement the architecture-specific functions") and commit 39976f1278a9 ("s390: Remove S390_lowcore").

Signed-off-by Ilya Leoshkevich <[email protected]>
---
 arch/s390/include/asm/kmsan.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/include/asm/kmsan.h +3 -3
index 27db65fbf3f6..f73e181d09ae 100644
@@ -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);
Signature · 1 line
2.45.2