From 6e996fdd05c56e4eb4cddb12094d74833bb43881 Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Wed, 13 Jul 2005 05:45:00 -0700 Subject: [PATCH] --- yaml --- r: 4795 b: refs/heads/master c: 59a0a8aa6ab6e46926e8d12694593267c0869440 h: refs/heads/master i: 4793: 66790707054e125f0b6062ea31f41efade7a3fab 4791: 4c653e45b3306cbbb5534ae84d4bc83d5765b3b8 v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/xpc_channel.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ce52a40f6672..624426022a56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c2a6c62c013a4ea57243536fc7f3987e4ba04bc +refs/heads/master: 59a0a8aa6ab6e46926e8d12694593267c0869440 diff --git a/trunk/arch/ia64/sn/kernel/xpc_channel.c b/trunk/arch/ia64/sn/kernel/xpc_channel.c index 6d02dac8056f..94698bea7be0 100644 --- a/trunk/arch/ia64/sn/kernel/xpc_channel.c +++ b/trunk/arch/ia64/sn/kernel/xpc_channel.c @@ -72,7 +72,7 @@ xpc_initialize_channels(struct xpc_partition *part, partid_t partid) enum xpc_retval xpc_setup_infrastructure(struct xpc_partition *part) { - int ret; + int ret, cpuid; struct timer_list *timer; partid_t partid = XPC_PARTID(part); @@ -223,9 +223,9 @@ xpc_setup_infrastructure(struct xpc_partition *part) xpc_vars_part[partid].openclose_args_pa = __pa(part->local_openclose_args); xpc_vars_part[partid].IPI_amo_pa = __pa(part->local_IPI_amo_va); - xpc_vars_part[partid].IPI_nasid = cpuid_to_nasid(smp_processor_id()); - xpc_vars_part[partid].IPI_phys_cpuid = - cpu_physical_id(smp_processor_id()); + cpuid = raw_smp_processor_id(); /* any CPU in this partition will do */ + xpc_vars_part[partid].IPI_nasid = cpuid_to_nasid(cpuid); + xpc_vars_part[partid].IPI_phys_cpuid = cpu_physical_id(cpuid); xpc_vars_part[partid].nchannels = part->nchannels; xpc_vars_part[partid].magic = XPC_VP_MAGIC1;