| From 31ea8e70ee9ee29955ce2bf9b106b041a6433aa0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Oct 2018 10:05:20 +0200 |
| Subject: proc/vmcore: Fix i386 build error of missing |
| copy_oldmem_page_encrypted() |
| |
| From: Borislav Petkov <bp@suse.de> |
| |
| [ Upstream commit cf089611f4c446285046fcd426d90c18f37d2905 ] |
| |
| 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@redhat.com> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| CC: x86@kernel.org |
| Link: http://lkml.kernel.org/r/710b9d95-2f70-eadf-c4a1-c3dc80ee4ebb@redhat.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/proc/vmcore.c | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c |
| index 885d445afa0d9..ce400f97370d3 100644 |
| --- a/fs/proc/vmcore.c |
| +++ b/fs/proc/vmcore.c |
| @@ -164,6 +164,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 |
| */ |
| -- |
| 2.20.1 |
| |