summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorMichael Holzheu <holzheu@linux.vnet.ibm.com>2013-07-18 12:17:57 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-07-18 13:40:18 +0200
commit5a74953ff56aa870d6913ef4d81934f5c620c59d (patch)
treea2c44eb3048e1ac09159ad5477d5afc79d135d8a /fs/proc
parentc9a7afa380ecaeb0fbeec2e82f86ec5548ad2963 (diff)
downloadlinux-stable-5a74953ff56aa870d6913ef4d81934f5c620c59d.tar.gz
linux-stable-5a74953ff56aa870d6913ef4d81934f5c620c59d.tar.bz2
linux-stable-5a74953ff56aa870d6913ef4d81934f5c620c59d.zip
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>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/vmcore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 28503172f2e4..a1a16eb97c7b 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -223,7 +223,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;