diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 11:42:34 +0200 |
commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
tree | 7184a24f04c72987e725e50e66db530e6f618220 /fs/proc/vmcore.c | |
parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
download | linux-43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000.tar.bz2 |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'fs/proc/vmcore.c')
-rw-r--r-- | fs/proc/vmcore.c | 2 |
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; |