Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.298
diff -u -p -r1.298 Makefile
--- Makefile	18 Nov 2004 17:29:16 -0000	1.298
+++ Makefile	20 Nov 2004 23:33:42 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 10
-EXTRAVERSION =-rc1-pa16
+EXTRAVERSION =-rc1-pa17
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
Index: arch/parisc/kernel/drivers.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/kernel/drivers.c,v
retrieving revision 1.16
diff -u -p -r1.16 drivers.c
--- arch/parisc/kernel/drivers.c	3 Nov 2004 19:26:45 -0000	1.16
+++ arch/parisc/kernel/drivers.c	20 Nov 2004 23:33:43 -0000
@@ -366,6 +366,8 @@ struct parisc_device * create_tree_node(
 	setup_bus_id(dev);
 
 	dev->dev.bus = &parisc_bus_type;
+	dev->dma_mask = 0xffffffffUL;	/* PARISC devices are 32-bit */
+
 	/* make the generic dma mask a pointer to the parisc one */
 	dev->dev.dma_mask = &dev->dma_mask;
 	dev->dev.coherent_dma_mask = dev->dma_mask;
Index: drivers/parisc/lba_pci.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/parisc/lba_pci.c,v
retrieving revision 1.19
diff -u -p -r1.19 lba_pci.c
--- drivers/parisc/lba_pci.c	17 Nov 2004 22:17:42 -0000	1.19
+++ drivers/parisc/lba_pci.c	20 Nov 2004 23:33:44 -0000
@@ -1656,8 +1656,9 @@ lba_set_iregs(struct parisc_device *lba,
 
 	imask <<= 2;	/* adjust for hints - 2 more bits */
 
-	WARN_ON((ibase & 0x003fffff) == 0);
-	WARN_ON((imask & 0x003fffff) == 0);
+	/* Make sure we aren't trying to set bits that aren't writeable. */
+	WARN_ON((ibase & 0x001fffff) != 0);
+	WARN_ON((imask & 0x001fffff) != 0);
 	
 	DBG("%s() ibase 0x%x imask 0x%x\n", __FUNCTION__, ibase, imask);
 	WRITE_REG32( imask, base_addr + LBA_IMASK);
Index: include/asm-parisc/pci.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-parisc/pci.h,v
retrieving revision 1.13
diff -u -p -r1.13 pci.h
--- include/asm-parisc/pci.h	17 Nov 2004 18:07:08 -0000	1.13
+++ include/asm-parisc/pci.h	20 Nov 2004 23:33:46 -0000
@@ -118,8 +118,9 @@ struct pci_dev;
 #else
 
 #if defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA)
+extern int parisc_bus_is_phys; 	/* in arch/parisc/kernel/setup.c */
 #define PCI_DMA_BUS_IS_PHYS	parisc_bus_is_phys
-#define parisc_has_iommu()	do { parisc_bus_is_phys = 1; } while (0)
+#define parisc_has_iommu()	do { parisc_bus_is_phys = 0; } while (0)
 #else
 #define PCI_DMA_BUS_IS_PHYS	1
 #define parisc_has_iommu()	do { } while (0)