X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-statedump-impl.c;h=3db557327a97708a2dc5a399135a3819f9d14358;hb=1dc55aa66d875d55e57e7bdbd2ffd7368215ee31;hp=1c09e51a8ce6a454b4bb8c86b3e079789cc9cfcd;hpb=aba7d7fc4ec0cf2828ed50b22d6171074635e856;p=lttng-modules.git

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 1c09e51a..3db55732 100644
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -41,7 +41,6 @@
 #include <linux/inetdevice.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/fdtable.h>
 #include <linux/swap.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
@@ -56,7 +55,7 @@
 #include <wrapper/tracepoint.h>
 #include <wrapper/genhd.h>
 #include <wrapper/file.h>
-#include <wrapper/time.h>
+#include <wrapper/fdtable.h>
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 #include <linux/irq.h>
@@ -342,7 +341,7 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)
 
 #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(2,6,39))
 #define irq_desc_get_chip(desc) get_irq_desc_chip(desc)
 #endif
 
@@ -397,7 +396,7 @@ void lttng_statedump_process_ns(struct lttng_session *session,
 	do {
 		trace_lttng_statedump_process_state(session,
 			p, type, mode, submode, status, pid_ns);
-		pid_ns = pid_ns->parent;
+		pid_ns = pid_ns ? pid_ns->parent : NULL;
 	} while (pid_ns);
 }