diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-27 10:04:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-27 10:04:02 -0700 |
| commit | b75ae8603568ae18f270213693758c78fb8a29ff (patch) | |
| tree | 15e6c100baadcbce6b7f9f00d50de8c2b7da4c01 /include | |
| parent | 75ca0d22668a36fc83e17407d369b528a22c562c (diff) | |
| parent | 1ee27a4eedf3cc08245d395936c1bfaf80c074cc (diff) | |
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] Make SN2 PCI code use ioremap rather than manually mangle the address
[IA64] Force error to surface in nofault code
[IA64] change sh_change_coherence oemcall to use nolock
[IA64] remove duplicate header include line
[IA64] Correct unwind validation code
[IA64] is_power_of_2-ia64/mm/hugetlbpage.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/sn/sn_sal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h index 291e8ceed6e6..d3566a298fa4 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h @@ -696,8 +696,8 @@ static inline int sn_change_coherence(u64 *new_domain, u64 *old_domain) { struct ia64_sal_retval ret_stuff; - ia64_sal_oemcall(&ret_stuff, SN_SAL_COHERENCE, (u64)new_domain, - (u64)old_domain, 0, 0, 0, 0, 0); + ia64_sal_oemcall_nolock(&ret_stuff, SN_SAL_COHERENCE, (u64)new_domain, + (u64)old_domain, 0, 0, 0, 0, 0); return ret_stuff.status; } |