summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel-arm64-fix-psci-when-pg.patch22
-rw-r--r--kernel.spec2
2 files changed, 0 insertions, 24 deletions
diff --git a/kernel-arm64-fix-psci-when-pg.patch b/kernel-arm64-fix-psci-when-pg.patch
deleted file mode 100644
index 09878d92a..000000000
--- a/kernel-arm64-fix-psci-when-pg.patch
+++ /dev/null
@@ -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(
diff --git a/kernel.spec b/kernel.spec
index 309034d49..afeada31c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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