diff options
author | Jack Steiner <steiner@sgi.com> | 2008-06-14 08:57:25 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-06-16 12:02:03 -0400 |
commit | 732a675a6303156d1a197dc780b0712bd4b49d46 (patch) | |
tree | 2628ee33186a4f8a5ac0358de3a340764b12ee70 /arch/ia64 | |
parent | 3463a93def55c309f3c0d0a8aaf216be3be42d64 (diff) |
[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>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/Makefile | 1 | ||||
-rw-r--r-- | arch/ia64/uv/kernel/setup.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 88f1a55c6c94..e67ee3f27698 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile | |||
@@ -57,6 +57,7 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ | |||
57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ | 57 | core-$(CONFIG_IA64_HP_ZX1) += arch/ia64/dig/ |
58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ | 58 | core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ |
59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ | 59 | core-$(CONFIG_IA64_SGI_SN2) += arch/ia64/sn/ |
60 | core-$(CONFIG_IA64_SGI_UV) += arch/ia64/uv/ | ||
60 | core-$(CONFIG_KVM) += arch/ia64/kvm/ | 61 | core-$(CONFIG_KVM) += arch/ia64/kvm/ |
61 | 62 | ||
62 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ | 63 | drivers-$(CONFIG_PCI) += arch/ia64/pci/ |
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c index 9aa743203c3c..cf5f28ae96c4 100644 --- a/arch/ia64/uv/kernel/setup.c +++ b/arch/ia64/uv/kernel/setup.c | |||
@@ -17,6 +17,9 @@ | |||
17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); | 17 | DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); |
18 | EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); | 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 | struct redir_addr { | 24 | struct redir_addr { |
22 | unsigned long redirect; | 25 | unsigned long redirect; |
@@ -64,6 +67,15 @@ void __init uv_setup(char **cmdline_p) | |||
64 | m_n_config.s.m_skt = 37; | 67 | m_n_config.s.m_skt = 37; |
65 | m_n_config.s.n_skt = 0; | 68 | m_n_config.s.n_skt = 0; |
66 | mmr_base = 0; | 69 | mmr_base = 0; |
70 | #if 0 | ||
71 | /* Need BIOS calls - TDB */ | ||
72 | if (!ia64_sn_is_fake_prom()) | ||
73 | sn_prom_type = 1; | ||
74 | else | ||
75 | #endif | ||
76 | sn_prom_type = 2; | ||
77 | printk(KERN_INFO "Running on medusa with %s PROM\n", | ||
78 | (sn_prom_type == 1) ? "real" : "fake"); | ||
67 | } else { | 79 | } else { |
68 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); | 80 | get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size); |
69 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); | 81 | node_id.v = uv_read_local_mmr(UVH_NODE_ID); |