X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fkallsyms.h;h=8200018a38e59b5959c51d5952b3052ecaed74f5;hb=refs%2Fheads%2Fstable-2.7;hp=bb45f38a8982f339a47b7372d795d840bfbf292f;hpb=cab3c961c62a7b21cd2968aef37f24b4165bf800;p=lttng-modules.git

diff --git a/wrapper/kallsyms.h b/wrapper/kallsyms.h
index bb45f38a..8200018a 100644
--- a/wrapper/kallsyms.h
+++ b/wrapper/kallsyms.h
@@ -1,15 +1,42 @@
-#ifndef _LTT_WRAPPER_KALLSYMS_H
-#define _LTT_WRAPPER_KALLSYMS_H
+#ifndef _LTTNG_WRAPPER_KALLSYMS_H
+#define _LTTNG_WRAPPER_KALLSYMS_H
 
 /*
- * Copyright (C) 2011 Avik Sil (avik.sil@linaro.org)
+ * 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>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#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)
@@ -25,4 +52,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 */