diff options
author | Russ Anderson <rja@sgi.com> | 2005-10-25 18:34:19 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-10-25 19:53:38 -0400 |
commit | e7f98dbbb89b68b23a5115708412a820a713fbf1 (patch) | |
tree | ec373399557962045efa884d17b4a094b701c45b /arch/ia64/sn | |
parent | 444d1d9bb5b724f03344c9317bc01d54a9b39073 (diff) |
[IA64-SGI] fix bte_copy() calling get_nasid() while preemptible
bte_copy() calls calls get_nasid(), which will get flagged if
preemption if enabled. raw_smp_processor_id() is used instead.
It is OK if we migrate off node.
Signed-off-by: Russ Anderson (rja@sgi.com)
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/bte.c | 2 |
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) | |||
87 | unsigned long irq_flags; | 87 | unsigned long irq_flags; |
88 | unsigned long itc_end = 0; | 88 | unsigned long itc_end = 0; |
89 | int nasid_to_try[MAX_NODES_TO_TRY]; | 89 | int nasid_to_try[MAX_NODES_TO_TRY]; |
90 | int my_nasid = get_nasid(); | 90 | int my_nasid = cpuid_to_nasid(raw_smp_processor_id()); |
91 | int bte_if_index, nasid_index; | 91 | int bte_if_index, nasid_index; |
92 | int bte_first, btes_per_node = BTES_PER_NODE; | 92 | int bte_first, btes_per_node = BTES_PER_NODE; |
93 | 93 | ||