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 4.2-rc1 into MTD -next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
common
/
mcpm_entry.c
diff --git
a/arch/arm/common/mcpm_entry.c
b/arch/arm/common/mcpm_entry.c
index 492467587c58ed7222b4fbd7e51dbe1754a8565a..a923524d1040734d1f5b94b4a6e2f5d59cab99d1 100644
(file)
--- a/
arch/arm/common/mcpm_entry.c
+++ b/
arch/arm/common/mcpm_entry.c
@@
-321,7
+321,7
@@
int mcpm_wait_for_cpu_powerdown(unsigned int cpu, unsigned int cluster)
return ret;
}
-void mcpm_cpu_suspend(
u64 expected_residency
)
+void mcpm_cpu_suspend(
void
)
{
if (WARN_ON_ONCE(!platform_ops))
return;