diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 04:12:11 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 04:12:11 +0400 |
| commit | 9129d6ea475b7e9f216c8324ea05b7a0d8aba540 (patch) | |
| tree | 88727e330f6f936d8850a99e711133bb4c97b8e3 /arch/ia64/sn/kernel/xpc_channel.c | |
| parent | 18f2905fcec3e06deafd25a02e37eabaaaaef744 (diff) | |
| parent | c57d68caeed7bc335e6d35c951a9abae733a580b (diff) | |
| download | linux-9129d6ea475b7e9f216c8324ea05b7a0d8aba540.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Increase default nodes shift to 10, nr_cpus to 1024
[IA64] remove redundant local_irq_save() calls from sn_sal.h
[IA64] panic if topology_init kzalloc fails
[IA64-SGI] Silent data corruption caused by XPC V2.
Diffstat (limited to 'arch/ia64/sn/kernel/xpc_channel.c')
| -rw-r--r-- | arch/ia64/sn/kernel/xpc_channel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/xpc_channel.c b/arch/ia64/sn/kernel/xpc_channel.c index c2f69f7942af..1f3540826e68 100644 --- a/arch/ia64/sn/kernel/xpc_channel.c +++ b/arch/ia64/sn/kernel/xpc_channel.c @@ -279,8 +279,8 @@ xpc_pull_remote_cachelines(struct xpc_partition *part, void *dst, return part->reason; } - bte_ret = xp_bte_copy((u64) src, (u64) ia64_tpa((u64) dst), - (u64) cnt, (BTE_NORMAL | BTE_WACQUIRE), NULL); + bte_ret = xp_bte_copy((u64) src, (u64) dst, (u64) cnt, + (BTE_NORMAL | BTE_WACQUIRE), NULL); if (bte_ret == BTE_SUCCESS) { return xpcSuccess; } |