Typo: Conflict in lttng-context-vtid. not properly resolved

The conflict that appeared on commit d9ecffa9ad6203df66b5fa81e8d505c3a9779c16
was not properly resolved.

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index 9aa36c6c55a30e999c9f60fb3fb7dc88392a8139..ea153fe27b688155d5fa253a7d9d593c9085c878 100644 (file)
--- a/liblttng-ust/lttng-context-vtid.c
+++ b/liblttng-ust/lttng-context-vtid.c
@@ -28,26 +28,6 @@
 #include "ltt-tracer-core.h"
 #include <lttng/ust-tid.h>
 
-#ifdef __linux__
-#include <syscall.h>
-#endif
-
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-       return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-       return getpid();
-}
-#endif
-======= end
-
 /*
  * We cache the result to ensure we don't trigger a system call for
  * each event.