From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Wed, 3 Jul 2019 09:30:58 +0000 (+0100)
Subject: Merge branches 'fixes' and 'misc'
X-Git-Tag: v5.15~6034^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ccd3bd992cf668b5a6fa1713da7b443a35e2930;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

5ccd3bd992cf668b5a6fa1713da7b443a35e2930
diff --cc arch/arm/vdso/Makefile
index 1f5ec97,db17544..ca85df2
--- a/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@@ -10,10 -10,8 +10,9 @@@ obj-vdso := $(addprefix $(obj)/, $(obj-
  ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector
  ccflags-y += -DDISABLE_BRANCH_PROFILING
  
 -ldflags-y = -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
 -	    -z max-page-size=4096 -nostdlib -shared \
 +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