diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 13:09:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-19 13:09:20 -0800 |
| commit | a5e753638874b9caabde01c8774e1a39e31cb614 (patch) | |
| tree | 89ed1ee85c49983dcc73604d88ee659e226f3dea /arch/ia64/sn/kernel/bte.c | |
| parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
| parent | ec8148de85a73a3be397a59b6d8f4f32cf2dd254 (diff) | |
| download | blackbird-op-linux-a5e753638874b9caabde01c8774e1a39e31cb614.tar.gz blackbird-op-linux-a5e753638874b9caabde01c8774e1a39e31cb614.zip | |
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] xen_domu build fix
[IA64] fixes configs and add default config for ia64 xen domU
[IA64] Remove redundant cpu_clear() in __cpu_disable path
[IA64] Revert "prevent ia64 from invoking irq handlers on offline CPUs"
[IA64] bte_copy of BTE_MAX_XFER trips BUG_ON.
[IA64] Build fix for __early_pfn_to_nid() undefined link error
Diffstat (limited to 'arch/ia64/sn/kernel/bte.c')
| -rw-r--r-- | arch/ia64/sn/kernel/bte.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c index 9456d4034024..c6d6b62db66c 100644 --- a/arch/ia64/sn/kernel/bte.c +++ b/arch/ia64/sn/kernel/bte.c @@ -97,9 +97,10 @@ bte_result_t bte_copy(u64 src, u64 dest, u64 len, u64 mode, void *notification) return BTE_SUCCESS; } - BUG_ON((len & L1_CACHE_MASK) || - (src & L1_CACHE_MASK) || (dest & L1_CACHE_MASK)); - BUG_ON(!(len < ((BTE_LEN_MASK + 1) << L1_CACHE_SHIFT))); + BUG_ON(len & L1_CACHE_MASK); + BUG_ON(src & L1_CACHE_MASK); + BUG_ON(dest & L1_CACHE_MASK); + BUG_ON(len > BTE_MAX_XFER); /* * Start with interface corresponding to cpu number |
