diff --git a/kernel.spec b/kernel.spec index d3cf47e..cf85643 100644 --- a/kernel.spec +++ b/kernel.spec @@ -761,6 +761,9 @@ Patch25034: b43-stop-format-string-leaking-into-error-msgs.patch #CVE-2013-2851 rhbz 969515 971662 Patch25035: block-do-not-pass-disk-names-as-format-strings.patch +# Fix for build failure on powerpc in 3.9.5 +Patch25037: powerpc-3.9.5-fix.patch + # END OF PATCH DEFINITIONS %endif @@ -1476,6 +1479,9 @@ ApplyPatch b43-stop-format-string-leaking-into-error-msgs.patch #CVE-2013-2851 rhbz 969515 971662 ApplyPatch block-do-not-pass-disk-names-as-format-strings.patch +# Fix for build failure on powerpc in 3.9.5 +ApplyPatch powerpc-3.9.5-fix.patch + # END OF PATCH APPLICATIONS %endif diff --git a/powerpc-3.9.5-fix.patch b/powerpc-3.9.5-fix.patch new file mode 100644 index 0000000..5cc7e4f --- /dev/null +++ b/powerpc-3.9.5-fix.patch @@ -0,0 +1,13 @@ +diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c +index 1c22b2d..29857c6 100644 +--- a/arch/powerpc/kernel/traps.c ++++ b/arch/powerpc/kernel/traps.c +@@ -1151,7 +1151,7 @@ void alignment_exception(struct pt_regs *regs) + local_irq_enable(); + + if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT)) +- goto bail; ++ return; + + /* we don't implement logging of alignment exceptions */ + if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))