Skip to content
This repository has been archived by the owner on Apr 18, 2024. It is now read-only.

Commit

Permalink
mptcp: Use CONFIG_JUMP_LABEL
Browse files Browse the repository at this point in the history
HAVE_JUMP_LABLE does not exist anymore since commit e9666d1 ("jump_label:
move 'asm goto' support test to Kconfig").
We have to now use CONFIG_JUMP_LABLE instead.

Fixes: 5539ab6 ("Merge tag 'v5.0' into mptcp_trunk")
Signed-off-by: Christoph Paasch <cpaasch@apple.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
  • Loading branch information
cpaasch authored and matttbe committed Jun 22, 2019
1 parent 6d62f7c commit 69397de
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/mptcp/mptcp_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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) {
Expand All @@ -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
Expand All @@ -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) {
Expand Down

0 comments on commit 69397de

Please sign in to comment.