summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorDean Nelson <dcn@sgi.com>2009-02-09 17:25:20 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-11 13:31:47 +0100
commit1c0040047d5499599cc231ca3f105be3ceff8562 (patch)
tree4c1266a5763de66a2f3d3ebff8a5a87249baa88d /arch/ia64
parentx86: drop -fno-stack-protector annotations after pt_regs fixes (diff)
downloadlinux-1c0040047d5499599cc231ca3f105be3ceff8562.tar.xz
linux-1c0040047d5499599cc231ca3f105be3ceff8562.zip
SGI IA64 UV: fix ia64 build error in the linux-next tree
Fix the ia64 build error that occurs in the linux-next tree by introducing an ia64 version of uv.h. Additionally, clean up the usage of is_uv_system(). Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Jack Steiner <steiner@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/uv/uv.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/uv/uv.h b/arch/ia64/include/asm/uv/uv.h
new file mode 100644
index 000000000000..61b5bdfd980e
--- /dev/null
+++ b/arch/ia64/include/asm/uv/uv.h
@@ -0,0 +1,13 @@
+#ifndef _ASM_IA64_UV_UV_H
+#define _ASM_IA64_UV_UV_H
+
+#include <asm/system.h>
+#include <asm/sn/simulator.h>
+
+static inline int is_uv_system(void)
+{
+ /* temporary support for running on hardware simulator */
+ return IS_MEDUSA() || ia64_platform_is("uv");
+}
+
+#endif /* _ASM_IA64_UV_UV_H */