From c1e82f74181f13b7fc893c2109320eb71b60e491 Mon Sep 17 00:00:00 2001
From: Christian Babeux <christian.babeux@efficios.com>
Date: Tue, 27 Nov 2012 23:01:06 -0500
Subject: [PATCH] Typo: Conflict in lttng-context-vtid. not properly resolved

The conflict that appeared on commit d9ecffa9ad6203df66b5fa81e8d505c3a9779c16
was not properly resolved.
---
 liblttng-ust/lttng-context-vtid.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/liblttng-ust/lttng-context-vtid.c b/liblttng-ust/lttng-context-vtid.c
index 9aa36c6c..ea153fe2 100644
--- 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.
-- 
2.34.1