[ported from 2008.3] Add tracing support and hook up Litmus KConfig for x86

- fix requesting more than 2^11 pages (MAX_ORDER)
  to system allocator

Still to be merged:
- feather-trace generic implementation

2 files changed, 13 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 72ace9515a07..e2cd95ebeeb1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2092,3 +2092,5 @@ source "crypto/Kconfig"
 source "arch/x86/kvm/Kconfig"
 
 source "lib/Kconfig"
+
+source "litmus/Kconfig"
diff --git a/arch/x86/include/asm/feather_trace.h b/arch/x86/include/asm/feather_trace.h
new file mode 100644
index 000000000000..f60fbed07afb
--- /dev/null
+++ b/arch/x86/include/asm/feather_trace.h
@@ -0,0 +1,11 @@
+#ifndef _ARCH_FEATHER_TRACE_H
+#define _ARCH_FEATHER_TRACE_H
+
+static inline unsigned long long ft_timestamp(void)
+{
+        unsigned long long ret;
+        __asm__ __volatile__("rdtsc" : "=A" (ret));
+        return ret;
+}
+
+#endif