lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/uv

Browse Source
This commit is contained in:
Ingo Molnar
2008-11-20 09:02:39 +01:00
parent a3d732f937 ee2f6cc7f9
commit fbc2a06056
1834 changed files with 35992 additions and 17685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/sgi-xp/xp.h
View File

@@ -19,7 +19,11 @@
#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>