diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-03 09:54:59 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-03 09:54:59 -0500 |
| commit | 8ea4731c3887934a789f852eb7fde9a5b50f36d5 (patch) | |
| tree | 635b27b0159bc14585fecfc28c47311f4e49d590 | |
| parent | ca647e7aa52555a8c3465bd22b683005ed429fca (diff) | |
| download | kernel-8ea4731c3887934a789f852eb7fde9a5b50f36d5.tar.gz kernel-8ea4731c3887934a789f852eb7fde9a5b50f36d5.tar.xz kernel-8ea4731c3887934a789f852eb7fde9a5b50f36d5.zip | |
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.
| -rw-r--r-- | kernel-arm64-fix-psci-when-pg.patch | 22 | ||||
| -rw-r--r-- | kernel.spec | 2 |
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 |