summaryrefslogtreecommitdiffstats
path: root/arch/um/sys-x86/asm/processor.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:02:59 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:14:50 +0100
commit27f85f12639fe821375a69900d96e0fbcc1450bf (patch)
tree9ca3ae7471b85059cd2c458569d3fc117c2ca670 /arch/um/sys-x86/asm/processor.h
parent3655c4d3c4bc105a36080c665b7294f471b0a1de (diff)
downloadblackbird-obmc-linux-27f85f12639fe821375a69900d96e0fbcc1450bf.tar.gz
blackbird-obmc-linux-27f85f12639fe821375a69900d96e0fbcc1450bf.zip
um: merge arch/um/sys-{i386,x86_64}/asm
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/sys-x86/asm/processor.h')
-rw-r--r--arch/um/sys-x86/asm/processor.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/um/sys-x86/asm/processor.h b/arch/um/sys-x86/asm/processor.h
new file mode 100644
index 000000000000..d3ac1cecf0f4
--- /dev/null
+++ b/arch/um/sys-x86/asm/processor.h
@@ -0,0 +1,15 @@
+#ifndef __UM_PROCESSOR_H
+#define __UM_PROCESSOR_H
+
+/* include faultinfo structure */
+#include <sysdep/faultinfo.h>
+
+#ifdef CONFIG_X86_32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
+
+#include <asm/processor-generic.h>
+
+#endif
OpenPOWER on IntegriCloud