cleanups

[ust.git] / share / kernelcompat.h

diff --git a/share/kernelcompat.h b/share/kernelcompat.h
index 3c23ac99477b8d95e4c367b59f58d7c95daf4834..2a8e0f253d1158e637d53f130eea3ca49de8b241 100644 (file)
--- a/share/kernelcompat.h
+++ b/share/kernelcompat.h
@@ -92,8 +92,6 @@ static inline long IS_ERR(const void *ptr)
 /* ATTRIBUTES */
 
 #define ____cacheline_aligned
-#define __init
-#define __exit
 
 /* MATH */
 
@@ -141,7 +139,7 @@ static __inline__ int get_count_order(unsigned int count)
 #define __ALIGN_MASK(x,mask)   (((x)+(mask))&~(mask))
 #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE)
 #define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-#define PAGE_MASK (PAGE_SIZE-1)
+#define PAGE_MASK (~(PAGE_SIZE-1))
 
 
 
@@ -152,18 +150,19 @@ static __inline__ int get_count_order(unsigned int count)
 
 /* TRACE CLOCK */
 
-//ust// static inline u64 trace_clock_read64(void)
-//ust// {
-//ust//        uint32_t low;
-//ust//        uint32_t high;
-//ust//        uint64_t retval;
-//ust//        __asm__ volatile ("rdtsc\n" : "=a" (low), "=d" (high));
-//ust// 
-//ust//        retval = high;
-//ust//        retval <<= 32;
-//ust//        return retval | low;
-//ust// }
+static inline u64 trace_clock_read64(void)
+{
+       uint32_t low;
+       uint32_t high;
+       uint64_t retval;
+       __asm__ volatile ("rdtsc\n" : "=a" (low), "=d" (high));
+
+       retval = high;
+       retval <<= 32;
+       return retval | low;
+}
 
+#if 0
 static inline u64 trace_clock_read64(void)
 {
        struct timeval tv;
@@ -176,6 +175,7 @@ static inline u64 trace_clock_read64(void)
 
        return retval;
 }
+#endif
 
 static inline u64 trace_clock_frequency(void)
 {