From: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
Needed when "example for future extension: mm:gup/writeback: add
callbacks for inaccessible pages: source indication" is applied.
Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
---
arch/s390/include/asm/page.h | 2 +-
arch/s390/kernel/uv.c | 2 +-
arch/s390/mm/fault.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 4ebcf891ff3c..a658487fe8e7 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -154,7 +154,7 @@ static inline int devmem_is_allowed(unsigned long pfn)
#define HAVE_ARCH_ALLOC_PAGE
#if IS_ENABLED(CONFIG_PGSTE)
-int arch_make_page_accessible(struct page *page);
+int arch_make_page_accessible(struct page *page, int where);
#define HAVE_ARCH_MAKE_PAGE_ACCESSIBLE
#endif
diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
index fb606b171f42..5ace77694ed3 100644
--- a/arch/s390/kernel/uv.c
+++ b/arch/s390/kernel/uv.c
@@ -287,7 +287,7 @@ EXPORT_SYMBOL_GPL(gmap_convert_to_secure);
/**
* To be called with the page locked or with an extra reference!
*/
-int arch_make_page_accessible(struct page *page)
+int arch_make_page_accessible(struct page *page, int where)
{
int rc = 0;
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 7bd86ebc882f..1f31025bc2cf 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -842,7 +842,7 @@ void do_secure_storage_access(struct pt_regs *regs)
up_read(&mm->mmap_sem);
break;
}
- if (arch_make_page_accessible(page))
+ if (arch_make_page_accessible(page, MAKE_ACCESSIBLE_GENERIC))
send_sig(SIGSEGV, current, 0);
put_page(page);
up_read(&mm->mmap_sem);
@@ -851,7 +851,7 @@ void do_secure_storage_access(struct pt_regs *regs)
page = phys_to_page(addr);
if (unlikely(!try_get_page(page)))
break;
- rc = arch_make_page_accessible(page);
+ rc = arch_make_page_accessible(page, MAKE_ACCESSIBLE_GENERIC);
put_page(page);
if (rc)
BUG();
--
2.25.0
