]>
Commit | Line | Data |
---|---|---|
6a930a95 BS |
1 | From: Russ Anderson <rja@sgi.com> |
2 | Subject: Use consistent names for region size and conherence id on x86 and ia64. | |
3 | References: bnc#442455 | |
4 | ||
5 | The SGI xp drivers are used on both ia64 and x86. Using the same | |
6 | names (sn_coherency_id, sn_region_size) simplies the driver code. | |
7 | ||
8 | ||
9 | Signed-off-by: Russ Anderson <rja@sgi.com> | |
10 | Acked-by: Bernhard Walle <bwalle@suse.de> | |
11 | ||
12 | --- | |
13 | ||
14 | arch/x86/kernel/bios_uv.c | 8 ++++---- | |
15 | arch/x86/kernel/genx2apic_uv_x.c | 4 ++-- | |
16 | include/asm-x86/uv/bios.h | 6 +++--- | |
17 | 3 files changed, 9 insertions(+), 9 deletions(-) | |
18 | ||
19 | --- a/arch/x86/kernel/bios_uv.c | |
20 | +++ b/arch/x86/kernel/bios_uv.c | |
21 | @@ -69,10 +69,10 @@ s64 uv_bios_call_reentrant(enum uv_bios_ | |
22 | ||
23 | long sn_partition_id; | |
24 | EXPORT_SYMBOL_GPL(sn_partition_id); | |
25 | -long uv_coherency_id; | |
26 | -EXPORT_SYMBOL_GPL(uv_coherency_id); | |
27 | -long uv_region_size; | |
28 | -EXPORT_SYMBOL_GPL(uv_region_size); | |
29 | +long sn_coherency_id; | |
30 | +EXPORT_SYMBOL_GPL(sn_coherency_id); | |
31 | +long sn_region_size; | |
32 | +EXPORT_SYMBOL_GPL(sn_region_size); | |
33 | int uv_type; | |
34 | ||
35 | ||
36 | --- a/arch/x86/kernel/genx2apic_uv_x.c | |
37 | +++ b/arch/x86/kernel/genx2apic_uv_x.c | |
38 | @@ -524,7 +524,7 @@ void __init uv_system_init(void) | |
39 | ||
40 | uv_bios_init(); | |
41 | uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, | |
42 | - &uv_coherency_id, &uv_region_size); | |
43 | + &sn_coherency_id, &sn_region_size); | |
44 | uv_rtc_init(); | |
45 | ||
46 | for_each_present_cpu(cpu) { | |
47 | @@ -546,7 +546,7 @@ void __init uv_system_init(void) | |
48 | uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1; | |
49 | uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper; | |
50 | uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base; | |
51 | - uv_cpu_hub_info(cpu)->coherency_domain_number = uv_coherency_id; | |
52 | + uv_cpu_hub_info(cpu)->coherency_domain_number = sn_coherency_id; | |
53 | uv_cpu_hub_info(cpu)->scir.offset = SCIR_LOCAL_MMR_BASE + lcpu; | |
54 | uv_node_to_blade[nid] = blade; | |
55 | uv_cpu_to_blade[cpu] = blade; | |
56 | --- a/include/asm-x86/uv/bios.h | |
57 | +++ b/include/asm-x86/uv/bios.h | |
58 | @@ -85,9 +85,9 @@ extern void uv_bios_init(void); | |
59 | ||
60 | extern int uv_type; | |
61 | extern long sn_partition_id; | |
62 | -extern long uv_coherency_id; | |
63 | -extern long uv_region_size; | |
64 | -#define partition_coherence_id() (uv_coherency_id) | |
65 | +extern long sn_coherency_id; | |
66 | +extern long sn_region_size; | |
67 | +#define partition_coherence_id() (sn_coherency_id) | |
68 | ||
69 | extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */ | |
70 |