X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=probes%2Flttng-kprobes.c;h=c4605500f630b2786f3d053d4c81b51d79e3e410;hb=003c2341ab44ef8e24f5cacf81b1c7f1a63f7886;hp=32f43bd80da83905e6b858a4c74c60e1dd9e8536;hpb=1c124020c743254923d8e76ab5dcd1f69709982e;p=lttng-modules.git

diff --git a/probes/lttng-kprobes.c b/probes/lttng-kprobes.c
index 32f43bd8..c4605500 100644
--- a/probes/lttng-kprobes.c
+++ b/probes/lttng-kprobes.c
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * probes/lttng-kprobes.c
  *
  * LTTng kprobes integration module.
  *
  * Copyright (C) 2009-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/module.h>
@@ -25,7 +12,6 @@
 #include <linux/slab.h>
 #include <lttng-events.h>
 #include <wrapper/ringbuffer/frontend_types.h>
-#include <wrapper/vmalloc.h>
 #include <wrapper/irqflags.h>
 #include <lttng-tracer.h>
 
@@ -88,12 +74,12 @@ int lttng_create_kprobe_event(const char *name, struct lttng_event *event)
 	}
 	field->name = "ip";
 	field->type.atype = atype_integer;
-	field->type.u.basic.integer.size = sizeof(unsigned long) * CHAR_BIT;
-	field->type.u.basic.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
-	field->type.u.basic.integer.signedness = lttng_is_signed_type(unsigned long);
-	field->type.u.basic.integer.reverse_byte_order = 0;
-	field->type.u.basic.integer.base = 16;
-	field->type.u.basic.integer.encoding = lttng_encode_none;
+	field->type.u.integer.size = sizeof(unsigned long) * CHAR_BIT;
+	field->type.u.integer.alignment = lttng_alignof(unsigned long) * CHAR_BIT;
+	field->type.u.integer.signedness = lttng_is_signed_type(unsigned long);
+	field->type.u.integer.reverse_byte_order = 0;
+	field->type.u.integer.base = 16;
+	field->type.u.integer.encoding = lttng_encode_none;
 	desc->owner = THIS_MODULE;
 	event->desc = desc;
 
@@ -139,13 +125,6 @@ int lttng_kprobes_register(const char *name,
 	event->u.kprobe.kp.offset = offset;
 	event->u.kprobe.kp.addr = (void *) (unsigned long) addr;
 
-	/*
-	 * Ensure the memory we just allocated don't trigger page faults.
-	 * Well.. kprobes itself puts the page fault handler on the blacklist,
-	 * but we can never be too careful.
-	 */
-	wrapper_vmalloc_sync_all();
-
 	ret = register_kprobe(&event->u.kprobe.kp);
 	if (ret)
 		goto register_error;