diff options
| author | Robin Holt <holt@sgi.com> | 2008-09-09 10:34:44 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-09-10 10:48:06 -0700 |
| commit | 47633cf0d60bde5581d039ac1283ef4377a6e782 (patch) | |
| tree | 4ee01efb3f2bdaeb5e085a126ba369bbc447a006 /arch/ia64/include/asm/sn | |
| parent | 4611a771fc8e5ad77d27f25268846abb425101a0 (diff) | |
| download | linux-3.10-47633cf0d60bde5581d039ac1283ef4377a6e782.tar.gz linux-3.10-47633cf0d60bde5581d039ac1283ef4377a6e782.tar.bz2 linux-3.10-47633cf0d60bde5581d039ac1283ef4377a6e782.zip | |
[IA64] fix up bte.h
bte.h expects a #define of L1_CACHE_MASK which is currently only
in bte.c. This small patch gets bte.h to include cleanly and makes
BTE_UNALIGNED_COPY not report errors.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include/asm/sn')
| -rw-r--r-- | arch/ia64/include/asm/sn/bte.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/sn/bte.h b/arch/ia64/include/asm/sn/bte.h index a0d214f4311..5efecf06c9a 100644 --- a/arch/ia64/include/asm/sn/bte.h +++ b/arch/ia64/include/asm/sn/bte.h @@ -223,10 +223,11 @@ extern void bte_error_handler(unsigned long); * until the transfer is complete. In order to get the asynch * version of bte_copy, you must perform this check yourself. */ -#define BTE_UNALIGNED_COPY(src, dest, len, mode) \ - (((len & L1_CACHE_MASK) || (src & L1_CACHE_MASK) || \ - (dest & L1_CACHE_MASK)) ? \ - bte_unaligned_copy(src, dest, len, mode) : \ +#define BTE_UNALIGNED_COPY(src, dest, len, mode) \ + (((len & (L1_CACHE_BYTES - 1)) || \ + (src & (L1_CACHE_BYTES - 1)) || \ + (dest & (L1_CACHE_BYTES - 1))) ? \ + bte_unaligned_copy(src, dest, len, mode) : \ bte_copy(src, dest, len, mode, NULL)) |