Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0f20989 authored by Russ Anderson's avatar Russ Anderson Committed by Ingo Molnar
Browse files

x86, uv: use consistent names for region size and conherence id on x86 and ia64 



Use consistent names for region size and conherence id on x86 and ia64.

The SGI xp drivers are used on both ia64 and x86.  Using the same
names (sn_coherency_id, sn_region_size) simplies the driver code.

Signed-off-by: default avatarRuss Anderson <rja@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2515ddc6

arch/x86/kernel/bios_uv.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -69,10 +69,10 @@ s64 uv_bios_call_reentrant(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, 




long sn_partition_id;

long sn_partition_id;

EXPORT_SYMBOL_GPL(sn_partition_id);

EXPORT_SYMBOL_GPL(sn_partition_id);

long uv_coherency_id;

long sn_coherency_id;

EXPORT_SYMBOL_GPL(uv_coherency_id);

EXPORT_SYMBOL_GPL(sn_coherency_id);

long uv_region_size;

long sn_region_size;

EXPORT_SYMBOL_GPL(uv_region_size);

EXPORT_SYMBOL_GPL(sn_region_size);

int uv_type;

int uv_type;

arch/x86/kernel/genx2apic_uv_x.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ void __init uv_system_init(void) 




	uv_bios_init();

	uv_bios_init();

	uv_bios_get_sn_info(0, &uv_type, &sn_partition_id,

	uv_bios_get_sn_info(0, &uv_type, &sn_partition_id,

			    &uv_coherency_id, &uv_region_size);

			    &sn_coherency_id, &sn_region_size);

	uv_rtc_init();

	uv_rtc_init();





	for_each_present_cpu(cpu) {

	for_each_present_cpu(cpu) {
@@ -451,7 +451,7 @@ void __init uv_system_init(void) 
		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;

		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;

		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;

		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;

		uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;

		uv_cpu_hub_info(cpu)->global_mmr_base = mmr_base;

		uv_cpu_hub_info(cpu)->coherency_domain_number = uv_coherency_id;

		uv_cpu_hub_info(cpu)->coherency_domain_number = sn_coherency_id;

		uv_node_to_blade[nid] = blade;

		uv_node_to_blade[nid] = blade;

		uv_cpu_to_blade[cpu] = blade;

		uv_cpu_to_blade[cpu] = blade;

		max_pnode = max(pnode, max_pnode);

		max_pnode = max(pnode, max_pnode);

include/asm-x86/uv/bios.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -85,9 +85,9 @@ extern void uv_bios_init(void); 




extern int uv_type;

extern int uv_type;

extern long sn_partition_id;

extern long sn_partition_id;

extern long uv_coherency_id;

extern long sn_coherency_id;

extern long uv_region_size;

extern long sn_region_size;

#define partition_coherence_id()	(uv_coherency_id)

#define partition_coherence_id()	(sn_coherency_id)





extern struct kobject *sgi_uv_kobj;	/* /sys/firmware/sgi_uv */

extern struct kobject *sgi_uv_kobj;	/* /sys/firmware/sgi_uv */