PPC32: Define CLONE_UNTRACED for assembler code, fix a too-long branch

diff --git a/arch/ppc/kernel/asm-offsets.c b/arch/ppc/kernel/asm-offsets.c
index 8508fda9ba9a8cff49da4c515c9f971b7a131994..bd8345939198ad6efdbf11493df0230e57b9284f 100644 (file)
--- a/arch/ppc/kernel/asm-offsets.c
+++ b/arch/ppc/kernel/asm-offsets.c
@@ -114,6 +114,7 @@ main(void)
        DEFINE(RESULT, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, result));
        DEFINE(TRAP, STACK_FRAME_OVERHEAD+offsetof(struct pt_regs, trap));
        DEFINE(CLONE_VM, CLONE_VM);
+       DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
        DEFINE(MM_PGD, offsetof(struct mm_struct, pgd));
 
        /* About the CPU features table */

diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index eaee36cbb977d8b52bcecae01e26153afdb64eb9..747d707bd46d74690ec390c761a350b2f54e8fe6 100644 (file)
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -358,9 +358,12 @@ MachineCheck:
 #ifdef CONFIG_ALL_PPC
        mfspr   r4,SPRG2
        cmpwi   cr1,r4,0
-       bne     cr1,machine_check_in_rtas
+       bne     cr1,1f
 #endif
        EXC_XFER_STD(0x200, MachineCheckException)
+#ifdef CONFIG_ALL_PPC
+1:     b       machine_check_in_rtas
+#endif
 
 /* Data access exception. */
        . = 0x300