From d6322067aa791234d0d81e1a6b03b445635d5f65 Mon Sep 17 00:00:00 2001
From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Thu, 4 Mar 2010 12:14:06 -0500
Subject: [PATCH] kernelcompat: remove old definitions that are now unused

---
 include/ust/kernelcompat.h | 21 +++------------------
 include/usterr.h           |  1 +
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/include/ust/kernelcompat.h b/include/ust/kernelcompat.h
index 567ad03..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,17 +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 ""
-
-#define WARN_ON_ONCE(msg) WARN_ON(msg)
-
 /* ERROR OPS */
-
 #define MAX_ERRNO	4095
 
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
@@ -77,6 +64,7 @@ static inline long IS_ERR(const void *ptr)
 
 /* ATTRIBUTES */
 
+/* FIXME: define this */
 #define ____cacheline_aligned
 
 /* MATH */
@@ -166,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;
@@ -189,9 +179,4 @@ static inline u32 trace_clock_freq_scale(void)
 	return 1;
 }
 
-
-/* PERCPU */
-
-#define __get_cpu_var(x) x
-
 #endif /* KERNELCOMPAT_H */
diff --git a/include/usterr.h b/include/usterr.h
index 6b88177..067866a 100644
--- a/include/usterr.h
+++ b/include/usterr.h
@@ -80,5 +80,6 @@ extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...);
 
 #define BUG_ON(condition) do { if (unlikely(condition)) ERR("condition not respected (BUG)"); } while(0)
 #define WARN_ON(condition) do { if (unlikely(condition)) WARN("condition not respected on line %s:%d", __FILE__, __LINE__); } while(0)
+#define WARN_ON_ONCE(condition) WARN_ON(condition)
 
 #endif /* USTERR_H */
-- 
2.34.1