[parisc-linux-cvs] Re: 2.4.22-pa3 DIFF

[Grant Grundler]

On Tue, Aug 26, 2003 at 11:27:45PM -0600, Grant Grundler wrote:
> Log message:
> 2.4.22-pa3 fix minor build issues
> o CONFIG_CRYPTO stuff wanted to include asm/kmap_types.h (copied from ppc)
> o mtd/maps/pci.c didn't include asm/io.h before using readb/writeb/et al
> o aic79xx_osm_pci.c defines but doesn't use ahd_linux_pci_reserve_mem_region()
> unless MMAPIO was defined. -Werror in the Makefile makes this an error.
> 
> Boots and runs on my c3k. did not test any of the new stuff.

Also saw proftpd data page fault when started by the RC scripts.
It didn't fault when I started the RC scripts by hand again.

Diff for -pa3 appended.

grant


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.4/Makefile,v
retrieving revision 1.416
diff -u -p -r1.416 Makefile
--- Makefile	26 Aug 2003 16:35:23 -0000	1.416
+++ Makefile	27 Aug 2003 04:29:00 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -pa2
+EXTRAVERSION = -pa3
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/mtd/maps/pci.c
===================================================================
RCS file: /var/cvs/linux-2.4/drivers/mtd/maps/pci.c,v
retrieving revision 1.3
diff -u -p -r1.3 pci.c
--- drivers/mtd/maps/pci.c	26 Jun 2003 15:07:27 -0000	1.3
+++ drivers/mtd/maps/pci.c	27 Aug 2003 04:29:03 -0000
@@ -22,6 +22,8 @@
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
+#include <asm/io.h>	/* for read/write IO macros/protos */
+
 struct map_pci_info;
 
 struct mtd_pci_info {
Index: drivers/scsi/aic7xxx/aic79xx_osm_pci.c
===================================================================
RCS file: /var/cvs/linux-2.4/drivers/scsi/aic7xxx/aic79xx_osm_pci.c,v
retrieving revision 1.2
diff -u -p -r1.2 aic79xx_osm_pci.c
--- drivers/scsi/aic7xxx/aic79xx_osm_pci.c	25 Aug 2003 18:06:22 -0000	1.2
+++ drivers/scsi/aic7xxx/aic79xx_osm_pci.c	27 Aug 2003 04:29:10 -0000
@@ -52,9 +52,6 @@ static int	ahd_linux_pci_dev_probe(struc
 					const struct pci_device_id *ent);
 static int	ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
 						 u_long *base, u_long *base2);
-static int	ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
-						 u_long *bus_addr,
-						 uint8_t **maddr);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 static void	ahd_linux_pci_dev_remove(struct pci_dev *pdev);
 
@@ -271,6 +268,7 @@ ahd_linux_pci_reserve_io_regions(struct 
 	return (0);
 }
 
+#ifdef MMAPIO
 static int
 ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
 				 u_long *bus_addr,
@@ -318,6 +316,7 @@ ahd_linux_pci_reserve_mem_region(struct 
 		error = ENOMEM;
 	return (error);
 }
+#endif
 
 int
 ahd_pci_map_registers(struct ahd_softc *ahd)
Index: include/asm-parisc/kmap_types.h
===================================================================
RCS file: include/asm-parisc/kmap_types.h
diff -N include/asm-parisc/kmap_types.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/asm-parisc/kmap_types.h	27 Aug 2003 04:29:14 -0000
@@ -0,0 +1,18 @@
+#ifdef __KERNEL__
+#ifndef _ASM_KMAP_TYPES_H
+#define _ASM_KMAP_TYPES_H
+
+enum km_type {
+	KM_BOUNCE_READ,
+	KM_SKB_SUNRPC_DATA,
+	KM_SKB_DATA_SOFTIRQ,
+	KM_USER0,
+	KM_USER1,
+	KM_BH_IRQ,
+	KM_SOFTIRQ0,
+	KM_SOFTIRQ1,
+	KM_TYPE_NR
+};
+
+#endif
+#endif /* __KERNEL__ */