OK, here it goes again. The last time around I screwed up making the patch,
sorry about that.
The patch to sbus_unmap_single() is done on the theory that the least
generic types mentioned for the arguments are probably right, please
check. No new warnings now (at least here).
--- linux-2.4.0-test/kernel/signal.c.dist-2.4.0-test8-pre1 Tue Aug 29 21:04:20 2000
+++ linux-2.4.0-test/kernel/signal.c Wed Aug 30 08:14:59 2000
@@ -364,7 +364,6 @@
recalc_sigpending(t);
break;
}
- return 0;
}
static int deliver_signal(int sig, struct siginfo *info, struct task_struct *t)
--- linux-2.4.0-test/include/asm-sparc/sbus.h.dist-2.4.0-test8-pre1 Tue Aug 29 21:22:02 2000
+++ linux-2.4.0-test/include/asm-sparc/sbus.h Wed Aug 30 08:16:41 2000
@@ -112,7 +112,7 @@
/* All the rest use streaming mode mappings. */
extern u32 sbus_map_single(struct sbus_dev *, void *, long, int);
-extern void sbus_unmap_single(struct sbus_dev *, u32, long, int);
+extern void sbus_unmap_single(struct sbus_dev *, dma_addr_t, size_t, int);
extern int sbus_map_sg(struct sbus_dev *, struct scatterlist *, int, int);
extern void sbus_unmap_sg(struct sbus_dev *, struct scatterlist *, int, int);
--- linux-2.4.0-test/drivers/sbus/audio/amd7930.c.dist-2.4.0-test8-pre1 Wed Aug 30 08:18:43 2000
+++ linux-2.4.0-test/drivers/sbus/audio/amd7930.c Wed Aug 30 08:19:12 2000
@@ -1156,7 +1156,7 @@
return info->liu_state;
}
-static void amd7930_liu_init(int dev, void (*callback)(), void *callback_arg)
+static void amd7930_liu_init(int dev, void (*callback)(void *), void *callback_arg)
{
struct amd7930_info *info;
unsigned long flags;
--- linux-2.4.0-test/drivers/sbus/audio/dbri.c.dist-2.4.0-test8-pre1 Fri Feb 18 20:07:20 2000
+++ linux-2.4.0-test/drivers/sbus/audio/dbri.c Wed Aug 30 08:21:50 2000
@@ -2228,7 +2228,6 @@
{
struct dbri *dbri;
struct linux_prom_irqs irq;
- __u32 dma_dvma;
int err;
if (sdev->prom_name[9] < 'e') {
--- linux-2.4.0-test/arch/sparc/kernel/ioport.c.dist-2.4.0-test8-pre1 Thu Jun 22 10:21:12 2000
+++ linux-2.4.0-test/arch/sparc/kernel/ioport.c Wed Aug 30 08:25:40 2000
@@ -397,7 +397,7 @@
#endif
}
-void sbus_unmap_single(struct sbus_dev *sdev, u32 ba, long n, int direction)
+void sbus_unmap_single(struct sbus_dev *sdev, dma_addr_t ba, size_t n, int direction)
{
#if 0 /* This is the version that abuses consistent space */
struct resource *res;
--- linux-2.4.0-test/arch/sparc/mm/init.c.dist-2.4.0-test8-pre1 Thu Aug 10 15:43:12 2000
+++ linux-2.4.0-test/arch/sparc/mm/init.c Wed Aug 30 08:23:30 2000
@@ -89,8 +89,6 @@
void __init kmap_init(void)
{
- unsigned long pteval;
-
/* cache the first kmap pte */
kmap_pte = kmap_get_fixed_pte(FIX_KMAP_BEGIN);
kmap_prot = __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE);
-- Dr. Horst H. von Brand mailto:vonbrand@inf.utfsm.cl Departamento de Informatica Fono: +56 32 654431 Universidad Tecnica Federico Santa Maria +56 32 654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Aug 30 2000 - 13:52:32 EDT