[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140702070022.14689.7254.stgit@kbuild-fedora.novalocal>
Date: Wed, 02 Jul 2014 07:00:22 +0000
From: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
To: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Tony Luck <tony.luck@...il.com>
Cc: Jeremy Fitzhardinge <jeremy@...p.org>, rdunlap@...radead.org,
Anoop Thomas Mathew <atm@...foundis.com>,
Arnd Bergmann <arnd@...db.de>, akataria@...are.com,
yrl.pp-manager.tt@...achi.com,
Linus Torvalds <torvalds@...ux-foundation.org>,
sparse@...isli.org, Rusty Russell <rusty@...tcorp.com.au>,
"H. Peter Anvin" <hpa@...or.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
anil.s.keshavamurthy@...el.com,
"David S. Miller" <davem@...emloft.net>,
Chris Wright <chrisw@...s-sol.org>,
linux-tip-commits@...r.kernel.org,
Thomas Gleixner <tglx@...utronix.de>, dl9pf@....de,
Jiri Kosina <jkosina@...e.cz>,
Andrew Morton <akpm@...ux-foundation.org>,
linuxppc-dev@...ts.ozlabs.org, Ingo Molnar <mingo@...nel.org>
Subject: [PATCH v5 1/2] kprobes/powerpc: Fix arch_deref_entry_point to
support ABIv2
Since PowerPC64 ABIv2 doesn't have function descriptor
any more, arch_deref_entry_point(), which returns function
entry point from function descriptor, should be updated.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Anoop Thomas Mathew <atm@...foundis.com>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: linuxppc-dev@...ts.ozlabs.org
---
arch/powerpc/kernel/kprobes.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index 90fab64..72a1034 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -491,7 +491,12 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
return ret;
}
-#ifdef CONFIG_PPC64
+#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF == 1)
+/*
+ * On PPC64 ABIv1 the function pointer actually points to the
+ * function's descriptor. The first entry in the descriptor is the
+ * address of the function text.
+ */
unsigned long arch_deref_entry_point(void *entry)
{
return ((func_descr_t *)entry)->entry;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists