[tip:x86/mm] proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted()

From: tip-bot for Borislav Petkov
Date: Tue Oct 09 2018 - 06:31:02 EST


Commit-ID: cf089611f4c446285046fcd426d90c18f37d2905
Gitweb: https://git.kernel.org/tip/cf089611f4c446285046fcd426d90c18f37d2905
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Mon, 8 Oct 2018 10:05:20 +0200
Committer: Borislav Petkov <bp@xxxxxxx>
CommitDate: Tue, 9 Oct 2018 11:57:28 +0200

proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted()

Lianbo reported a build error with a particular 32-bit config, see Link
below for details.

Provide a weak copy_oldmem_page_encrypted() function which architectures
can override, in the same manner other functionality in that file is
supplied.

Reported-by: Lianbo Jiang <lijiang@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
CC: x86@xxxxxxxxxx
Link: http://lkml.kernel.org/r/710b9d95-2f70-eadf-c4a1-c3dc80ee4ebb@xxxxxxxxxx
---
fs/proc/vmcore.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 42c32d06f7da..91ae16fbd7d5 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -187,6 +187,16 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
return remap_pfn_range(vma, from, pfn, size, prot);
}

+/*
+ * Architectures which support memory encryption override this.
+ */
+ssize_t __weak
+copy_oldmem_page_encrypted(unsigned long pfn, char *buf, size_t csize,
+ unsigned long offset, int userbuf)
+{
+ return copy_oldmem_page(pfn, buf, csize, offset, userbuf);
+}
+
/*
* Copy to either kernel or user space
*/