[RHEL6.8 Patch 15/19] s390/kdump: Disable mmap for s390

[Baoquan He <bhe@redhat.com>]

Resolves: bz1097904
https://bugzilla.redhat.com/show_bug.cgi?id=1097904

This is back ported from upstream.

commit 5a74953ff56aa870d6913ef4d81934f5c620c59d
Author: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Date:   Thu Jul 18 12:17:57 2013 +0200

    s390/kdump: Disable mmap for s390

    The kdump mmap patch series (git commit 83086978c63afd7c73e1c) directly
    map the PT_LOADs to memory. On s390 this does not work because the
    copy_from_oldmem() function swaps [0,crashkernel size] with
    [crashkernel base, crashkernel base+crashkernel size]. The swap
    int copy_from_oldmem() was done in order correctly implement /dev/oldmem.

    See: http://marc.info/?l=kexec&m=136940802511603&w=2

    Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 fs/proc/vmcore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index f083c15..e93bcf9 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -219,7 +219,7 @@ static inline char *alloc_elfnotes_buf(size_t notes_sz)
  * regions in the 1st kernel pointed to by PT_LOAD entries) into
  * virtually contiguous user-space in ELF layout.
  */
-#ifdef CONFIG_MMU
+#if defined(CONFIG_MMU) && !defined(CONFIG_S390)
 static int mmap_vmcore(struct file *file, struct vm_area_struct *vma)
 {
 	size_t size = vma->vm_end - vma->vm_start;
-- 
2.1.0