X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=07ffbf7f461f6397dcb2a3218585e409ac317e52;hb=af93f0ba38fcabe287a81bdc5e098d8ff86e5c82;hp=ebe7655635cee4ec2913fd7bff77fc0d1a790b39;hpb=997eff5e7244b15b4450030645b791cef68bf3e0;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index ebe76556..07ffbf7f 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -33,18 +33,12 @@
 #include <linux/mutex.h>
 #include <linux/device.h>
 #include <linux/fdtable.h>
+#include <linux/irq.h>
 
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <wrapper/namespace.h>
-#include <wrapper/irq.h>
-#include <wrapper/tracepoint.h>
 #include <wrapper/genhd.h>
-#include <wrapper/file.h>
-
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-#include <linux/irq.h>
-#endif
 
 /* Define the tracepoints, but do not build the probes */
 #define CREATE_TRACE_POINTS
@@ -311,7 +305,7 @@ void lttng_enumerate_task_vm_maps(struct lttng_session *session,
 		down_read(&mm->mmap_sem);
 		while (map) {
 			if (map->vm_file)
-				ino = map->vm_file->lttng_f_dentry->d_inode->i_ino;
+				ino = map->vm_file->f_path.dentry->d_inode->i_ino;
 			else
 				ino = 0;
 			trace_lttng_statedump_vm_map(session, p, map, ino);
@@ -335,8 +329,6 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 }
 #endif
 
-#ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-
 static
 int lttng_list_interrupts(struct lttng_session *session)
 {
@@ -361,13 +353,6 @@ int lttng_list_interrupts(struct lttng_session *session)
 	}
 	return 0;
 }
-#else
-static inline
-int lttng_list_interrupts(struct lttng_session *session)
-{
-	return 0;
-}
-#endif
 
 /*
  * Statedump the task's namespaces using the proc filesystem inode number as
@@ -615,13 +600,6 @@ EXPORT_SYMBOL_GPL(lttng_statedump_start);
 static
 int __init lttng_statedump_init(void)
 {
-	/*
-	 * Allow module to load even if the fixup cannot be done. This
-	 * will allow seemless transition when the underlying issue fix
-	 * is merged into the Linux kernel, and when tracepoint.c
-	 * "tracepoint_module_notify" is turned into a static function.
-	 */
-	(void) wrapper_lttng_fixup_sig(THIS_MODULE);
 	return 0;
 }