kprobes and ftrace support build fixes

[lttng-modules.git] / probes / lttng-ftrace.c

diff --git a/probes/lttng-ftrace.c b/probes/lttng-ftrace.c
index 061da25a1475bceda81c48facd6570d27a37bdf1..da6d79c1078ae537f7d1f3d63a89c0275c9d5321 100644 (file)
--- a/probes/lttng-ftrace.c
+++ b/probes/lttng-ftrace.c
@@ -76,8 +76,8 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
        }
        fields[0].name = "ip";
        fields[0].type.atype = atype_integer;
-       fields[0].type.u.basic.integer.size = sizeof(unsigned long);
-       fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+       fields[0].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       fields[0].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
        fields[0].type.u.basic.integer.signedness = 0;
        fields[0].type.u.basic.integer.reverse_byte_order = 0;
        fields[0].type.u.basic.integer.base = 16;
@@ -85,8 +85,8 @@ int lttng_create_ftrace_event(const char *name, struct ltt_event *event)
 
        fields[1].name = "parent_ip";
        fields[1].type.atype = atype_integer;
-       fields[1].type.u.basic.integer.size = sizeof(unsigned long);
-       fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long);
+       fields[1].type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
+       fields[1].type.u.basic.integer.alignment = ltt_alignof(unsigned long) * CHAR_BIT;
        fields[1].type.u.basic.integer.signedness = 0;
        fields[1].type.u.basic.integer.reverse_byte_order = 0;
        fields[1].type.u.basic.integer.base = 16;
@@ -146,7 +146,7 @@ void lttng_ftrace_unregister(struct ltt_event *event)
        wrapper_unregister_ftrace_function_probe(event->u.ftrace.symbol_name,
                        &lttng_ftrace_ops, event);
        kfree(event->u.ftrace.symbol_name);
-       kfree(desc->fields);
+       kfree(event->desc->fields);
        kfree(event->desc->name);
        kfree(event->desc);
 }