update for v2.6.17

[lttv.git] / ltt-usertrace / ltt / ltt-usertrace.h

diff --git a/ltt-usertrace/ltt/ltt-usertrace.h b/ltt-usertrace/ltt/ltt-usertrace.h
index 0f45dff19f482329a7481d35add02a49342fb7dd..373315ab0d052c577eac08f4e347e924a25b8811 100644 (file)
--- a/ltt-usertrace/ltt/ltt-usertrace.h
+++ b/ltt-usertrace/ltt/ltt-usertrace.h
@@ -11,17 +11,27 @@
 
 #include <errno.h>
 #include <syscall.h>
-#include <linux/unistd.h>
 #include <string.h>
-#include <sys/types.h>
 #include <stdint.h>
-#ifdef powerpc
-#define __KERNEL__     /* Ugly hack : atomic.h is broken */
+#include <sys/types.h>
+#include <linux/unistd.h>
+
+#define inline inline __attribute__((always_inline))
+
+#if defined(__powerpc__) || defined(__powerpc64__)
+#ifdef __powerpc64__
+#include <ltt/atomic-ppc64.h>
+#include <ltt/system-ppc64.h>
+#include <asm/timex.h>
+#else
+#include <ltt/ppc_asm-ppc.h>
+#include <ltt/atomic-ppc.h>
+#include <ltt/system-ppc.h>
+#include <ltt/timex-ppc.h>
 #endif
+#else
+#include <asm/timex.h>
 #include <asm/atomic.h>
-#ifdef powerpc
-#include "ltt/ltt-usertrace-ppc.h"
-#undef __KERNEL__      /* Ugly hack : atomic.h is broken */
 #endif
 
 #ifndef min
@@ -29,19 +39,28 @@
 #endif
 
 #ifdef i386
-#define __NR_ltt_trace_generic 311
-#define __NR_ltt_register_generic      312
+#define __NR_ltt_trace_generic 317
+#define __NR_ltt_register_generic      318
+#undef NR_syscalls
+#define NR_syscalls 319
+#endif
+
+#ifdef __powerpc__
+#define __NR_ltt_trace_generic 301
+#define __NR_ltt_register_generic      302
 #undef NR_syscalls
-#define NR_syscalls 313
+#define NR_syscalls 303
 #endif
 
-#ifdef powerpc
-#define __NR_ltt_trace_generic 283
-#define __NR_ltt_register_generic      284
+#ifdef __powerpc64__
+#define __NR_ltt_trace_generic 301
+#define __NR_ltt_register_generic      302
 #undef NR_syscalls
-#define NR_syscalls 285
+#define NR_syscalls 303
 #endif
 
+
+
 //FIXME : setup for ARM
 //FIXME : setup for MIPS