From: Sasha Levin <sasha.levin@oracle.com>
To: Ingo Molnar <mingo@kernel.org>, Jason Baron <jbaron@redhat.com>,
Sasha Levin <sasha.levin@oracle.com>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Avi Kivity <avi@redhat.com>,
linux-kernel@vger.kernel.org
Cc: jamie.iles@oracle.com
Subject: [PATCH] jump_label: constify jump_label_text_reserved and friends
Date: Mon, 7 Jan 2013 08:58:09 -0500 [thread overview]
Message-ID: <1357567093-31136-1-git-send-email-sasha.levin@oracle.com> (raw)
jump_label_text_reserved() doesn't modify the memory it works on, it just
checks whether there are any jump labels there.
Constify the parameters of it to prevent warnings when working with it.
Reviewed-by: Jamie Iles <jamie.iles@oracle.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
include/linux/jump_label.h | 4 ++--
kernel/jump_label.c | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 0976fc4..d917a2a 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -116,7 +116,7 @@ extern void arch_jump_label_transform(struct jump_entry *entry,
enum jump_label_type type);
extern void arch_jump_label_transform_static(struct jump_entry *entry,
enum jump_label_type type);
-extern int jump_label_text_reserved(void *start, void *end);
+extern int jump_label_text_reserved(const void *start, const void *end);
extern void static_key_slow_inc(struct static_key *key);
extern void static_key_slow_dec(struct static_key *key);
extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
@@ -174,7 +174,7 @@ static inline void static_key_slow_dec_deferred(struct static_key_deferred *key)
static_key_slow_dec(&key->key);
}
-static inline int jump_label_text_reserved(void *start, void *end)
+static inline int jump_label_text_reserved(const void *start, const void *end)
{
return 0;
}
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 60f48fa..6dc71c6 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -120,7 +120,8 @@ void jump_label_rate_limit(struct static_key_deferred *key,
}
EXPORT_SYMBOL_GPL(jump_label_rate_limit);
-static int addr_conflict(struct jump_entry *entry, void *start, void *end)
+static int addr_conflict(struct jump_entry *entry,
+ const void *start, const void *end)
{
if (entry->code <= (unsigned long)end &&
entry->code + JUMP_LABEL_NOP_SIZE > (unsigned long)start)
@@ -130,7 +131,8 @@ static int addr_conflict(struct jump_entry *entry, void *start, void *end)
}
static int __jump_label_text_reserved(struct jump_entry *iter_start,
- struct jump_entry *iter_stop, void *start, void *end)
+ struct jump_entry *iter_stop,
+ const void *start, const void *end)
{
struct jump_entry *iter;
@@ -222,7 +224,7 @@ struct static_key_mod {
struct module *mod;
};
-static int __jump_label_mod_text_reserved(void *start, void *end)
+static int __jump_label_mod_text_reserved(const void *start, const void *end)
{
struct module *mod;
@@ -419,7 +421,7 @@ early_initcall(jump_label_init_module);
*
* returns 1 if there is an overlap, 0 otherwise
*/
-int jump_label_text_reserved(void *start, void *end)
+int jump_label_text_reserved(const void *start, const void *end)
{
int ret = __jump_label_text_reserved(__start___jump_table,
__stop___jump_table, start, end);
--
1.8.0.2
next reply other threads:[~2013-01-07 13:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 13:58 Sasha Levin [this message]
2013-01-07 16:40 ` Jason Baron
2013-01-07 20:04 ` Sasha Levin
2013-01-07 22:23 ` Steven Rostedt
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=1357567093-31136-1-git-send-email-sasha.levin@oracle.com \
--to=sasha.levin@oracle.com \
--cc=a.p.zijlstra@chello.nl \
--cc=avi@redhat.com \
--cc=jamie.iles@oracle.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
/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®