summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-15 12:40:52 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-15 12:40:52 -0400
commit8a61bb1b9355fa5995d8b1a3589fe9ffe61e3341 (patch)
tree86e62869c3e5d0a4e43f1b66a42c808526bd0bb9
parent2c8e155be733191b9990c2911e7abc25f7e639a4 (diff)
downloadlongterm-queue-4.18-8a61bb1b9355fa5995d8b1a3589fe9ffe61e3341.tar.gz
s390: drop patch n/a for 4.18.x codebase
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/s390-mm-silence-compiler-warning-when-compiling-with.patch49
-rw-r--r--queue/series1
2 files changed, 0 insertions, 50 deletions
diff --git a/queue/s390-mm-silence-compiler-warning-when-compiling-with.patch b/queue/s390-mm-silence-compiler-warning-when-compiling-with.patch
deleted file mode 100644
index b638bec..0000000
--- a/queue/s390-mm-silence-compiler-warning-when-compiling-with.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 81a8f2beb32a5951ecf04385301f50879abc092b Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Sun, 7 Apr 2019 14:55:09 +0200
-Subject: [PATCH] s390/mm: silence compiler warning when compiling without
- CONFIG_PGSTE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 81a8f2beb32a5951ecf04385301f50879abc092b upstream.
-
-If CONFIG_PGSTE is not set (e.g. when compiling without KVM), GCC complains:
-
- CC arch/s390/mm/pgtable.o
-arch/s390/mm/pgtable.c:413:15: warning: ‘pmd_alloc_map’ defined but not
- used [-Wunused-function]
- static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)
- ^~~~~~~~~~~~~
-
-Wrap the function with "#ifdef CONFIG_PGSTE" to silence the warning.
-
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
-Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-
-diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
-index 8485d6dc2754..9ebd01219812 100644
---- a/arch/s390/mm/pgtable.c
-+++ b/arch/s390/mm/pgtable.c
-@@ -410,6 +410,7 @@ static inline pmd_t pmdp_flush_lazy(struct mm_struct *mm,
- return old;
- }
-
-+#ifdef CONFIG_PGSTE
- static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)
- {
- pgd_t *pgd;
-@@ -427,6 +428,7 @@ static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr)
- pmd = pmd_alloc(mm, pud, addr);
- return pmd;
- }
-+#endif
-
- pmd_t pmdp_xchg_direct(struct mm_struct *mm, unsigned long addr,
- pmd_t *pmdp, pmd_t new)
---
-2.7.4
-
diff --git a/queue/series b/queue/series
index fc997a1..9606403 100644
--- a/queue/series
+++ b/queue/series
@@ -57,7 +57,6 @@ extcon-arizona-Disable-mic-detect-if-running-when-dr.patch
clk-rockchip-Make-rkpwm-a-critical-clock-on-rk3288.patch
s390-zcrypt-initialize-variables-before_use.patch
x86-microcode-Fix-the-ancient-deprecated-microcode-l.patch
-s390-mm-silence-compiler-warning-when-compiling-with.patch
s390-cio-fix-cio_irb-declaration.patch
selftests-cgroup-fix-cleanup-path-in-test_memcg_subt.patch
qmi_wwan-Add-quirk-for-Quectel-dynamic-config.patch