---

yaml --- r: 273014 b: refs/heads/master c: 7095850 h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · 323c909 · 323c909
1 parent 8eaade7
commit 323c909
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 50 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c75361bddb21761cabddde95dcae2059b021ea5d
+refs/heads/master: 709585063f3d3da68f29b3d706fddb74de5e33f4
diff --git a/trunk/arch/um/sys-x86/shared/sysdep/kernel-offsets.h b/trunk/arch/um/sys-x86/shared/sysdep/kernel-offsets.h
@@ -1,5 +1,21 @@
-#ifdef __i386__
-#include "kernel-offsets_32.h"
-#else
-#include "kernel-offsets_64.h"
-#endif
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/elf.h>
+#include <linux/crypto.h>
+#include <asm/mman.h>
+
+#define DEFINE(sym, val) \
+	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+
+#define STR(x) #x
+#define DEFINE_STR(sym, val) asm volatile("\n->" #sym " " STR(val) " " #val: : )
+
+#define BLANK() asm volatile("\n->" : : )
+
+#define OFFSET(sym, str, mem) \
+	DEFINE(sym, offsetof(struct str, mem));
+
+void foo(void)
+{
+#include <common-offsets.h>
+}
diff --git a/trunk/arch/um/sys-x86/shared/sysdep/kernel-offsets_32.h b/trunk/arch/um/sys-x86/shared/sysdep/kernel-offsets_32.h
diff --git a/trunk/arch/um/sys-x86/shared/sysdep/kernel-offsets_64.h b/trunk/arch/um/sys-x86/shared/sysdep/kernel-offsets_64.h