The patch is made smaller to apply even after changing surrounding
lines. This allows the patch to be applied to all commits before
introducing the big and applying the fix (in mainline).
Unfortunately, another bug seems to be present there, which cases
MPC5200 not to boot.
git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
-if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..a28e46f109c9637b2539b9995078d5df4f7f6c09^|grep -q $(git rev-parse HEAD); then
+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
# 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)
+@@ -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));
{
- 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