From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jason Baron <jbaron@redhat.com>,
David Miller <davem@davemloft.net>,
David Daney <ddaney@caviumnetworks.com>
Subject: [PATCH 4/8] jump label: Make arch_jump_label_text_poke_early() optional
Date: Thu, 28 Oct 2010 09:55:52 -0400 [thread overview]
Message-ID: <20101028135647.822609872@goodmis.org> (raw)
In-Reply-To: 20101028135548.055490014@goodmis.org
[-- Attachment #1: 0004-jump-label-Make-arch_jump_label_text_poke_early-opti.patch --]
[-- Type: text/plain, Size: 2318 bytes --]
From: David Daney <ddaney@caviumnetworks.com>
For the forthcoming MIPS jump label support,
arch_jump_label_text_poke_early() is unneeded as the MIPS NOP
instruction is already optimal.
Supply a default implementation that does nothing. Flag x86 and SPARC
as having arch_jump_label_text_poke_early().
Cc: Jason Baron <jbaron@redhat.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
LKML-Reference: <1286218615-24011-2-git-send-email-ddaney@caviumnetworks.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/sparc/include/asm/jump_label.h | 1 +
arch/x86/include/asm/jump_label.h | 1 +
include/linux/jump_label.h | 6 ++++++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h
index 62e66d7..9aa82d7 100644
--- a/arch/sparc/include/asm/jump_label.h
+++ b/arch/sparc/include/asm/jump_label.h
@@ -6,6 +6,7 @@
#include <linux/types.h>
#include <asm/system.h>
+#define HAVE_ARCH_JUMP_LABEL_TEXT_POKE_EARLY
#define JUMP_LABEL_NOP_SIZE 4
#define JUMP_LABEL(key, label) \
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index f52d42e..169cfd8 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -6,6 +6,7 @@
#include <linux/types.h>
#include <asm/nops.h>
+#define HAVE_ARCH_JUMP_LABEL_TEXT_POKE_EARLY
#define JUMP_LABEL_NOP_SIZE 5
# define JUMP_LABEL_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t"
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 1947a12..b3835f6 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -22,7 +22,13 @@ extern void jump_label_lock(void);
extern void jump_label_unlock(void);
extern void arch_jump_label_transform(struct jump_entry *entry,
enum jump_label_type type);
+
+#ifdef HAVE_ARCH_JUMP_LABEL_TEXT_POKE_EARLY
extern void arch_jump_label_text_poke_early(jump_label_t addr);
+#else
+static inline void arch_jump_label_text_poke_early(jump_label_t addr) {}
+#endif
+
extern void jump_label_update(unsigned long key, enum jump_label_type type);
extern void jump_label_apply_nops(struct module *mod);
extern int jump_label_text_reserved(void *start, void *end);
--
1.7.1
next prev parent reply other threads:[~2010-10-28 13:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 13:55 [PATCH 0/8] [GIT PULL] jump label: various fixes and updates Steven Rostedt
2010-10-28 13:55 ` [PATCH 1/8] jump label: Fix module __init section race Steven Rostedt
2010-10-28 13:55 ` [PATCH 2/8] jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex Steven Rostedt
2010-10-28 13:55 ` [PATCH 3/8] jump label: Fix error with preempt disable holding mutex Steven Rostedt
2010-10-29 4:20 ` Masami Hiramatsu
2010-10-28 13:55 ` Steven Rostedt [this message]
2010-10-29 20:37 ` [PATCH 4/8] jump label: Make arch_jump_label_text_poke_early() optional David Miller
2010-10-29 20:48 ` David Daney
2010-10-28 13:55 ` [PATCH 5/8] jump label: Add MIPS support Steven Rostedt
2010-10-28 13:55 ` [PATCH 6/8] jump_label: Fix unaligned traps on sparc Steven Rostedt
2010-10-28 13:55 ` [PATCH 7/8] x86, ftrace: Use safe noops, drop trap test Steven Rostedt
2010-10-28 13:55 ` [PATCH 8/8] jump label: Disable due to compiler bug 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=20101028135647.822609872@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=ddaney@caviumnetworks.com \
--cc=fweisbec@gmail.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.