* [PATCH 1/2] kallsyms: restructure print_fn_descriptor_symbol
@ 2008-04-18 7:48 Kyle McMartin
2008-04-18 7:48 ` Kyle McMartin
0 siblings, 1 reply; 2+ messages in thread
From: Kyle McMartin @ 2008-04-18 7:48 UTC (permalink / raw)
To: linux-arch-u79uwXL29TY76Z2rM5mHXA
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, rusty-8n+1lVoiYb80n/F98K4Iww,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b
Factor out the function descriptor access from the print_symbol
call.
Signed-off-by: Kyle McMartin <kyle-pfcGkIkfWfAsA/PxXw9srA@public.gmane.org>
---
include/linux/kallsyms.h | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 82de2fb..6734a3f 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -83,17 +83,21 @@ __attribute__((format(printf,1,2)));
static inline void __check_printsym_format(const char *fmt, ...)
{
}
+
/* ia64 and ppc64 use function descriptors, which contain the real address */
#if defined(CONFIG_IA64) || defined(CONFIG_PPC64)
-#define print_fn_descriptor_symbol(fmt, addr) \
-do { \
- unsigned long *__faddr = (unsigned long*) addr; \
- print_symbol(fmt, __faddr[0]); \
-} while (0)
+#define get_func_addr(x) ({ \
+ unsigned long *addr = \
+ (unsigned long *)x; \
+ addr[0]; \
+ })
#else
-#define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
+#define get_func_addr(x) x
#endif
+#define print_fn_descriptor_symbol(fmt, addr) \
+ print_symbol(fmt, get_func_addr(addr))
+
static inline void print_symbol(const char *fmt, unsigned long addr)
{
__check_printsym_format(fmt, "");
--
1.5.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 1/2] kallsyms: restructure print_fn_descriptor_symbol
2008-04-18 7:48 [PATCH 1/2] kallsyms: restructure print_fn_descriptor_symbol Kyle McMartin
@ 2008-04-18 7:48 ` Kyle McMartin
0 siblings, 0 replies; 2+ messages in thread
From: Kyle McMartin @ 2008-04-18 7:48 UTC (permalink / raw)
To: linux-arch; +Cc: linux-kernel, rusty, akpm
Factor out the function descriptor access from the print_symbol
call.
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
---
include/linux/kallsyms.h | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 82de2fb..6734a3f 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -83,17 +83,21 @@ __attribute__((format(printf,1,2)));
static inline void __check_printsym_format(const char *fmt, ...)
{
}
+
/* ia64 and ppc64 use function descriptors, which contain the real address */
#if defined(CONFIG_IA64) || defined(CONFIG_PPC64)
-#define print_fn_descriptor_symbol(fmt, addr) \
-do { \
- unsigned long *__faddr = (unsigned long*) addr; \
- print_symbol(fmt, __faddr[0]); \
-} while (0)
+#define get_func_addr(x) ({ \
+ unsigned long *addr = \
+ (unsigned long *)x; \
+ addr[0]; \
+ })
#else
-#define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr)
+#define get_func_addr(x) x
#endif
+#define print_fn_descriptor_symbol(fmt, addr) \
+ print_symbol(fmt, get_func_addr(addr))
+
static inline void print_symbol(const char *fmt, unsigned long addr)
{
__check_printsym_format(fmt, "");
--
1.5.4.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-18 7:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-18 7:48 [PATCH 1/2] kallsyms: restructure print_fn_descriptor_symbol Kyle McMartin
2008-04-18 7:48 ` Kyle McMartin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox