Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-12-19 15:19:34 +0300
committerDenis Kirjanov <dkirjanov@suse.com>2019-12-19 15:19:34 +0300
commit6c5578e2f7ab8cf918c4322c57729431857d34b4 (patch)
tree3d69b03932da705ba4507ff695a7516c4c721977
parentf4ff13a11f8e675eb29245605d192fe48e318a1e (diff)
parentb85a7e4c9828d83c338f5e71314ba7cfdecd23b6 (diff)
Merge 'users/vbabka/SLE12-SP5/for-next' into HEADrpm-4.12.14-122.12--sle12-sp5-updatesrpm-4.12.14-122.12SLE12-SP5
Pull an mm workaround from Vlastimil Babka
-rw-r--r--patches.suse/temp-disable-debug-pagealloc.patch26
-rw-r--r--series.conf3
2 files changed, 29 insertions, 0 deletions
diff --git a/patches.suse/temp-disable-debug-pagealloc.patch b/patches.suse/temp-disable-debug-pagealloc.patch
new file mode 100644
index 0000000000..bcfd80df04
--- /dev/null
+++ b/patches.suse/temp-disable-debug-pagealloc.patch
@@ -0,0 +1,26 @@
+From: Vlastimil Babka <vbabka@suse.cz>
+Subject: temporarily disable debug_pagealloc
+Patch-Mainline: Never, temporary workaround
+References: bsc#1159096
+
+Enabling debug_pagealloc=on prevents proper booting due to jump label init
+order. Until it's fixed, disable this non-essential debugging feature.
+
+Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
+
+---
+ mm/page_alloc.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -639,6 +639,9 @@ static int __init early_debug_pagealloc(
+ {
+ bool enable = false;
+
++ /* Temporary workaround, bsc#1159096 */
++ return 0;
++
+ if (kstrtobool(buf, &enable))
+ return -EINVAL;
+
diff --git a/series.conf b/series.conf
index 75387473f0..103a17c02f 100644
--- a/series.conf
+++ b/series.conf
@@ -51941,6 +51941,9 @@
# bsc#1140903
patches.suse/x86-mm-fix-fast-gup-paravirt.patch
+ # bsc#1159096
+ patches.suse/temp-disable-debug-pagealloc.patch
+
########################################################
# misc small fixes
########################################################