From: Greg Kroah-Hartman Date: Sat, 25 Nov 2017 18:05:44 +0000 (+0100) Subject: delete broken acpi patch X-Git-Tag: v3.18.85~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=244319ea19b8da85e3490b7e3405ccf41394db26;p=thirdparty%2Fkernel%2Fstable-queue.git delete broken acpi patch --- diff --git a/queue-4.14/acpi-apei-remove-arch_apei_flush_tlb_one.patch b/queue-4.14/acpi-apei-remove-arch_apei_flush_tlb_one.patch deleted file mode 100644 index 288cadcaa2f..00000000000 --- a/queue-4.14/acpi-apei-remove-arch_apei_flush_tlb_one.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4a75aeacda3c2455954596593d89187df5420d0a Mon Sep 17 00:00:00 2001 -From: James Morse -Date: Mon, 6 Nov 2017 18:44:27 +0000 -Subject: ACPI / APEI: Remove arch_apei_flush_tlb_one() - -From: James Morse - -commit 4a75aeacda3c2455954596593d89187df5420d0a upstream. - -Nothing calls arch_apei_flush_tlb_one() anymore, instead relying on -__set_pte_vaddr() to do the invalidation when called from clear_fixmap() -Remove arch_apei_flush_tlb_one(). - -Signed-off-by: James Morse -Reviewed-by: Borislav Petkov -Signed-off-by: Rafael J. Wysocki -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kernel/acpi/apei.c | 5 ----- - include/acpi/apei.h | 1 - - 2 files changed, 6 deletions(-) - ---- a/arch/x86/kernel/acpi/apei.c -+++ b/arch/x86/kernel/acpi/apei.c -@@ -52,8 +52,3 @@ void arch_apei_report_mem_error(int sev, - apei_mce_report_mem_error(sev, mem_err); - #endif - } -- --void arch_apei_flush_tlb_one(unsigned long addr) --{ -- __flush_tlb_one(addr); --} ---- a/include/acpi/apei.h -+++ b/include/acpi/apei.h -@@ -51,7 +51,6 @@ int erst_clear(u64 record_id); - - int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data); - void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err); --void arch_apei_flush_tlb_one(unsigned long addr); - - #endif - #endif diff --git a/queue-4.14/series b/queue-4.14/series index 1e0dab938cc..9a3b10c5bb1 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -5,5 +5,4 @@ s390-guarded-storage-fix-possible-memory-corruption.patch s390-disassembler-add-missing-end-marker-for-e7-table.patch s390-disassembler-increase-show_code-buffer-size.patch acpi-pm-fix-acpi_pm_notifier_lock-vs-flush_workqueue-deadlock.patch -acpi-apei-remove-arch_apei_flush_tlb_one.patch acpi-ec-fix-regression-related-to-triggering-source-of-ec-event-handling.patch diff --git a/queue-4.4/acpi-apei-remove-arch_apei_flush_tlb_one.patch b/queue-4.4/acpi-apei-remove-arch_apei_flush_tlb_one.patch deleted file mode 100644 index 98180701aec..00000000000 --- a/queue-4.4/acpi-apei-remove-arch_apei_flush_tlb_one.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4a75aeacda3c2455954596593d89187df5420d0a Mon Sep 17 00:00:00 2001 -From: James Morse -Date: Mon, 6 Nov 2017 18:44:27 +0000 -Subject: ACPI / APEI: Remove arch_apei_flush_tlb_one() - -From: James Morse - -commit 4a75aeacda3c2455954596593d89187df5420d0a upstream. - -Nothing calls arch_apei_flush_tlb_one() anymore, instead relying on -__set_pte_vaddr() to do the invalidation when called from clear_fixmap() -Remove arch_apei_flush_tlb_one(). - -Signed-off-by: James Morse -Reviewed-by: Borislav Petkov -Signed-off-by: Rafael J. Wysocki -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kernel/acpi/apei.c | 5 ----- - include/acpi/apei.h | 1 - - 2 files changed, 6 deletions(-) - ---- a/arch/x86/kernel/acpi/apei.c -+++ b/arch/x86/kernel/acpi/apei.c -@@ -55,8 +55,3 @@ void arch_apei_report_mem_error(int sev, - apei_mce_report_mem_error(sev, mem_err); - #endif - } -- --void arch_apei_flush_tlb_one(unsigned long addr) --{ -- __flush_tlb_one(addr); --} ---- a/include/acpi/apei.h -+++ b/include/acpi/apei.h -@@ -44,7 +44,6 @@ int erst_clear(u64 record_id); - - int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data); - void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err); --void arch_apei_flush_tlb_one(unsigned long addr); - - #endif - #endif diff --git a/queue-4.4/series b/queue-4.4/series index d16d3f9af77..882466d2cc8 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -2,4 +2,3 @@ s390-fix-transactional-execution-control-register-handling.patch s390-runtime-instrumention-fix-possible-memory-corruption.patch s390-disassembler-add-missing-end-marker-for-e7-table.patch s390-disassembler-increase-show_code-buffer-size.patch -acpi-apei-remove-arch_apei_flush_tlb_one.patch diff --git a/queue-4.9/acpi-apei-remove-arch_apei_flush_tlb_one.patch b/queue-4.9/acpi-apei-remove-arch_apei_flush_tlb_one.patch deleted file mode 100644 index 98180701aec..00000000000 --- a/queue-4.9/acpi-apei-remove-arch_apei_flush_tlb_one.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4a75aeacda3c2455954596593d89187df5420d0a Mon Sep 17 00:00:00 2001 -From: James Morse -Date: Mon, 6 Nov 2017 18:44:27 +0000 -Subject: ACPI / APEI: Remove arch_apei_flush_tlb_one() - -From: James Morse - -commit 4a75aeacda3c2455954596593d89187df5420d0a upstream. - -Nothing calls arch_apei_flush_tlb_one() anymore, instead relying on -__set_pte_vaddr() to do the invalidation when called from clear_fixmap() -Remove arch_apei_flush_tlb_one(). - -Signed-off-by: James Morse -Reviewed-by: Borislav Petkov -Signed-off-by: Rafael J. Wysocki -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/kernel/acpi/apei.c | 5 ----- - include/acpi/apei.h | 1 - - 2 files changed, 6 deletions(-) - ---- a/arch/x86/kernel/acpi/apei.c -+++ b/arch/x86/kernel/acpi/apei.c -@@ -55,8 +55,3 @@ void arch_apei_report_mem_error(int sev, - apei_mce_report_mem_error(sev, mem_err); - #endif - } -- --void arch_apei_flush_tlb_one(unsigned long addr) --{ -- __flush_tlb_one(addr); --} ---- a/include/acpi/apei.h -+++ b/include/acpi/apei.h -@@ -44,7 +44,6 @@ int erst_clear(u64 record_id); - - int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data); - void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err); --void arch_apei_flush_tlb_one(unsigned long addr); - - #endif - #endif diff --git a/queue-4.9/series b/queue-4.9/series index 245b445d8cd..aa891834fe8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -2,5 +2,4 @@ s390-fix-transactional-execution-control-register-handling.patch s390-runtime-instrumention-fix-possible-memory-corruption.patch s390-disassembler-add-missing-end-marker-for-e7-table.patch s390-disassembler-increase-show_code-buffer-size.patch -acpi-apei-remove-arch_apei_flush_tlb_one.patch acpi-ec-fix-regression-related-to-triggering-source-of-ec-event-handling.patch