2012/5/3 Neil Zhang <zhangwm@xxxxxxxxxxx>:
> From: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
>
> Signed-off-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
> Reviewed-by: Dave Martin <dave.martin@xxxxxxxxxx>
> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
> ---
> arch/arm/kernel/sleep.S | 14 +++++++++++---
> 1 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
> index bfad698..6398ead 100644
> --- a/arch/arm/kernel/sleep.S
> +++ b/arch/arm/kernel/sleep.S
> @@ -119,11 +119,19 @@ ENTRY(cpu_resume)
> #else
> ldr r0, sleep_save_sp @ stack phys addr
> #endif
> - msr cpsr_c, #PSR_I_BIT | PSR_F_BIT | SVC_MODE @ set SVC, irqs off
> + setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1 @ set SVC, irqs off
> #ifdef MULTI_CPU
> - ldmia r0!, {r1, sp, lr, pc} @ load v:p, stack, return fn, resume fn
> + @ load v:p, stack, return fn, resume fn
> + ARM( ldmia r0!, {r1, sp, lr, pc} )
> +THUMB( ldmia r0!, {r1, r2, r3, r4} )
> +THUMB( mov sp, r2 )
> +THUMB( mov lr, r3 )
> +THUMB( bx r4 )
> #else
> - ldmia r0!, {r1, sp, lr} @ load v:p, stack, return fn
> + @ load v:p, stack, return fn
> + ARM( ldmia r0!, {r1, sp, lr} )
> +THUMB( ldmia r0!, {r1, r2, lr} )
> +THUMB( mov sp, r2 )
> b cpu_do_resume
> #endif
> ENDPROC(cpu_resume)
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Sorry to sent a wrong set of patches.
Please ignore this patch.
Best Regards,
Neil Zhang
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
