From: Heiko Carstens <hca@linux.ibm.com>
Date: Sun, 2 Apr 2023 18:55:17 +0000 (+0200)
Subject: s390/mm: implement set_memory_rwnx()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f0a2a7c527849bf1b112a43f0b8d0658a7b4e6ec;p=linux.git

s390/mm: implement set_memory_rwnx()

Given that set_memory_rox() is implemented, provide also set_memory_rwnx().
This allows to get rid of all open coded __set_memory() usages in s390
architecture code.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---

diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h
index f4362ce1e17a6..25f2464dbb7e8 100644
--- a/arch/s390/include/asm/set_memory.h
+++ b/arch/s390/include/asm/set_memory.h
@@ -40,6 +40,11 @@ static inline int set_memory_rox(unsigned long addr, int numpages)
 	return __set_memory(addr, numpages, SET_MEMORY_RO | SET_MEMORY_X);
 }
 
+static inline int set_memory_rwnx(unsigned long addr, int numpages)
+{
+	return __set_memory(addr, numpages, SET_MEMORY_RW | SET_MEMORY_NX);
+}
+
 static inline int set_memory_4k(unsigned long addr, int numpages)
 {
 	return __set_memory(addr, numpages, SET_MEMORY_4K);