jump-label: drop previously applied patch

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

2 files changed, 0 insertions, 48 deletions

diff --git a/queue/jump_label-Invoke-jump_label_test-via-early_initcall.patch b/queue/jump_label-Invoke-jump_label_test-via-early_initcall.patch
deleted file mode 100644
index 428b950..0000000
--- a/queue/jump_label-Invoke-jump_label_test-via-early_initcall.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 92ee46efeb505ead3ab06d3c5ce695637ed5f152 Mon Sep 17 00:00:00 2001
-From: Jason Baron <jbaron@akamai.com>
-Date: Mon, 13 Nov 2017 16:48:47 -0500
-Subject: [PATCH] jump_label: Invoke jump_label_test() via early_initcall()
-
-commit 92ee46efeb505ead3ab06d3c5ce695637ed5f152 upstream.
-
-Fengguang Wu reported that running the rcuperf test during boot can cause
-the jump_label_test() to hit a WARN_ON(). The issue is that the core jump
-label code relies on kernel_text_address() to detect when it can no longer
-update branches that may be contained in __init sections. The
-kernel_text_address() in turn assumes that if the system_state variable is
-greter than or equal to SYSTEM_RUNNING then __init sections are no longer
-valid (since the assumption is that they have been freed). However, when
-rcuperf is setup to run in early boot it can call kernel_power_off() which
-sets the system_state to SYSTEM_POWER_OFF.
-
-Since rcuperf initialization is invoked via a module_init(), we can make
-the dependency of jump_label_test() needing to complete before rcuperf
-explicit by calling it via early_initcall().
-
-Reported-by: Fengguang Wu <fengguang.wu@intel.com>
-Signed-off-by: Jason Baron <jbaron@akamai.com>
-Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Steven Rostedt <rostedt@goodmis.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Link: http://lkml.kernel.org/r/1510609727-2238-1-git-send-email-jbaron@akamai.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-
-diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index 8ff4ca4665ff..8594d24e4adc 100644
---- a/kernel/jump_label.c
-+++ b/kernel/jump_label.c
-@@ -769,7 +769,7 @@ static __init int jump_label_test(void)
- 
- 	return 0;
- }
--late_initcall(jump_label_test);
-+early_initcall(jump_label_test);
- #endif /* STATIC_KEYS_SELFTEST */
- 
- #endif /* HAVE_JUMP_LABEL */
--- 
-2.15.0
-
diff --git a/queue/series b/queue/series
index 0802d3a..bfe9ad9 100644
--- a/queue/series
+++ b/queue/series
@@ -90,7 +90,6 @@ clk-hi3660-fix-incorrect-uart3-clock-freqency.patch
 mailbox-mailbox-test-don-t-rely-on-rx_buffer-content.patch
 kbuild-rpm-pkg-fix-jobserver-unavailable-warning.patch
 atm-horizon-Fix-irq-release-error.patch
-jump_label-Invoke-jump_label_test-via-early_initcall.patch
 xfrm-Copy-policy-family-in-clone_policy.patch
 f2fs-fix-to-clear-FI_NO_PREALLOC.patch
 bnxt_re-changing-the-ip-address-shouldn-t-affect-new.patch