Drop kernel-arm64-fix-psci-when-pg.patch
Upstream went with a different solution to the problem by moving the functions to their own .S files. Seems overkill but whatever.
This commit is contained in:
parent
ca647e7aa5
commit
8ea4731c38
@ -1,22 +0,0 @@
|
|||||||
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
|
|
||||||
index 3425f31..381c533 100644
|
|
||||||
--- a/arch/arm64/kernel/psci.c
|
|
||||||
+++ b/arch/arm64/kernel/psci.c
|
|
||||||
@@ -113,7 +113,7 @@ static void psci_power_state_unpack(u32 power_state,
|
|
||||||
* 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,
|
|
||||||
+static noinline notrace int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1,
|
|
||||||
u64 arg2)
|
|
||||||
{
|
|
||||||
asm volatile(
|
|
||||||
@@ -128,7 +128,7 @@ static noinline int __invoke_psci_fn_hvc(u64 function_id, u64 arg0, u64 arg1,
|
|
||||||
return function_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static noinline int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1,
|
|
||||||
+static noinline notrace int __invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1,
|
|
||||||
u64 arg2)
|
|
||||||
{
|
|
||||||
asm volatile(
|
|
@ -629,7 +629,6 @@ Patch26141: NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch
|
|||||||
|
|
||||||
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
|
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
|
||||||
Patch30000: kernel-arm64.patch
|
Patch30000: kernel-arm64.patch
|
||||||
Patch30001: kernel-arm64-fix-psci-when-pg.patch
|
|
||||||
|
|
||||||
# END OF PATCH DEFINITIONS
|
# END OF PATCH DEFINITIONS
|
||||||
|
|
||||||
@ -1366,7 +1365,6 @@ ApplyPatch kernel-arm64.patch
|
|||||||
ApplyPatch kernel-arm64.patch -R
|
ApplyPatch kernel-arm64.patch -R
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
# pplyPatch kernel-arm64-fix-psci-when-pg.patch
|
|
||||||
|
|
||||||
# END OF PATCH APPLICATIONS
|
# END OF PATCH APPLICATIONS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user