Messages in this thread Patches in this message | | | Date | Wed, 22 Mar 2000 00:32:27 +0100 (CET) | From | Bernhard Rosenkraenzer <> | Subject | Some compilation fixes for 2.3.99-pre3-3 |
| |
Hi, 2.3.99-pre3-3 with pretty much everything enabled as modules doesn't compile. I've attached 3 patches: 1 for all arches (mostly fixing xircom tulip stuff), 1 for alpha and 1 for sparc (they don't hurt other arches either, they're just not required there).
LLaP bero
--- linux/drivers/net/tulip/tulip.h.compile Tue Mar 21 07:50:48 2000 +++ linux/drivers/net/tulip/tulip.h Tue Mar 21 07:51:50 2000 @@ -17,7 +17,7 @@ #include <linux/spinlock.h> #include <linux/netdevice.h> #include <linux/timer.h> - +#include <asm/io.h> struct tulip_chip_table { char *chip_name; --- linux/drivers/net/pcmcia/xircom_tulip_cb.c.compile Tue Mar 21 07:55:26 2000 +++ linux/drivers/net/pcmcia/xircom_tulip_cb.c Tue Mar 21 08:37:01 2000 @@ -292,7 +292,7 @@ }; /* This matches the table above. Note 21142 == 21143. */ enum chips { -#if 0 /* these entries conflict with regular tulip driver */ +#if 1 /* these entries conflict with regular tulip driver, which doesn't matter as that's an entirely different file */ DC21040=0, DC21041=1, DC21140=2, DC21142=3, DC21143=3, LC82C168, MX98713, MX98715, MX98725, AX88140, PNIC2, COMET, COMPEX9881, X3201_3,--- linux/include/linux/delay.h.alpha Thu May 21 17:24:09 1998 +++ linux/include/linux/delay.h Sat Mar 18 19:54:52 2000 @@ -9,6 +9,7 @@ extern unsigned long loops_per_sec; +#include <linux/sched.h> #include <asm/delay.h> /* --- linux/include/asm-alpha/smp.h.alpha Sat Mar 18 19:22:18 2000 +++ linux/include/asm-alpha/smp.h Sat Mar 18 19:23:26 2000 @@ -2,6 +2,7 @@ #define __ASM_SMP_H #include <asm/pal.h> +#include <asm/current.h> /* HACK: Cabrio WHAMI return value is bogus if more than 8 bits used.. :-( */ --- linux/include/asm-alpha/current.h.alpha Wed May 14 01:41:15 1997 +++ linux/include/asm-alpha/current.h Sat Mar 18 19:22:19 2000 @@ -1,6 +1,8 @@ #ifndef _ALPHA_CURRENT_H #define _ALPHA_CURRENT_H +struct task_struct; + register struct task_struct *current __asm__("$8"); #endif /* !(_ALPHA_CURRENT_H) */ --- linux/include/asm-alpha/semaphore.h.alpha Sat Mar 18 19:51:21 2000 +++ linux/include/asm-alpha/semaphore.h Sat Mar 18 19:54:48 2000 @@ -11,6 +11,7 @@ #include <asm/current.h> #include <asm/system.h> #include <asm/atomic.h> +#include <linux/wait.h> struct semaphore { /* Careful, inline assembly knows about the position of these two. */ --- linux/drivers/block/md.c.alpha Wed Feb 23 12:13:52 2000 +++ linux/drivers/block/md.c Sat Mar 18 19:22:19 2000 @@ -37,7 +37,10 @@ #include <asm/unaligned.h> extern asmlinkage int sys_sched_yield(void); +#if !defined(__alpha__) /* Alpha defines this in asm/unistd.h, with a + different return type (long) */ extern asmlinkage int sys_setsid(void); +#endif extern unsigned long io_events[MAX_BLKDEV]; --- linux/drivers/scsi/sym53c8xx_comm.h.alpha Sun Mar 12 23:10:20 2000 +++ linux/drivers/scsi/sym53c8xx_comm.h Sat Mar 18 19:26:47 2000 @@ -1180,32 +1180,32 @@ ** IO mapped only input / ouput */ -#define INB_OFF(o) inb (np->base_io + ncr_offb(o)) -#define OUTB_OFF(o, val) outb ((val), np->base_io + ncr_offb(o)) +#define INB_OFF(o) inb (np->port + ncr_offb(o)) +#define OUTB_OFF(o, val) outb ((val), np->port + ncr_offb(o)) #if defined(__BIG_ENDIAN) && !defined(SCSI_NCR_BIG_ENDIAN) -#define INW_OFF(o) inw_l2b (np->base_io + ncr_offw(o)) -#define INL_OFF(o) inl_l2b (np->base_io + (o)) +#define INW_OFF(o) inw_l2b (np->port + ncr_offw(o)) +#define INL_OFF(o) inl_l2b (np->port + (o)) -#define OUTW_OFF(o, val) outw_b2l ((val), np->base_io + ncr_offw(o)) -#define OUTL_OFF(o, val) outl_b2l ((val), np->base_io + (o)) +#define OUTW_OFF(o, val) outw_b2l ((val), np->port + ncr_offw(o)) +#define OUTL_OFF(o, val) outl_b2l ((val), np->port + (o)) #elif defined(__LITTLE_ENDIAN) && defined(SCSI_NCR_BIG_ENDIAN) -#define INW_OFF(o) inw_b2l (np->base_io + ncr_offw(o)) -#define INL_OFF(o) inl_b2l (np->base_io + (o)) +#define INW_OFF(o) inw_b2l (np->port + ncr_offw(o)) +#define INL_OFF(o) inl_b2l (np->port + (o)) -#define OUTW_OFF(o, val) outw_l2b ((val), np->base_io + ncr_offw(o)) -#define OUTL_OFF(o, val) outl_l2b ((val), np->base_io + (o)) +#define OUTW_OFF(o, val) outw_l2b ((val), np->port + ncr_offw(o)) +#define OUTL_OFF(o, val) outl_l2b ((val), np->port + (o)) #else -#define INW_OFF(o) inw_raw (np->base_io + ncr_offw(o)) -#define INL_OFF(o) inl_raw (np->base_io + (o)) +#define INW_OFF(o) inw_raw (np->port + ncr_offw(o)) +#define INL_OFF(o) inl_raw (np->port + (o)) -#define OUTW_OFF(o, val) outw_raw ((val), np->base_io + ncr_offw(o)) -#define OUTL_OFF(o, val) outl_raw ((val), np->base_io + (o)) +#define OUTW_OFF(o, val) outw_raw ((val), np->port + ncr_offw(o)) +#define OUTL_OFF(o, val) outl_raw ((val), np->port + (o)) #endif /* ENDIANs */ @@ -1281,7 +1281,7 @@ u_long io_port; int irq; /* port and reg fields to use INB, OUTB macros */ - u_long base_io; + u_long port; volatile struct ncr_reg *reg; } ncr_slot; @@ -1798,7 +1798,7 @@ */ #ifdef NCR_IOMAPPED request_region(devp->slot.io_port, 128, NAME53C8XX); - devp->slot.base_io = devp->slot.io_port; + devp->slot.port = devp->slot.io_port; #else devp->slot.reg = (struct ncr_reg *) remap_pci_mem(devp->slot.base, 128); if (!devp->slot.reg) @@ -1823,7 +1823,7 @@ ** Release access to chip IO registers */ #ifdef NCR_IOMAPPED - release_region(devp->slot.base_io, 128); + release_region(devp->slot.port, 128); #else unmap_pci_mem((u_long) devp->slot.reg, 128ul); #endif--- linux/include/asm-sparc64/vga.h.sparc Thu Feb 25 13:02:12 1999 +++ linux/include/asm-sparc64/vga.h Mon Mar 20 16:12:25 2000 @@ -8,6 +8,8 @@ #define _LINUX_ASM_VGA_H_ #define VT_BUF_HAVE_RW +#undef scr_writew +#undef scr_readw static inline void scr_writew(u16 val, u16 *addr) { --- linux/drivers/atm/fore200e.c.sparc Mon Feb 21 19:32:27 2000 +++ linux/drivers/atm/fore200e.c Mon Mar 20 15:26:15 2000 @@ -750,7 +750,7 @@ static u32 fore200e_sba_dma_map(struct fore200e* fore200e, void* virt_addr, int size) { - u32 dma_addr = sbus_map_single((struct sbus_dev*)fore200e->bus_dev, virt_addr, size); + u32 dma_addr = sbus_map_single((struct sbus_dev*)fore200e->bus_dev, virt_addr, size, SBUS_DMA_TODEVICE); DPRINTK(3, "SBUS DVMA mapping: virt_addr = 0x%p, size = %d --> dma_addr = 0x%08x\n", virt_addr, size, dma_addr); @@ -763,7 +763,7 @@ { DPRINTK(3, "SBUS DVMA unmapping: dma_addr = 0x%08x, size = %d\n", dma_addr, size); - sbus_unmap_single((struct sbus_dev*)fore200e->bus_dev, dma_addr, size); + sbus_unmap_single((struct sbus_dev*)fore200e->bus_dev, dma_addr, size, SBUS_DMA_TODEVICE); } @@ -772,7 +772,7 @@ { DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d\n", dma_addr, size); - sbus_dma_sync_single((struct sbus_dev*)fore200e->bus_dev, dma_addr, size); + sbus_dma_sync_single((struct sbus_dev*)fore200e->bus_dev, dma_addr, size, SBUS_DMA_TODEVICE); } | |