projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
sysdev
/
6xx-suspend.S
diff --git
a/arch/powerpc/sysdev/6xx-suspend.S
b/arch/powerpc/sysdev/6xx-suspend.S
index 21cda085d926417eed53992f711c9d843c99a7a2..cf48e9cb257596698a65f88877e85a3bb33c1f8c 100644
(file)
--- a/
arch/powerpc/sysdev/6xx-suspend.S
+++ b/
arch/powerpc/sysdev/6xx-suspend.S
@@
-29,7
+29,7
@@
_GLOBAL(mpc6xx_enter_standby)
ori r5, r5, ret_from_standby@l
mtlr r5
- rlwinm r5, r1, 0, 0, 31-THREAD_SHIFT
+ CURRENT_THREAD_INFO(r5, r1)
lwz r6, TI_LOCAL_FLAGS(r5)
ori r6, r6, _TLF_SLEEPING
stw r6, TI_LOCAL_FLAGS(r5)