diff -urNp ref/include/asm-ia64/dma.h 2.4.20pre7aa1/include/asm-ia64/dma.h --- ref/include/asm-ia64/dma.h Tue May 1 19:35:30 2001 +++ 2.4.20pre7aa1/include/asm-ia64/dma.h Wed Sep 18 00:04:04 2002 @@ -12,6 +12,10 @@ extern unsigned long MAX_DMA_ADDRESS; +/* These are in kernel/dma.c: */ +extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ +extern void free_dma(unsigned int dmanr); /* release it again */ + #ifdef CONFIG_PCI extern int isa_dma_bridge_buggy; #else diff -urNp ref/include/asm-ia64/pci.h 2.4.20pre7aa1/include/asm-ia64/pci.h --- ref/include/asm-ia64/pci.h Fri Sep 13 06:13:54 2002 +++ 2.4.20pre7aa1/include/asm-ia64/pci.h Wed Sep 18 00:04:42 2002 @@ -60,6 +60,11 @@ pcibios_penalize_isa_irq (int irq) #define pci_unmap_len(ptr, len_name) ((ptr)->len_name) #define pci_unmap_len_set(ptr, len_name, val) (((ptr)->len_name) = (val)) +/* The PCI address space does equal the physical memory address space. + The networking and block device layers use this boolean for bounce buffer + decisions. */ +#define PCI_DMA_BUS_IS_PHYS (1) + #define pci_map_page(dev,pg,off,size,dir) \ pci_map_single((dev), page_address(pg) + (off), (size), (dir)) #define pci_unmap_page(dev,dma_addr,size,dir) \ diff -urNp ref/include/asm-ia64/types.h 2.4.20pre7aa1/include/asm-ia64/types.h --- ref/include/asm-ia64/types.h Sat Apr 22 00:21:24 2000 +++ 2.4.20pre7aa1/include/asm-ia64/types.h Wed Sep 18 00:04:04 2002 @@ -63,6 +63,7 @@ typedef __u64 u64; /* DMA addresses are 64-bits wide, in general. */ typedef u64 dma_addr_t; +typedef u64 dma64_addr_t; # endif /* __KERNEL__ */ #endif /* !__ASSEMBLY__ */