drop broken acpi patch

diff --git a/queue-3.18/acpi-apei-remove-arch_apei_flush_tlb_one.patch b/queue-3.18/acpi-apei-remove-arch_apei_flush_tlb_one.patch
deleted file mode 100644 (file)
index 9818070..0000000
--- a/queue-3.18/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 <james.morse@arm.com>
-Date: Mon, 6 Nov 2017 18:44:27 +0000
-Subject: ACPI / APEI: Remove arch_apei_flush_tlb_one()
-
-From: James Morse <james.morse@arm.com>
-
-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 <james.morse@arm.com>
-Reviewed-by: Borislav Petkov <bp@suse.de>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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-3.18/series b/queue-3.18/series
index 00697f57a5055950b54faaf07ecfd46768be41bd..baf52f0f5a5ee3c9de9dda048cb1880470d7cebb 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,2 +1 @@
 s390-disassembler-increase-show_code-buffer-size.patch
-acpi-apei-remove-arch_apei_flush_tlb_one.patch