tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

SGI IA64 UV: fix ia64 build error in the linux-next tree

Fix the ia64 build error that occurs in the linux-next tree by introducing
an ia64 version of uv.h.

Additionally, clean up the usage of is_uv_system().

Signed-off-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

Dean Nelson and committed by
Ingo Molnar 1c004004 9c8bb6b5

+24 -31
+13
arch/ia64/include/asm/uv/uv.h
··· 1 + #ifndef _ASM_IA64_UV_UV_H 2 + #define _ASM_IA64_UV_UV_H 3 + 4 + #include <asm/system.h> 5 + #include <asm/sn/simulator.h> 6 + 7 + static inline int is_uv_system(void) 8 + { 9 + /* temporary support for running on hardware simulator */ 10 + return IS_MEDUSA() || ia64_platform_is("uv"); 11 + } 12 + 13 + #endif /* _ASM_IA64_UV_UV_H */
-2
drivers/misc/sgi-gru/gru.h
··· 19 19 #ifndef __GRU_H__ 20 20 #define __GRU_H__ 21 21 22 - #include <asm/uv/uv.h> 23 - 24 22 /* 25 23 * GRU architectural definitions 26 24 */
+3 -15
drivers/misc/sgi-gru/grufile.c
··· 36 36 #include <linux/interrupt.h> 37 37 #include <linux/proc_fs.h> 38 38 #include <linux/uaccess.h> 39 + #include <asm/uv/uv.h> 39 40 #include "gru.h" 40 41 #include "grulib.h" 41 42 #include "grutables.h" 42 - 43 - #if defined CONFIG_X86_64 44 - #include <asm/genapic.h> 45 - #include <asm/irq.h> 46 - #define IS_UV() is_uv_system() 47 - #elif defined CONFIG_IA64 48 - #include <asm/system.h> 49 - #include <asm/sn/simulator.h> 50 - /* temp support for running on hardware simulator */ 51 - #define IS_UV() IS_MEDUSA() || ia64_platform_is("uv") 52 - #else 53 - #define IS_UV() 0 54 - #endif 55 43 56 44 #include <asm/uv/uv_hub.h> 57 45 #include <asm/uv/uv_mmrs.h> ··· 369 381 char id[10]; 370 382 void *gru_start_vaddr; 371 383 372 - if (!IS_UV()) 384 + if (!is_uv_system()) 373 385 return 0; 374 386 375 387 #if defined CONFIG_IA64 ··· 439 451 int order = get_order(sizeof(struct gru_state) * 440 452 GRU_CHIPLETS_PER_BLADE); 441 453 442 - if (!IS_UV()) 454 + if (!is_uv_system()) 443 455 return; 444 456 445 457 for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
+8 -14
drivers/misc/sgi-xp/xp.h
··· 15 15 16 16 #include <linux/mutex.h> 17 17 18 + #if defined CONFIG_X86_UV || defined CONFIG_IA64_SGI_UV 18 19 #include <asm/uv/uv.h> 20 + #define is_uv() is_uv_system() 21 + #endif 19 22 20 - #ifdef CONFIG_IA64 23 + #ifndef is_uv 24 + #define is_uv() 0 25 + #endif 26 + 27 + #if defined CONFIG_IA64 21 28 #include <asm/system.h> 22 29 #include <asm/sn/arch.h> /* defines is_shub1() and is_shub2() */ 23 30 #define is_shub() ia64_platform_is("sn2") 24 - #ifdef CONFIG_IA64_SGI_UV 25 - #define is_uv() ia64_platform_is("uv") 26 - #else 27 - #define is_uv() 0 28 - #endif 29 - #endif 30 - #ifdef CONFIG_X86_64 31 - #include <asm/genapic.h> 32 - #define is_uv() is_uv_system() 33 31 #endif 34 32 35 33 #ifndef is_shub1 ··· 40 42 41 43 #ifndef is_shub 42 44 #define is_shub() 0 43 - #endif 44 - 45 - #ifndef is_uv 46 - #define is_uv() 0 47 45 #endif 48 46 49 47 #ifdef USE_DBUG_ON