make user_generic a lib

[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 7506763e258eae8315db5af18b6c5a3a538a5217..60a6aabc9682e5e098ef5991f79828ea4e942e25 100644 (file)
--- a/ltt-usertrace/ltt/ltt-usertrace.h
+++ b/ltt-usertrace/ltt/ltt-usertrace.h
@@ -11,22 +11,67 @@
 
 #include <errno.h>
 #include <syscall.h>
-#include <linux/unistd.h>
-#include <asm/atomic.h>
 #include <string.h>
-#include <sys/types.h>
 #include <stdint.h>
+#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
+#elif defined(__x86_64__)
+#include <asm/timex.h>
+#include <asm/bitops.h>
+#include <asm/atomic.h>
+#include <asm/system.h>
+#else
+#include <asm/timex.h>
+#include <asm/atomic.h>
+#endif
 
 #ifndef min
 #define min(a,b) ((a)<(b)?(a):(b))
 #endif
 
-//Put in asm-i486/unistd.h
-#define __NR_ltt_trace_generic 311
-#define __NR_ltt_register_generic      312
+#ifdef i386
+#define __NR_ltt_trace_generic 317
+#define __NR_ltt_register_generic      318
+#undef NR_syscalls
+#define NR_syscalls 319
+#endif
+
+#ifdef __x86_64__
+#define __NR_ltt_trace_generic 279
+#define __NR_ltt_register_generic      280
+#undef NR_syscalls
+#define NR_syscalls 281
+#endif
+
+#ifdef __powerpc__
+#define __NR_ltt_trace_generic 301
+#define __NR_ltt_register_generic      302
+#undef NR_syscalls
+#define NR_syscalls 303
+#endif
 
+#ifdef __powerpc64__
+#define __NR_ltt_trace_generic 301
+#define __NR_ltt_register_generic      302
 #undef NR_syscalls
-#define NR_syscalls 313
+#define NR_syscalls 303
+#endif
+
+
 
 //FIXME : setup for ARM
 //FIXME : setup for MIPS