diff options
| author | Greg Edwards <edwardsg@sgi.com> | 2005-06-28 22:13:00 +0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 01:13:08 +0400 |
| commit | 60a762b6a6dec17cc4339b60154902fd04c2f9f2 (patch) | |
| tree | d01918a446ad451a1ff5226f04e1747a6e48eb85 /include/asm-ia64/sn/simulator.h | |
| parent | 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd (diff) | |
| download | linux-60a762b6a6dec17cc4339b60154902fd04c2f9f2.tar.xz | |
[IA64] remove CONFIG_IA64_SGI_SN_SIM
This patch removes the CONFIG_IA64_SGI_SN_SIM option entirely, allowing
any kernel bootable on sn2 to also be booted in the simulator.
Boot tested on Altix and HP rx2600.
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/sn/simulator.h')
| -rw-r--r-- | include/asm-ia64/sn/simulator.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-ia64/sn/simulator.h b/include/asm-ia64/sn/simulator.h index cf770e246af5..16a48b5a039c 100644 --- a/include/asm-ia64/sn/simulator.h +++ b/include/asm-ia64/sn/simulator.h @@ -13,16 +13,9 @@ #define SNMAGIC 0xaeeeeeee8badbeefL #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) -#ifdef CONFIG_IA64_SGI_SN_SIM #define SIMULATOR_SLEEP() asm("nop.i 0x8beef") -#define IS_RUNNING_ON_SIMULATOR() (sn_prom_type) +#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 */ -#else -#define IS_RUNNING_ON_SIMULATOR() (0) -#define IS_RUNNING_ON_FAKE_PROM() (0) -#define SIMULATOR_SLEEP() - -#endif #endif /* _ASM_IA64_SN_SIMULATOR_H */ |