Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
mach-ux500
/
pm.c
diff --git
a/kernel/arch/arm/mach-ux500/pm.c
b/kernel/arch/arm/mach-ux500/pm.c
index
8538910
..
a970e7f
100644
(file)
--- a/
kernel/arch/arm/mach-ux500/pm.c
+++ b/
kernel/arch/arm/mach-ux500/pm.c
@@
-134,8
+134,8
@@
bool prcmu_pending_irq(void)
*/
bool prcmu_is_cpu_in_wfi(int cpu)
{
- return readl(PRCM_ARM_WFI_STANDBY) &
cpu ? PRCM_ARM_WFI_STANDBY_WFI1 :
-
PRCM_ARM_WFI_STANDBY_WFI0
;
+ return readl(PRCM_ARM_WFI_STANDBY) &
+
(cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0)
;
}
/*