diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-10-28 15:27:16 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-28 15:27:16 -0700 |
| commit | 2d8f6a521908e3563478347aecad4ab20dc48155 (patch) | |
| tree | 0eb0fa70b50807130f94dbe228d09d20707368a1 /arch/ia64 | |
| parent | Pull xpc-disengage into release branch (diff) | |
| parent | [IA64-SGI] fix bte_copy() calling get_nasid() while preemptible (diff) | |
| download | linux-dev-2d8f6a521908e3563478347aecad4ab20dc48155.tar.xz linux-dev-2d8f6a521908e3563478347aecad4ab20dc48155.zip | |
Pull fix-bte-copy into release branch
Diffstat (limited to 'arch/ia64')
| -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) 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; |