diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:45:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:45:09 +0100 |
| commit | ab639f3593f0b5e4439d549831442c18c3baf989 (patch) | |
| tree | 118743e94e5dc86c835dbc1f1d3bf1612f4ae740 /drivers/misc/sgi-xp/xp.h | |
| parent | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (diff) | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
| download | kernel-crypto-ab639f3593f0b5e4439d549831442c18c3baf989.tar.gz kernel-crypto-ab639f3593f0b5e4439d549831442c18c3baf989.tar.xz kernel-crypto-ab639f3593f0b5e4439d549831442c18c3baf989.zip | |
Merge branch 'core/percpu' into x86/core
Diffstat (limited to 'drivers/misc/sgi-xp/xp.h')
| -rw-r--r-- | drivers/misc/sgi-xp/xp.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h index 069ad3a1c2a..2275126cb33 100644 --- a/drivers/misc/sgi-xp/xp.h +++ b/drivers/misc/sgi-xp/xp.h @@ -15,21 +15,19 @@ #include <linux/mutex.h> +#if defined CONFIG_X86_UV || defined CONFIG_IA64_SGI_UV #include <asm/uv/uv.h> +#define is_uv() is_uv_system() +#endif + +#ifndef is_uv +#define is_uv() 0 +#endif -#ifdef CONFIG_IA64 +#if defined CONFIG_IA64 #include <asm/system.h> #include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */ #define is_shub() ia64_platform_is("sn2") -#ifdef CONFIG_IA64_SGI_UV -#define is_uv() ia64_platform_is("uv") -#else -#define is_uv() 0 -#endif -#endif -#ifdef CONFIG_X86_64 -#include <asm/genapic.h> -#define is_uv() is_uv_system() #endif #ifndef is_shub1 @@ -44,10 +42,6 @@ #define is_shub() 0 #endif -#ifndef is_uv -#define is_uv() 0 -#endif - #ifdef USE_DBUG_ON #define DBUG_ON(condition) BUG_ON(condition) #else |