X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fust%2Fkernelcompat.h;h=4514b7986f0be327a0b3fdfc74d3d9d85731464a;hb=f3b9955d630dabdd0a297c12b53d3c3055dc8599;hp=032030ac1f1526cb252ab94776a43af83c66f146;hpb=c1f205309da615f1f0c68beedf37365942246537;p=ust.git

diff --git a/include/ust/kernelcompat.h b/include/ust/kernelcompat.h
index 032030a..4514b79 100644
--- a/include/ust/kernelcompat.h
+++ b/include/ust/kernelcompat.h
@@ -3,9 +3,6 @@
 
 #include <kcompat.h>
 
-#include <string.h>
-#include <sys/time.h>
-
 /* FIXME: libkcompat must not define arch-specific local ops, as ust *must*
  * fallback to the normal atomic ops. Fix things so we don't add them and
  * break things accidentally.
@@ -15,15 +12,7 @@
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
         (type *)( (char *)__mptr - offsetof(type,member) );})
 
-#define KERN_DEBUG ""
-#define KERN_NOTICE ""
-#define KERN_INFO ""
-#define KERN_ERR ""
-#define KERN_ALERT ""
-#define KERN_WARNING ""
-
 /* ERROR OPS */
-
 #define MAX_ERRNO	4095
 
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
@@ -71,19 +60,11 @@ static inline long IS_ERR(const void *ptr)
 
 /* MALLOCATION */
 
-#include <stdlib.h>
-
-#define kmalloc(s, t) malloc(s)
-#define kzalloc(s, t) zmalloc(s)
-#define kfree(p) free((void *)p)
-#define kstrdup(s, t) strdup(s)
-
 #define zmalloc(s) calloc(1, s)
 
-#define GFP_KERNEL
-
 /* ATTRIBUTES */
 
+/* FIXME: define this */
 #define ____cacheline_aligned
 
 /* MATH */
@@ -173,6 +154,8 @@ static inline u64 trace_clock_read64(void)
 }
 #endif
 
+#include <sys/time.h>
+
 static inline u64 trace_clock_read64(void)
 {
 	struct timeval tv;
@@ -196,5 +179,4 @@ static inline u32 trace_clock_freq_scale(void)
 	return 1;
 }
 
-
 #endif /* KERNELCOMPAT_H */