mptcp: Use CONFIG_JUMP_LABEL

HAVE_JUMP_LABEL does not exist anymore since commit e9666d1 ("jump_label: move 'asm goto' support test to Kconfig"). We have to now use CONFIG_JUMP_LABEL instead. e9666d1 has been backported to v4.19, thus this patch needs to go to the v0.95-branch as well. Fixes: 5539ab6 ("Merge tag 'v5.0' into mptcp_trunk") Fixes: 0276ebf (jump_label: move 'asm goto' support test to Kconfig) Signed-off-by: Christoph Paasch <[email protected]> Signed-off-by: Matthieu Baerts <[email protected]> (cherry picked from commit 69397de) Signed-off-by: Matthieu Baerts <[email protected]>
multipath-tcp · Jun 22, 2019 · 57f459e · 57f459e
1 parent 91535d7
commit 57f459e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/net/mptcp/mptcp_ctrl.c b/net/mptcp/mptcp_ctrl.c
@@ -384,7 +384,7 @@ static void mptcp_set_key_sk(const struct sock *sk)
 		       &tp->mptcp_loc_token, NULL);
 }
 
-#ifdef HAVE_JUMP_LABEL
+#ifdef CONFIG_JUMP_LABEL
 static atomic_t mptcp_needed_deferred;
 static atomic_t mptcp_wanted;
 
@@ -405,7 +405,7 @@ static DECLARE_WORK(mptcp_work, mptcp_clear);
 
 static void mptcp_enable_static_key_bh(void)
 {
-#ifdef HAVE_JUMP_LABEL
+#ifdef CONFIG_JUMP_LABEL
 	int wanted;
 
 	while (1) {
@@ -424,7 +424,7 @@ static void mptcp_enable_static_key_bh(void)
 
 static void mptcp_enable_static_key(void)
 {
-#ifdef HAVE_JUMP_LABEL
+#ifdef CONFIG_JUMP_LABEL
 	atomic_inc(&mptcp_wanted);
 	static_key_enable(&mptcp_static_key);
 #else
@@ -434,7 +434,7 @@ static void mptcp_enable_static_key(void)
 
 void mptcp_disable_static_key(void)
 {
-#ifdef HAVE_JUMP_LABEL
+#ifdef CONFIG_JUMP_LABEL
 	int wanted;
 
 	while (1) {