|
@@ -147,6 +147,7 @@ transfer_to_handler:
|
|
|
lwz r12,TI_LOCAL_FLAGS(r9)
|
|
|
mtcrf 0x01,r12
|
|
|
bt- 31-TLF_NAPPING,4f
|
|
|
+ bt- 31-TLF_SLEEPING,7f
|
|
|
#endif /* CONFIG_6xx */
|
|
|
.globl transfer_to_handler_cont
|
|
|
transfer_to_handler_cont:
|
|
@@ -164,6 +165,13 @@ transfer_to_handler_cont:
|
|
|
4: rlwinm r12,r12,0,~_TLF_NAPPING
|
|
|
stw r12,TI_LOCAL_FLAGS(r9)
|
|
|
b power_save_6xx_restore
|
|
|
+
|
|
|
+7: rlwinm r12,r12,0,~_TLF_SLEEPING
|
|
|
+ stw r12,TI_LOCAL_FLAGS(r9)
|
|
|
+ lwz r9,_MSR(r11) /* if sleeping, clear MSR.EE */
|
|
|
+ rlwinm r9,r9,0,~MSR_EE
|
|
|
+ lwz r12,_LINK(r11) /* and return to address in LR */
|
|
|
+ b fast_exception_return
|
|
|
#endif
|
|
|
|
|
|
/*
|