From 9b093e196377a4edee73db285b8d4036f1526364 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 24 Apr 2008 13:20:16 +1000 Subject: [PATCH] --- yaml --- r: 93455 b: refs/heads/master c: 4ae2dcb633c751cfd27deeea5a8b13db35a84d9a h: refs/heads/master i: 93453: 468ebecb27fd80177cea51f084b3bcd7188af823 93451: 4aa83e992a2ab5aaaa2281afaec4b1f09deb3e7e 93447: 426040ebb080b22af9e7d3d71af03062ec05a9ec 93439: 794c84f44dcfdd5c8f765b842ca2c3f5d2af08c2 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/misc_64.S | 20 ++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index c2e820c2d5b5..961e30426c64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 988479ebccc44e141d06ac55e4438d6b473008b5 +refs/heads/master: 4ae2dcb633c751cfd27deeea5a8b13db35a84d9a diff --git a/trunk/arch/powerpc/kernel/misc_64.S b/trunk/arch/powerpc/kernel/misc_64.S index a3c491e88a72..942951e76586 100644 --- a/trunk/arch/powerpc/kernel/misc_64.S +++ b/trunk/arch/powerpc/kernel/misc_64.S @@ -27,23 +27,11 @@ .text -_GLOBAL(get_msr) - mfmsr r3 - blr - -_GLOBAL(get_srr0) - mfsrr0 r3 - blr - -_GLOBAL(get_srr1) - mfsrr1 r3 - blr - #ifdef CONFIG_IRQSTACKS _GLOBAL(call_do_softirq) mflr r0 std r0,16(r1) - stdu r1,THREAD_SIZE-112(r3) + stdu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r3) mr r1,r3 bl .__do_softirq ld r1,0(r1) @@ -56,7 +44,7 @@ _GLOBAL(call_handle_irq) mflr r0 std r0,16(r1) mtctr r8 - stdu r1,THREAD_SIZE-112(r5) + stdu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r5) mr r1,r5 bctrl ld r1,0(r1) @@ -599,7 +587,7 @@ _GLOBAL(kexec_sequence) std r0,16(r1) /* switch stacks to newstack -- &kexec_stack.stack */ - stdu r1,THREAD_SIZE-112(r3) + stdu r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r3) mr r1,r3 li r0,0 @@ -616,7 +604,7 @@ _GLOBAL(kexec_sequence) std r26,-48(r1) std r25,-56(r1) - stdu r1,-112-64(r1) + stdu r1,-STACK_FRAME_OVERHEAD-64(r1) /* save args into preserved regs */ mr r31,r3 /* newstack (both) */