summaryrefslogtreecommitdiffstats
path: root/arch/arm/vdso
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-07-03 10:30:58 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2019-07-08 11:32:21 +0100
commit5ccd3bd992cf668b5a6fa1713da7b443a35e2930 (patch)
treee55f60946cf658ab396a1a0401833b67e71de196 /arch/arm/vdso
parentc5d0e49e8d8f1a23034fdf8e935afc0c8f7ae27d (diff)
parentf785b42f4cb5a63eeb3f9037acf35b827aabb328 (diff)
downloadlinux-5ccd3bd992cf668b5a6fa1713da7b443a35e2930.tar.bz2
Merge branches 'fixes' and 'misc'
Fix up the conflict between "VDSO: Drop implicit common-page-size linker flag" and "vdso: pass --be8 to linker if necessary" Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/vdso')
-rw-r--r--arch/arm/vdso/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
index 1f5ec9741e6d..ca85df247775 100644
--- a/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@ -12,8 +12,7 @@ ccflags-y += -DDISABLE_BRANCH_PROFILING
ldflags-$(CONFIG_CPU_ENDIAN_BE8) := --be8
ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
- -z max-page-size=4096 -z common-page-size=4096 \
- -nostdlib -shared $(ldflags-y) \
+ -z max-page-size=4096 -nostdlib -shared $(ldflags-y) \
$(call ld-option, --hash-style=sysv) \
$(call ld-option, --build-id) \
-T