diff --git a/kernel.spec b/kernel.spec index 9de973f47..9ec3def06 100644 --- a/kernel.spec +++ b/kernel.spec @@ -790,6 +790,9 @@ Patch25035: block-do-not-pass-disk-names-as-format-strings.patch #rhbz 954252 Patch25036: scsi-ipr-possible-irq-lock-inversion-dependency-detected.patch +# Fix for build failure on powerpc in 3.9.5 +Patch25037: powerpc-3.9.5-fix.patch + # END OF PATCH DEFINITIONS %endif @@ -1526,6 +1529,9 @@ ApplyPatch block-do-not-pass-disk-names-as-format-strings.patch #rhbz 954252 ApplyPatch scsi-ipr-possible-irq-lock-inversion-dependency-detected.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 000000000..5cc7e4fa0 --- /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))