kernel/kernel-arm64-fix-psci-when-pg.patch

23 lines
907 B
Diff
Raw Normal View History

2015-02-17 18:36:20 +00:00
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
2015-02-18 20:38:08 +00:00
index 3425f31..381c533 100644
2015-02-17 18:36:20 +00:00
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
2015-02-18 20:38:08 +00:00
@@ -113,7 +113,7 @@ static void psci_power_state_unpack(u32 power_state,
2015-02-17 18:36:20 +00:00
* The following two functions are invoked via the invoke_psci_fn pointer
* and will not be inlined, allowing us to piggyback on the AAPCS.
*/
-static noinline int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1,
2015-02-18 20:38:08 +00:00
+static noinline notrace int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1,
u64 arg2)
2015-02-17 18:36:20 +00:00
{
asm volatile(
2015-02-18 20:38:08 +00:00
@@ -128,7 +128,7 @@ static noinline int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1,
2015-02-17 18:36:20 +00:00
return function_id;
}
-static noinline int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1,
2015-02-18 20:38:08 +00:00
+static noinline notrace int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1,
u64 arg2)
2015-02-17 18:36:20 +00:00
{
asm volatile(