summaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/kernel/bte.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-10-31 19:51:57 +0100
committerTony Luck <tony.luck@intel.com>2005-10-31 19:51:57 +0100
commitc7fb577e2a6cb04732541f2dc402bd46747f7558 (patch)
treedf3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /arch/ia64/sn/kernel/bte.c
parentUpdate from upstream with manual merge of Yasunori Goto's (diff)
parent[PATCH] noop-iosched: avoid corrupted request merging (diff)
downloadlinux-c7fb577e2a6cb04732541f2dc402bd46747f7558.tar.xz
linux-c7fb577e2a6cb04732541f2dc402bd46747f7558.zip
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4 to new location of swiotlb.c Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn/kernel/bte.c')
-rw-r--r--arch/ia64/sn/kernel/bte.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index 45854c637e9c..d71f4de44f79 100644
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -87,7 +87,7 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification)
unsigned long irq_flags;
unsigned long itc_end = 0;
int nasid_to_try[MAX_NODES_TO_TRY];
- int my_nasid = get_nasid();
+ int my_nasid = cpuid_to_nasid(raw_smp_processor_id());
int bte_if_index, nasid_index;
int bte_first, btes_per_node = BTES_PER_NODE;