Compile problems in 1.3.70

Peter Jones (thanatos@drealm.org)
Sat, 02 Mar 1996 18:29:40 +0000


This is a multi-part message in MIME format.

--------------1EEC1A46694123974CF8DE60
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hey!

Patch 1.3.70 went in clean!!

However, I needed three changes to get it to compile - see the attached patch.

I've also attached my .config - I include as much as possible as a module, just so I can run the compiler
of the code. The compiler, in this case, is GCC 2.7.0.

-- Peter

-- 
Drealm Conference System -- (+44) 181 568 2204 (V.FC)
The home of drealmBBS -------- six lines -- live chat

--------------1EEC1A46694123974CF8DE60 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs"

diff -ru linux-1.3.70/drivers/isdn/teles/card.c linux/drivers/isdn/teles/card.c --- linux-1.3.70/drivers/isdn/teles/card.c Sat Mar 2 18:11:09 1996 +++ linux/drivers/isdn/teles/card.c Sat Mar 2 17:06:48 1996 @@ -1530,7 +1530,7 @@ save_flags(flags); cli(); if (request_irq(card->interrupt, &teles_interrupt, - SA_INTERRUPT, "teles")) { + SA_INTERRUPT, "teles", NULL)) { printk(KERN_WARNING "Teles couldn't get interrupt %d\n", card->interrupt); restore_flags(flags); @@ -1547,7 +1547,7 @@ struct IsdnCard *card = cards + cardnr; irq2dev_map[card->interrupt] = NULL; - free_irq(card->interrupt); + free_irq(card->interrupt, NULL); } void diff -ru linux-1.3.70/drivers/net/3c503.c linux/drivers/net/3c503.c --- linux-1.3.70/drivers/net/3c503.c Sat Mar 2 18:11:09 1996 +++ linux/drivers/net/3c503.c Sat Mar 2 16:33:44 1996 @@ -38,6 +38,7 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/errno.h> +#include <linux/in.h> #include <linux/string.h> #include <linux/delay.h> #include <linux/netdevice.h> @@ -435,7 +436,7 @@ { unsigned short int *wrd; int boguscount; /* timeout counter */ - unsigned shor tmp_rev; /* temporary for reversed values */ + unsigned short tmp_rev; /* temporary for reversed values */ if (ei_status.word16) /* Tx packets go into bank 0 on EL2/16 card */ outb(EGACFR_RSEL|EGACFR_TCM, E33G_GACFR); diff -ru linux-1.3.70/drivers/scsi/ultrastor.c linux/drivers/scsi/ultrastor.c --- linux-1.3.70/drivers/scsi/ultrastor.c Sat Mar 2 18:11:22 1996 +++ linux/drivers/scsi/ultrastor.c Sat Mar 2 16:55:02 1996 @@ -884,7 +884,7 @@ printk("Ux4F: abort while completed command pending\n"); restore_flags(flags); cli(); - ultrastor_interrupt(0, NULL); + ultrastor_interrupt(0, NULL, NULL); restore_flags(flags); return SCSI_ABORT_SUCCESS; /* FIXME - is this correct? -ERY */ }

--------------1EEC1A46694123974CF8DE60 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Config-1.3.70"

# # Automatically generated make config: don't edit #

# # Loadable module support # CONFIG_MODULES=y # CONFIG_MODVERSIONS is not set CONFIG_KERNELD=y

# # General setup # # CONFIG_MATH_EMULATION is not set CONFIG_NET=y # CONFIG_MAX_16M is not set CONFIG_PCI=y CONFIG_PCI_OPTIMIZE=y CONFIG_SYSVIPC=y CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_ELF=y CONFIG_KERNEL_ELF=y CONFIG_M486=y

# # Floppy, IDE, and other block devices # CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV_IDE=y

# # Please see drivers/block/README.ide for help/info on IDE drives # # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=y CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_RZ1000=y # CONFIG_BLK_DEV_TRITON is not set # CONFIG_IDE_CHIPSETS is not set CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_LOOP=m # CONFIG_BLK_DEV_XD is not set CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=m CONFIG_MD_STRIPED=m

# # Networking options # CONFIG_FIREWALL=y CONFIG_NET_ALIAS=y CONFIG_INET=y CONFIG_IP_FORWARD=y CONFIG_IP_MULTICAST=y CONFIG_IP_FIREWALL=y CONFIG_IP_ACCT=y # CONFIG_IP_ROUTER is not set CONFIG_NET_IPIP=m CONFIG_IP_FIREWALL_VERBOSE=y CONFIG_IP_MASQUERADE=y # CONFIG_IP_MROUTE is not set CONFIG_IP_ALIAS=m

# # (it is safe to leave these untouched) # # CONFIG_INET_PCTCP is not set CONFIG_INET_RARP=m # CONFIG_NO_PATH_MTU_DISCOVERY is not set # CONFIG_TCP_NAGLE_OFF is not set CONFIG_IP_NOSR=y CONFIG_SKB_LARGE=y

# # # CONFIG_IPX=y CONFIG_IPX_INTERN=y CONFIG_ATALK=y CONFIG_AX25=y CONFIG_BPQETHER=y CONFIG_NETROM=y CONFIG_NETLINK=y CONFIG_RTNETLINK=y

# # SCSI support # CONFIG_SCSI=y

