diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 14:52:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-16 14:52:43 -0400 |
| commit | c8988f968240069aeae16d8cf9f59096a085eb27 (patch) | |
| tree | 5d75d8b6014353caf5ad9db2d189cd6427c80488 /include | |
| parent | 10acaf0c8a481c1ea9ba9d550a292595d8279ee1 (diff) | |
| parent | 732a675a6303156d1a197dc780b0712bd4b49d46 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix CONFIG_IA64_SGI_UV build error
[IA64] Update check_sal_cache_flush to use platform_send_ipi()
[IA64] perfmon: fix async exit bug
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/sn/simulator.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/simulator.h b/include/asm-ia64/sn/simulator.h index c3fd3eb25768..c2611f6cfe33 100644 --- a/include/asm-ia64/sn/simulator.h +++ b/include/asm-ia64/sn/simulator.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef _ASM_IA64_SN_SIMULATOR_H | 8 | #ifndef _ASM_IA64_SN_SIMULATOR_H |
| 9 | #define _ASM_IA64_SN_SIMULATOR_H | 9 | #define _ASM_IA64_SN_SIMULATOR_H |
| 10 | 10 | ||
| 11 | 11 | #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_SGI_UV) | |
| 12 | #define SNMAGIC 0xaeeeeeee8badbeefL | 12 | #define SNMAGIC 0xaeeeeeee8badbeefL |
| 13 | #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) | 13 | #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) |
| 14 | 14 | ||
| @@ -16,5 +16,10 @@ | |||
| 16 | #define IS_RUNNING_ON_SIMULATOR() (sn_prom_type) | 16 | #define IS_RUNNING_ON_SIMULATOR() (sn_prom_type) |
| 17 | #define IS_RUNNING_ON_FAKE_PROM() (sn_prom_type == 2) | 17 | #define IS_RUNNING_ON_FAKE_PROM() (sn_prom_type == 2) |
| 18 | extern int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ | 18 | extern int sn_prom_type; /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */ |
| 19 | #else | ||
| 20 | #define IS_MEDUSA() 0 | ||
| 21 | #define SIMULATOR_SLEEP() | ||
| 22 | #define IS_RUNNING_ON_SIMULATOR() 0 | ||
| 23 | #endif | ||
| 19 | 24 | ||
| 20 | #endif /* _ASM_IA64_SN_SIMULATOR_H */ | 25 | #endif /* _ASM_IA64_SN_SIMULATOR_H */ |