From 720684c45dc9a1228c14bdf2b6100bf580736e7a Mon Sep 17 00:00:00 2001
From: Kernel Build Daemon <kbuild@suse.de>
Date: Dec 20 2019 06:26:53 +0000
Subject: Merge branch 'SLE12-SP5' into SLE12-SP5-AZURE


---

diff --git a/patches.suse/temp-disable-debug-pagealloc.patch b/patches.suse/temp-disable-debug-pagealloc.patch
new file mode 100644
index 0000000..bcfd80d
--- /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 66405c0..0cc834c 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
 	########################################################