diff options
| author | Robin Holt <holt@sgi.com> | 2009-02-03 18:40:59 -0600 |
|---|---|---|
| committer | Tony Luck <aegl@agluck-desktop.(none)> | 2009-02-19 11:29:31 -0800 |
| commit | 39d481cba27809598e755e184bc0d8ae1d22423e (patch) | |
| tree | 15087a039ccdb05749e099e1a1a7ae39e3887a55 /arch/ia64/sn/kernel | |
| parent | 334f85b647bc46ff4d27ace55aa65f44d6a2f4db (diff) | |
| download | blackbird-op-linux-39d481cba27809598e755e184bc0d8ae1d22423e.tar.gz blackbird-op-linux-39d481cba27809598e755e184bc0d8ae1d22423e.zip | |
[IA64] bte_copy of BTE_MAX_XFER trips BUG_ON.
BTE_MAX_XFER is wrong. It is one greater than the number of cache
lines the BTE is actually able to transfer. If you request a transfer
of exactly BTE_MAX_XFER size, you trip a very cryptic BUG_ON() which
should certainly be made more clear.
This patch fixes that constant and also cleans up the BUG_ON()s in
arch/ia64/sn/kernel/bte.c to test one condition per line.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <aegl@agluck-desktop.(none)>
Diffstat (limited to 'arch/ia64/sn/kernel')
| -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 |
