diff options
| author | davem <davem> | 2001-12-11 07:08:08 +0000 |
|---|---|---|
| committer | davem <davem> | 2001-12-11 07:08:08 +0000 |
| commit | 51a4a910041c2c137a61b98f1d134def6ee17a0d (patch) | |
| tree | 2c9518bd79ae843f303f406c27eb6bda8b7f945a | |
| parent | 414ce907724d3059d11d18410b6b64d56866c95a (diff) | |
| download | netdev-vger-cvs-51a4a910041c2c137a61b98f1d134def6ee17a0d.tar.gz | |
Allow to compile with DMA_CHUNK_SIZE undefined.
| -rw-r--r-- | include/asm-sparc64/io.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h index da391b908..010881767 100644 --- a/include/asm-sparc64/io.h +++ b/include/asm-sparc64/io.h @@ -1,4 +1,4 @@ -/* $Id: io.h,v 1.43 2001-12-11 06:11:53 davem Exp $ */ +/* $Id: io.h,v 1.44 2001-12-11 07:08:08 davem Exp $ */ #ifndef __SPARC64_IO_H #define __SPARC64_IO_H @@ -21,8 +21,13 @@ extern unsigned long bus_to_virt_not_defined_use_pci_map(volatile void *addr); extern unsigned long phys_base; #define page_to_phys(page) ((((page) - mem_map) << PAGE_SHIFT)+phys_base) +#ifdef DMA_CHUNK_SIZE #define BIOVEC_MERGEABLE(vec1, vec2) \ ((((bvec_to_phys((vec1)) + (vec1)->bv_len) | bvec_to_phys((vec2))) & (DMA_CHUNK_SIZE - 1)) == 0) +#else +#define BIOVEC_MERGEABLE(vec1, vec2) \ + ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) +#endif /* Different PCI controllers we support have their PCI MEM space * mapped to an either 2GB (Psycho) or 4GB (Sabre) aligned area, |