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

Configure Feed

Select the types of activity you want to include in your feed.

[IA64] Fix CONFIG_IA64_SGI_UV build error

Fix build error in CONFIG_IA64_SGI_UV config. (GENERIC builds
are ok).

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

authored by

Jack Steiner and committed by
Tony Luck
732a675a 3463a93d

+19 -1
+1
arch/ia64/Makefile
··· 57 57 core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ 58 58 core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ 59 59 core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ 60 + core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ 60 61 core-$(CONFIG_KVM) += arch/ia64/kvm/ 61 62 62 63 drivers-$(CONFIG_PCI) += arch/ia64/pci/
+12
arch/ia64/uv/kernel/setup.c
··· 17 17 DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); 18 18 EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); 19 19 20 + #ifdef CONFIG_IA64_SGI_UV 21 + int sn_prom_type; 22 + #endif 20 23 21 24 struct redir_addr { 22 25 unsigned long redirect; ··· 67 64 m_n_config.s.m_skt = 37; 68 65 m_n_config.s.n_skt = 0; 69 66 mmr_base = 0; 67 + #if 0 68 + /* Need BIOS calls - TDB */ 69 + if (!ia64_sn_is_fake_prom()) 70 + sn_prom_type = 1; 71 + else 72 + #endif 73 + sn_prom_type = 2; 74 + printk(KERN_INFO "Running on medusa with %s PROM\n", 75 + (sn_prom_type == 1) ? "real" : "fake"); 70 76 } else { 71 77 get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); 72 78 node_id.v = uv_read_local_mmr(UVH_NODE_ID);
+6 -1
include/asm-ia64/sn/simulator.h
··· 8 8 #ifndef _ASM_IA64_SN_SIMULATOR_H 9 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 12 #define SNMAGIC 0xaeeeeeee8badbeefL 13 13 #define IS_MEDUSA() ({long sn; asm("mov %0=cpuid[%1]" : "=r"(sn) : "r"(2)); sn == SNMAGIC;}) 14 14 ··· 16 16 #define IS_RUNNING_ON_SIMULATOR() (sn_prom_type) 17 17 #define IS_RUNNING_ON_FAKE_PROM() (sn_prom_type == 2) 18 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 25 #endif /* _ASM_IA64_SN_SIMULATOR_H */