# # SCSI support type (disk, tape, CDrom) # CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=m CONFIG_CHR_DEV_SG=m

# # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y

# # SCSI low-level drivers # CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_AHA152X=m CONFIG_SCSI_AHA1542=y CONFIG_SCSI_AHA1740=m CONFIG_SCSI_AIC7XXX=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_EATA_DMA=m CONFIG_SCSI_EATA_PIO=m CONFIG_SCSI_U14_34F=m CONFIG_SCSI_FUTURE_DOMAIN=m CONFIG_SCSI_GENERIC_NCR5380=m # CONFIG_SCSI_GENERIC_NCR53C400 is not set CONFIG_SCSI_G_NCR5380_MEM=y CONFIG_SCSI_NCR53C7xx=m CONFIG_SCSI_IN2000=m CONFIG_SCSI_PAS16=m CONFIG_SCSI_QLOGIC=m CONFIG_SCSI_SEAGATE=m CONFIG_SCSI_T128=m CONFIG_SCSI_ULTRASTOR=m CONFIG_SCSI_7000FASST=m CONFIG_SCSI_EATA=m CONFIG_SCSI_NCR53C406A=m # CONFIG_SCSI_AM53C974 is not set

# # Network device support # CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_SLIP=m CONFIG_SLIP_COMPRESSED=y CONFIG_SLIP_SMART=y CONFIG_PPP=m

# # CCP compressors for PPP are only built as modules. # CONFIG_SCC=m CONFIG_PLIP=m CONFIG_EQUALIZER=m CONFIG_NET_ALPHA=y CONFIG_NET_VENDOR_SMC=y CONFIG_WD80x3=m CONFIG_ULTRA=m # CONFIG_LANCE is not set CONFIG_NET_VENDOR_3COM=y # CONFIG_EL1 is not set CONFIG_EL2=y # CONFIG_ELPLUS is not set # CONFIG_EL16 is not set # CONFIG_EL3 is not set # CONFIG_VORTEX is not set CONFIG_NET_ISA=y CONFIG_E2100=m CONFIG_DEPCA=m CONFIG_EWRK3=m # CONFIG_SEEQ8005 is not set CONFIG_AT1700=m CONFIG_EEXPRESS_PRO=m CONFIG_EEXPRESS=m CONFIG_NI52=m # CONFIG_NI65 is not set CONFIG_WAVELAN=m CONFIG_ETH16I=m CONFIG_HPLAN_PLUS=m CONFIG_HPLAN=m CONFIG_HP100=m CONFIG_NE2000=m # CONFIG_PI is not set # CONFIG_PT is not set # CONFIG_SK_G16 is not set CONFIG_NET_EISA=y CONFIG_AC3200=m CONFIG_APRICOT=m CONFIG_DE4X5=m # CONFIG_ZNET is not set CONFIG_NET_POCKET=y # CONFIG_ATP is not set CONFIG_DE600=m CONFIG_DE620=m CONFIG_TR=y CONFIG_IBMTR=m CONFIG_ARCNET=m

# # ISDN subsystem # CONFIG_ISDN=m CONFIG_ISDN_PPP=y CONFIG_ISDN_PPP_VJ=y CONFIG_ISDN_MPP=y CONFIG_ISDN_DRV_TELES=m CONFIG_ISDN_DRV_ICN=m

# # CD-ROM drivers (not for SCSI or IDE/ATAPI drives) # CONFIG_CD_NO_IDESCSI=y CONFIG_CDU31A=m CONFIG_MCD=m CONFIG_MCDX=m CONFIG_SBPCD=m CONFIG_AZTCD=m CONFIG_CDU535=m CONFIG_GSCD=m CONFIG_CM206=m CONFIG_OPTCD=m CONFIG_SJCD=m CONFIG_CDI_INIT=y CONFIG_ISP16_CDI=m

# # Filesystems # # CONFIG_QUOTA is not set CONFIG_MINIX_FS=m CONFIG_EXT_FS=m CONFIG_EXT2_FS=y CONFIG_XIA_FS=m CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_UMSDOS_FS=m CONFIG_PROC_FS=y CONFIG_NFS_FS=y # CONFIG_ROOT_NFS is not set CONFIG_SMB_FS=m CONFIG_NCP_FS=m CONFIG_ISO9660_FS=y CONFIG_HPFS_FS=m CONFIG_SYSV_FS=m

# # Character devices # CONFIG_SERIAL=y CONFIG_CYCLADES=m CONFIG_STALDRV=y CONFIG_STALLION=m CONFIG_ISTALLION=m CONFIG_PRINTER=m CONFIG_BUSMOUSE=m CONFIG_PSMOUSE=m # CONFIG_82C710_MOUSE is not set CONFIG_MS_BUSMOUSE=m CONFIG_ATIXL_BUSMOUSE=m # CONFIG_QIC02_TAPE is not set CONFIG_APM=y # CONFIG_APM_IGNORE_USER_SUSPEND is not set CONFIG_APM_DO_ENABLE=y CONFIG_APM_CPU_IDLE=y CONFIG_APM_DISPLAY_BLANK=y # CONFIG_WATCHDOG is not set

# # Sound # CONFIG_SOUND=m

# # Kernel hacking # # CONFIG_PROFILE is not set

--------------1EEC1A46694123974CF8DE60--