diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 02:35:56 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 02:35:56 +0400 |
| commit | 589e1d10ff27c61669cc74a43620e6e769ea79dd (patch) | |
| tree | 63c23b1407944f136b44949c7b03da74823ae757 /arch/x86/vdso/vma.c | |
| parent | db7c17ecbf4d6328597047c4e4d6e8914945477c (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
| download | linux-589e1d10ff27c61669cc74a43620e6e769ea79dd.tar.xz | |
Merge 3.16-rc5 into staging-next
We want the fixes in -rc5 in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/vdso/vma.c')
| -rw-r--r-- | arch/x86/vdso/vma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c index e1513c47872a..5a5176de8d0a 100644 --- a/arch/x86/vdso/vma.c +++ b/arch/x86/vdso/vma.c @@ -62,6 +62,9 @@ struct linux_binprm; Only used for the 64-bit and x32 vdsos. */ static unsigned long vdso_addr(unsigned long start, unsigned len) { +#ifdef CONFIG_X86_32 + return 0; +#else unsigned long addr, end; unsigned offset; end = (start + PMD_SIZE - 1) & PMD_MASK; @@ -83,6 +86,7 @@ static unsigned long vdso_addr(unsigned long start, unsigned len) addr = align_vdso_addr(addr); return addr; +#endif } static int map_vdso(const struct vdso_image *image, bool calculate_addr) |