projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation for 3.0 kernels that are named 2.6.40
[lttng-modules.git]
/
lttng-syscalls.c
diff --git
a/lttng-syscalls.c
b/lttng-syscalls.c
index ebf32f8ed3274ad7ce90ec14e59a64df23ca390d..62ed24aa66723c2cb16b8abe2a83cd6b5a8ccb48 100644
(file)
--- a/
lttng-syscalls.c
+++ b/
lttng-syscalls.c
@@
-26,18
+26,28
@@
#include <asm/ptrace.h>
#include <asm/syscall.h>
#include <asm/ptrace.h>
#include <asm/syscall.h>
+#include "wrapper/tracepoint.h"
#include "lttng-events.h"
#ifndef CONFIG_COMPAT
#include "lttng-events.h"
#ifndef CONFIG_COMPAT
-static inline int is_compat_task(void)
-{
- return 0;
-}
+# ifndef is_compat_task
+# define is_compat_task() (0)
+# endif
#endif
static
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
#endif
static
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
+/*
+ * Forward declarations for old kernels.
+ */
+struct mmsghdr;
+struct rlimit64;
+struct oldold_utsname;
+struct old_utsname;
+struct sel_arg_struct;
+struct mmap_arg_struct;
+
/*
* Take care of NOARGS not supported by mainline.
*/
/*
* Take care of NOARGS not supported by mainline.
*/
@@
-50,7
+60,7
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
*/
#define LTTNG_PACKAGE_BUILD
#define CREATE_TRACE_POINTS
*/
#define LTTNG_PACKAGE_BUILD
#define CREATE_TRACE_POINTS
-#define TP_MODULE_
OVERRIDE
+#define TP_MODULE_
NOINIT
#define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers
#define PARAMS(args...) args
#define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers
#define PARAMS(args...) args
@@
-108,7
+118,7
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
#undef SC_DEFINE_EVENT_NOARGS
#undef TP_PROBE_CB
#undef SC_DEFINE_EVENT_NOARGS
#undef TP_PROBE_CB
-#undef TP_MODULE_
OVERRIDE
+#undef TP_MODULE_
NOINIT
#undef LTTNG_PACKAGE_BUILD
#undef CREATE_TRACE_POINTS
#undef LTTNG_PACKAGE_BUILD
#undef CREATE_TRACE_POINTS
@@
-404,7
+414,7
@@
int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
if (ret)
return ret;
#endif
if (ret)
return ret;
#endif
- ret = tracepoint_probe_register("sys_enter",
+ ret =
kabi_2635_
tracepoint_probe_register("sys_enter",
(void *) syscall_entry_probe, chan);
if (ret)
return ret;
(void *) syscall_entry_probe, chan);
if (ret)
return ret;
@@
-412,11
+422,11
@@
int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
* We change the name of sys_exit tracepoint due to namespace
* conflict with sys_exit syscall entry.
*/
* We change the name of sys_exit tracepoint due to namespace
* conflict with sys_exit syscall entry.
*/
- ret = tracepoint_probe_register("sys_exit",
+ ret =
kabi_2635_
tracepoint_probe_register("sys_exit",
(void *) __event_probe__exit_syscall,
chan->sc_exit);
if (ret) {
(void *) __event_probe__exit_syscall,
chan->sc_exit);
if (ret) {
- WARN_ON_ONCE(tracepoint_probe_unregister("sys_enter",
+ WARN_ON_ONCE(
kabi_2635_
tracepoint_probe_unregister("sys_enter",
(void *) syscall_entry_probe, chan));
}
return ret;
(void *) syscall_entry_probe, chan));
}
return ret;
@@
-431,12
+441,12
@@
int lttng_syscalls_unregister(struct lttng_channel *chan)
if (!chan->sc_table)
return 0;
if (!chan->sc_table)
return 0;
- ret = tracepoint_probe_unregister("sys_exit",
+ ret =
kabi_2635_
tracepoint_probe_unregister("sys_exit",
(void *) __event_probe__exit_syscall,
chan->sc_exit);
if (ret)
return ret;
(void *) __event_probe__exit_syscall,
chan->sc_exit);
if (ret)
return ret;
- ret = tracepoint_probe_unregister("sys_enter",
+ ret =
kabi_2635_
tracepoint_probe_unregister("sys_enter",
(void *) syscall_entry_probe, chan);
if (ret)
return ret;
(void *) syscall_entry_probe, chan);
if (ret)
return ret;
This page took
0.024372 seconds
and
4
git commands to generate.