From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: jakub.kicinski@netronome.com, peterz@infradead.org
Cc: netdev@vger.kernel.org, davem@davemloft.net,
linux-kernel@vger.kernel.org,
Willem de Bruijn <willemb@google.com>
Subject: [PATCH] locking/static_key: always define static_branch_deferred_inc
Date: Wed, 12 Jun 2019 15:44:09 -0400 [thread overview]
Message-ID: <20190612194409.197461-1-willemdebruijn.kernel@gmail.com> (raw)
From: Willem de Bruijn <willemb@google.com>
This interface is currently only defined if CONFIG_JUMP_LABEL. Make it
available also when jump labels are disabled.
Fixes: ad282a8117d50 ("locking/static_key: Add support for deferred static branches")
Signed-off-by: Willem de Bruijn <willemb@google.com>
---
The original patch went into 5.2-rc1, but this interface is not yet
used, so this could target either 5.2 or 5.3.
---
include/linux/jump_label_ratelimit.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
index 42710d5949ba..8c3ee291b2d8 100644
--- a/include/linux/jump_label_ratelimit.h
+++ b/include/linux/jump_label_ratelimit.h
@@ -60,8 +60,6 @@ extern void jump_label_update_timeout(struct work_struct *work);
0), \
}
-#define static_branch_deferred_inc(x) static_branch_inc(&(x)->key)
-
#else /* !CONFIG_JUMP_LABEL */
struct static_key_deferred {
struct static_key key;
@@ -95,4 +93,7 @@ jump_label_rate_limit(struct static_key_deferred *key,
STATIC_KEY_CHECK_USE(key);
}
#endif /* CONFIG_JUMP_LABEL */
+
+#define static_branch_deferred_inc(x) static_branch_inc(&(x)->key)
+
#endif /* _LINUX_JUMP_LABEL_RATELIMIT_H */
--
2.22.0.rc2.383.gf4fbbf30c2-goog
next reply other threads:[~2019-06-12 19:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 19:44 Willem de Bruijn [this message]
2019-06-12 19:59 ` Jakub Kicinski
2019-06-12 20:25 ` Willem de Bruijn
2019-06-12 20:56 ` Jakub Kicinski
2019-06-13 9:33 ` Peter Zijlstra
2019-06-13 15:10 ` Willem de Bruijn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190612194409.197461-1-willemdebruijn.kernel@gmail.com \
--to=willemdebruijn.kernel@gmail.com \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®