Permalink
Browse files

ci: Update kernel build

Switch to 4.13 as base, update the kernel configs, and also refresh the
kernel patch to include all meanwhile required symbol exports.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
  • Loading branch information...
jan-kiszka committed Sep 16, 2017
1 parent 56ef2d2 commit 8894c93f6ac815c4d22e5e849f21edf33973c58d
Showing with 1,984 additions and 654 deletions.
  1. +1 −1 .travis.yml
  2. +53 −6 ci/gen-kernel-build.sh
  3. +513 −147 ci/kernel-config-amd-seattle
  4. +444 −183 ci/kernel-config-banana-pi
  5. +389 −152 ci/kernel-config-vexpress
  6. +584 −165 ci/kernel-config-x86
@@ -41,7 +41,7 @@ install:
cache:
directories:
- ci/linux
- ci/linux-4.4
- ci/linux-4.13
script:
- if [ ${COVERITY_SCAN_BRANCH} != 1 ];
@@ -14,7 +14,7 @@
BASEDIR=`cd \`dirname $0\`; pwd`
if test -z $KERNEL; then
KERNEL=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
KERNEL=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
fi
if test -z $PARALLEL_BUILD; then
PARALLEL_BUILD=-j16
@@ -41,25 +41,72 @@ prepare_kernel()
cd linux
patch -p1 << EOF
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index f89811f..44458c8 100644
index 8e8d20cdbce7..a13adac97508 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -19,6 +19,7 @@
@@ -20,6 +20,7 @@
#include <asm/checksum.h>
#include <asm/ftrace.h>
+#include <asm/virt.h>
/*
* libgcc functions - functions that are used internally by the
@@ -175,3 +176,7 @@ EXPORT_SYMBOL(__gnu_mcount_nc);
EXPORT_SYMBOL(__pv_phys_pfn_offset);
EXPORT_SYMBOL(__pv_offset);
@@ -181,3 +182,7 @@ EXPORT_SYMBOL(__pv_offset);
EXPORT_SYMBOL(__arm_smccc_smc);
EXPORT_SYMBOL(__arm_smccc_hvc);
#endif
+
+#ifdef CONFIG_ARM_VIRT_EXT
+EXPORT_SYMBOL_GPL(__boot_cpu_mode);
+#endif
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index ec7e7377d423..83e65f01ca7f 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -19,6 +19,7 @@
#include <linux/init.h>
#include <linux/irqchip/arm-gic-v3.h>
#include <linux/linkage.h>
+#include <asm-generic/export.h>
#include <asm/assembler.h>
#include <asm/virt.h>
@@ -281,4 +282,5 @@ __hyp_stub_trap: W(b) __hyp_stub_do_trap
__hyp_stub_irq: W(b) .
__hyp_stub_fiq: W(b) .
ENDPROC(__hyp_stub_vectors)
+EXPORT_SYMBOL_GPL(__hyp_stub_vectors)
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S
index e1261fbaa374..061b32ef7c74 100644
--- a/arch/arm64/kernel/hyp-stub.S
+++ b/arch/arm64/kernel/hyp-stub.S
@@ -21,6 +21,7 @@
#include <linux/linkage.h>
#include <linux/irqchip/arm-gic-v3.h>
+#include <asm-generic/export.h>
#include <asm/assembler.h>
#include <asm/kvm_arm.h>
#include <asm/kvm_asm.h>
@@ -51,6 +52,7 @@ ENTRY(__hyp_stub_vectors)
ventry el1_fiq_invalid // FIQ 32-bit EL1
ventry el1_error_invalid // Error 32-bit EL1
ENDPROC(__hyp_stub_vectors)
+EXPORT_SYMBOL_GPL(__hyp_stub_vectors)
.align 11
diff --git a/lib/ioremap.c b/lib/ioremap.c
index 4bb30206b942..5629eeaba5ae 100644
--- a/lib/ioremap.c
+++ b/lib/ioremap.c
@@ -177,3 +177,4 @@ int ioremap_page_range(unsigned long addr,
return err;
}
+EXPORT_SYMBOL_GPL(ioremap_page_range);
EOF
}
Oops, something went wrong.

0 comments on commit 8894c93

Please sign in to comment.