ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

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

Browse Source 
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:
Josh Boyer 2015-03-03 09:54:59 -05:00
parent ca647e7aa5
commit 8ea4731c38
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel-arm64-fix-psci-when-pg.patch
View File

@ -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(

2
kernel.spec
View File

@ -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
Patch30000: kernel-arm64.patch
Patch30001: kernel-arm64-fix-psci-when-pg.patch
# END OF PATCH DEFINITIONS
@ -1366,7 +1365,6 @@ ApplyPatch kernel-arm64.patch
ApplyPatch kernel-arm64.patch -R
%endif
%endif
# pplyPatch kernel-arm64-fix-psci-when-pg.patch
# END OF PATCH APPLICATIONS