git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
asm-ia64
/
sn
/
simulator.h
diff --git
a/include/asm-ia64/sn/simulator.h
b/include/asm-ia64/sn/simulator.h
index
82bc2cb
..
16a48b5
100644
(file)
--- a/
include/asm-ia64/sn/simulator.h
+++ b/
include/asm-ia64/sn/simulator.h
@@
-1,27
+1,21
@@
-#ifndef _ASM_IA64_SN_SIMULATOR_H
-#define _ASM_IA64_SN_SIMULATOR_H
-
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
- * Copyright (C) 2000-200
3
Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2000-200
4
Silicon Graphics, Inc. All rights reserved.
*/
*/
-#include <linux/config.h>
+#ifndef _ASM_IA64_SN_SIMULATOR_H
+#define _ASM_IA64_SN_SIMULATOR_H
-#i
fdef CONFIG_IA64_SGI_SN_SIM
+#i
nclude <linux/config.h>
#define SNMAGIC 0xaeeeeeee8badbeefL
#define SNMAGIC 0xaeeeeeee8badbeefL
-#define IS_RUNNING_ON_SIMULATOR() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;})
-
-#define SIMULATOR_SLEEP() asm("nop.i 0x8beef")
-
-#else
-
-#define IS_RUNNING_ON_SIMULATOR() (0)
-#define SIMULATOR_SLEEP()
+#define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;})
-#endif
+#define SIMULATOR_SLEEP() asm("nop.i 0x8beef")
+#define IS_RUNNING_ON_SIMULATOR() (sn_prom_type)
+#define IS_RUNNING_ON_FAKE_PROM() (sn_prom_type == 2)
+extern int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */
#endif /* _ASM_IA64_SN_SIMULATOR_H */
#endif /* _ASM_IA64_SN_SIMULATOR_H */