X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fkallsyms.h;h=e60fe363818243d78885aa15961256d66f3ec4ec;hb=edfdcb685c3f56dde803244449f79ad7bed03798;hp=afda9d210f70bcd82b25ed88598ff39f4e3640e8;hpb=f6566a02ebae53d06e70520e553cd36fde313066;p=lttng-modules.git

diff --git a/wrapper/kallsyms.h b/wrapper/kallsyms.h
index afda9d21..e60fe363 100644
--- a/wrapper/kallsyms.h
+++ b/wrapper/kallsyms.h
@@ -1,18 +1,30 @@
-#ifndef _LTT_WRAPPER_KALLSYMS_H
-#define _LTT_WRAPPER_KALLSYMS_H
-
-/*
- * Copyright (C) 2011 Avik Sil (avik.sil@linaro.org)
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
+ * wrapper/kallsyms.h
  *
  * wrapper around kallsyms_lookup_name. Implements arch-dependent code for
  * arches where the address of the start of the function body is different
  * from the pointer which can be used to call the function, e.g. ARM THUMB2.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011 Avik Sil (avik.sil@linaro.org)
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#ifndef _LTTNG_WRAPPER_KALLSYMS_H
+#define _LTTNG_WRAPPER_KALLSYMS_H
+
 #include <linux/kallsyms.h>
 
+/*
+ * PowerPC ABIv1 needs KALLSYMS_ALL to get the function descriptor,
+ * which is needed to perform the function call.
+ */
+#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF < 2)
+# ifndef CONFIG_KALLSYMS_ALL
+#  error "LTTng-modules requires CONFIG_KALLSYMS_ALL on PowerPC ABIv1"
+# endif
+#endif
+
 static inline
 unsigned long kallsyms_lookup_funcptr(const char *name)
 {
@@ -27,4 +39,10 @@ unsigned long kallsyms_lookup_funcptr(const char *name)
 #endif
 	return addr;
 }
-#endif /* _LTT_WRAPPER_KALLSYMS_H */
+
+static inline
+unsigned long kallsyms_lookup_dataptr(const char *name)
+{
+	return kallsyms_lookup_name(name);
+}
+#endif /* _LTTNG_WRAPPER_KALLSYMS_H */