diff --git a/device/.shared-patches/linux/place-cpu_setup-in-text.patch b/device/.shared-patches/linux/place-cpu_setup-in-text.patch
new file mode 100644
index 000000000..cb1d0c168
--- /dev/null
+++ b/device/.shared-patches/linux/place-cpu_setup-in-text.patch
@@ -0,0 +1,40 @@
+From f00083cae331e5d3eecade6b4fdc35d0825e73ef Mon Sep 17 00:00:00 2001
+From: Mark Rutland <mark.rutland@arm.com>
+Date: Fri, 11 Dec 2015 11:04:31 +0000
+Subject: [PATCH] arm64: mm: place __cpu_setup in .text
+
+We drop __cpu_setup in .text.init, which ends up being part of .text.
+The .text.init section was a legacy section name which has been unused
+elsewhere for a long time.
+
+The ".text.init" name is misleading if read as a synonym for
+".init.text". Any CPU may execute __cpu_setup before turning the MMU on,
+so it should simply live in .text.
+
+Remove the pointless section assignment. This will leave __cpu_setup in
+the .text section.
+
+Signed-off-by: Mark Rutland <mark.rutland@arm.com>
+Cc: Catalin Marinas <catalin.marinas@arm.com>
+Cc: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+---
+ arch/arm64/mm/proc.S | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
+index cacecc4ad3e5..b6f9053ab184 100644
+--- a/arch/arm64/mm/proc.S
++++ b/arch/arm64/mm/proc.S
+@@ -139,8 +139,6 @@ ENTRY(cpu_do_switch_mm)
+ 	ret
+ ENDPROC(cpu_do_switch_mm)
+ 
+-	.section ".text.init", #alloc, #execinstr
+-
+ /*
+  *	__cpu_setup
+  *
+-- 
+2.39.2
+
diff --git a/device/testing/linux-samsung-xcover3lte/APKBUILD b/device/testing/linux-samsung-xcover3lte/APKBUILD
index 11b154369..f081d5d2c 100644
--- a/device/testing/linux-samsung-xcover3lte/APKBUILD
+++ b/device/testing/linux-samsung-xcover3lte/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linux-samsung-xcover3lte
 pkgver=3.14.27
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy Xcover 3 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -13,13 +13,6 @@ license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
 makedepends="bash bc bison devicepkg-dev flex openssl-dev perl pxa-mkbootimg dtc gcc4"
 
-# Compiler: GCC 4 (doesn't boot when compiled with newer versions)
-if [ "${CC:0:5}" != "gcc4-" ]; then
-	CC="gcc4-$CC"
-	HOSTCC="gcc4-gcc"
-	CROSS_COMPILE="gcc4-$CROSS_COMPILE"
-fi
-
 # Source
 _repository="android_kernel_samsung_xcover3lte"
 _commit="95e23fde08b29e88b8ba48082e51f5834680a179"
@@ -35,12 +28,16 @@ source="
 	uinput-1-breaks.patch
 	uinput-2-ui_get_sysname.patch
 	uinput-3-dev-setup.patch
+	place-cpu_setup-in-text.patch
 "
 
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
 
 prepare() {
+	CC="gcc4-$CC"
+	HOSTCC="gcc4-gcc"
+	CROSS_COMPILE="gcc4-$CROSS_COMPILE"
 	default_prepare
 	. downstreamkernel_prepare
 }
@@ -79,4 +76,5 @@ c45d985ad4ea3c216199ae92eb3d228308abc35e7d06dd9f35abc0bdb13f3dbeab3f882dee4f96b7
 47ec0cb51db35f95c870cd295d022c68cec837e3bb2f1c72f3faa49a9caf62eca9e9f64c67bb5183440d0ffd71ade45fa3daafc39b88665d2bce178c5189e74e  uinput-1-breaks.patch
 97874d0bd27b67187d0dbc54d59b21c2e841d490d9bd16ac0672d86b462747a47cd27e5e66675ff3b1ebe80cc1c955e8a481bf9b28347d0042fdd9422293b860  uinput-2-ui_get_sysname.patch
 3c32141290a8c57abf2bdb7b904503d5cca035e58beed65877d3086afeeae518a392231b8e717ece0980c4f0b60349ac46598789c1eda1826bd6321b547d8137  uinput-3-dev-setup.patch
+ef361f4729efeb6442bdd028798a3ba8f34901cbcbedc318ae0788e23e7c897897587cee82f334d2ec5d7954a73d409bd25f1742d53ba704dd2b672a5de80f26  place-cpu_setup-in-text.patch
 "
diff --git a/device/testing/linux-samsung-xcover3lte/place-cpu_setup-in-text.patch b/device/testing/linux-samsung-xcover3lte/place-cpu_setup-in-text.patch
new file mode 120000
index 000000000..ed5174b5e
--- /dev/null
+++ b/device/testing/linux-samsung-xcover3lte/place-cpu_setup-in-text.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/place-cpu_setup-in-text.patch
\ No newline at end of file