X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/23943811fde7a18edb0fd2b45d41aa62745b8e20..af9262178bbb969da392479ddd8bbfbf2e044a07:/continuous/steps/11-patch

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 1a8ef76..fa78e34 100755
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -43,6 +43,19 @@ 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^..2c0f99516f53911c3f2f81ab3815841e3408f11e^|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,3 +154,3 @@ static void do_final_fixups(void)
+ {
+-	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
++	struct cpu_spec *spec = PTRRELOC(*PTRRELOC(&cur_cpu_spec));
+ 
+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