From: tip-bot for Namhyung Kim <namhyung@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de,
namhyung@gmail.com, mingo@elte.hu
Subject: [tip:perf/core] kprobes: Remove __dummy_buf
Date: Wed, 15 Sep 2010 10:05:17 GMT [thread overview]
Message-ID: <tip-6abded71d730322df96c5b7f4ab952ffd5a0080d@git.kernel.org> (raw)
In-Reply-To: <1284512670-2369-5-git-send-email-namhyung@gmail.com>
Commit-ID: 6abded71d730322df96c5b7f4ab952ffd5a0080d
Gitweb: http://git.kernel.org/tip/6abded71d730322df96c5b7f4ab952ffd5a0080d
Author: Namhyung Kim <namhyung@gmail.com>
AuthorDate: Wed, 15 Sep 2010 10:04:29 +0900
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 15 Sep 2010 10:44:02 +0200
kprobes: Remove __dummy_buf
Remove __dummy_buf which is needed for kallsyms_lookup only.
use kallsysm_lookup_size_offset instead.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <1284512670-2369-5-git-send-email-namhyung@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/kprobes.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 05c20a4..e05952a 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -230,9 +230,6 @@ static int recover_probed_instruction(kprobe_opcode_t *buf, unsigned long addr)
return 0;
}
-/* Dummy buffers for kallsyms_lookup */
-static char __dummy_buf[KSYM_NAME_LEN];
-
/* Check if paddr is at an instruction boundary */
static int __kprobes can_probe(unsigned long paddr)
{
@@ -241,7 +238,7 @@ static int __kprobes can_probe(unsigned long paddr)
struct insn insn;
kprobe_opcode_t buf[MAX_INSN_SIZE];
- if (!kallsyms_lookup(paddr, NULL, &offset, NULL, __dummy_buf))
+ if (!kallsyms_lookup_size_offset(paddr, NULL, &offset))
return 0;
/* Decode instructions */
@@ -1269,11 +1266,9 @@ static int __kprobes can_optimize(unsigned long paddr)
unsigned long addr, size = 0, offset = 0;
struct insn insn;
kprobe_opcode_t buf[MAX_INSN_SIZE];
- /* Dummy buffers for lookup_symbol_attrs */
- static char __dummy_buf[KSYM_NAME_LEN];
/* Lookup symbol including addr */
- if (!kallsyms_lookup(paddr, &size, &offset, NULL, __dummy_buf))
+ if (!kallsyms_lookup_size_offset(paddr, &size, &offset))
return 0;
/* Check there is enough space for a relative jump. */
next prev parent reply other threads:[~2010-09-15 10:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-15 1:04 [PATCH RESEND 0/5] kprobes cleanups Namhyung Kim
2010-09-15 1:04 ` [PATCH 1/5] kprobes: remove redundant address check Namhyung Kim
2010-09-15 10:04 ` [tip:perf/core] kprobes: Remove " tip-bot for Namhyung Kim
2010-09-15 1:04 ` [PATCH 2/5] kprobes: verify jprobe entry point Namhyung Kim
2010-09-15 10:04 ` [tip:perf/core] kprobes: Verify " tip-bot for Namhyung Kim
2010-09-15 1:04 ` [PATCH 3/5] kprobes: make functions static Namhyung Kim
2010-09-15 10:04 ` [tip:perf/core] kprobes: Make " tip-bot for Namhyung Kim
2010-09-15 1:04 ` [PATCH 4/5] kprobes: remove __dummy_buf Namhyung Kim
2010-09-15 10:05 ` tip-bot for Namhyung Kim [this message]
2010-09-15 1:04 ` [PATCH 5/5] kprobes: add sparse context annotations Namhyung Kim
2010-09-15 10:05 ` [tip:perf/core] kprobes: Add " tip-bot for Namhyung Kim
2010-09-15 2:42 ` [PATCH RESEND 0/5] kprobes cleanups Masami Hiramatsu
2010-09-15 8:39 ` Ingo Molnar
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=tip-6abded71d730322df96c5b7f4ab952ffd5a0080d@git.kernel.org \
--to=namhyung@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/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