aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/include/asm/machvec_hpsim.h
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2008-08-14 10:55:26 +0200
committerIngo Molnar <[email protected]>2008-08-14 10:55:26 +0200
commitd4439087d316613548c70472291bf4ca646ce24b (patch)
tree4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /arch/ia64/include/asm/machvec_hpsim.h
parent26d809af6397ce5c37f5c44d89734d19cce1ad25 (diff)
parent30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff)
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts: arch/x86/kernel/genapic_64.c include/asm-x86/kvm_host.h Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/ia64/include/asm/machvec_hpsim.h')
-rw-r--r--arch/ia64/include/asm/machvec_hpsim.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/machvec_hpsim.h b/arch/ia64/include/asm/machvec_hpsim.h
new file mode 100644
index 000000000000..cf72fc87fdfe
--- /dev/null
+++ b/arch/ia64/include/asm/machvec_hpsim.h
@@ -0,0 +1,18 @@
+#ifndef _ASM_IA64_MACHVEC_HPSIM_h
+#define _ASM_IA64_MACHVEC_HPSIM_h
+
+extern ia64_mv_setup_t hpsim_setup;
+extern ia64_mv_irq_init_t hpsim_irq_init;
+
+/*
+ * This stuff has dual use!
+ *
+ * For a generic kernel, the macros are used to initialize the
+ * platform's machvec structure. When compiling a non-generic kernel,
+ * the macros are used directly.
+ */
+#define platform_name "hpsim"
+#define platform_setup hpsim_setup
+#define platform_irq_init hpsim_irq_init
+
+#endif /* _ASM_IA64_MACHVEC_HPSIM_h */