From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 2 Aug 2016 09:04:09 +0000 (+0200)
Subject: continuous: Apply temporary fix for failed boot
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/0a14ecd742db0f0cc194807802f0f281ea80bdac?ds=sidebyside

continuous: Apply temporary fix for failed boot
---

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 1a8ef76..d609541 100755
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -43,6 +43,23 @@ if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^
     git reset HEAD^ # Do not commit revert - this helps with bisecting
 fi
 
+if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..|grep -q $(git rev-parse HEAD); then
+    # Apply fix for commit that breaks boot
+    git apply --index <<EOF
+--- a/arch/powerpc/lib/feature-fixups.c
++++ b/arch/powerpc/lib/feature-fixups.c
+@@ -154,7 +154,7 @@ static void do_final_fixups(void)
+
+ void apply_feature_fixups(void)
+ {
+-	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
++	struct cpu_spec *spec = PTRRELOC(*PTRRELOC(&cur_cpu_spec));
+ 
+ 	/*
+ 	 * Apply the CPU-specific and firmware specific fixups to kernel text
+EOF
+fi
+
 # It the dts file exists, next command fails
 rm -f arch/powerpc/boot/dts/shark-ryu.dts
 git apply --index < ../shark-ryu-board-patch.patch