Date: Sun, 21 Sep 1997 11:34:15 -0400 (EDT) From: Chris Wiener <cwiener@crlabs.com> To: freebsd-current@freebsd.org Cc: peter@freebsd.org Subject: problems with vm_zone, zlib, and PPP_DEFLATE Message-ID: <199709211534.LAA18602@crlabs.com>
next in thread | raw e-mail | index | archive | help
The recent vm changes have caused a kernel build to fail due to an apparent conflict between the vm code's and the zlib code's usage of the following variables: /sys/net/ppp_deflate.c: (see also /usr/include/zlib.h) static void *zalloc __P((void *, u_int items, u_int size)); static void zfree __P((void *, void *ptr, u_int nb)); sys/vm/vm_zone.h: static void * zalloc __P((vm_zone_t z)); static void zfree __P((vm_zone_t z, void *item)); crlabs# make cc -c -O -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -nostdinc -I- -I. -I../.. -I../../../include -DPOWERFAIL_NMI -DINET -DMSDOSFS -DNFS -DFFS -DMD5 -DCOMPAT_43 -DKERNEL -include opt_global.h ../../net/ppp_deflate.c ../../net/ppp_deflate.c:63: conflicting types for `zalloc' ../../vm/vm_zone.h:122: previous declaration of `zalloc' ../../net/ppp_deflate.c:63: warning: redundant redeclaration of `zalloc' in same scope ../../vm/vm_zone.h:122: warning: previous declaration of `zalloc' ../../net/ppp_deflate.c:64: conflicting types for `zfree' ../../vm/vm_zone.h:132: previous declaration of `zfree' ../../net/ppp_deflate.c:64: warning: redundant redeclaration of `zfree' in same scope ../../vm/vm_zone.h:132: warning: previous declaration of `zfree' ../../net/ppp_deflate.c:107: redefinition of `zalloc' ../../net/ppp_deflate.c:63: `zalloc' previously defined here ../../net/ppp_deflate.c:118: redefinition of `zfree' ../../net/ppp_deflate.c:64: `zfree' previously defined here *** Error code 1 Stop. Script done on Sun Sep 21 11:19:59 1997 # # LAPTOP-SOUND # # $Id: LAPTOP-SOUND,v 1.362 1997/09/04 23:03:09 yokota Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from # this file as required. # machine "i386" ident LAPTOP-SOUND maxusers 10 config kernel root on wd0 dumps on wd0 cpu "I386_CPU" cpu "I486_CPU" cpu "I586_CPU" # aka Pentium(tm) options "CPU_FASTER_5X86_FPU" options GPL_MATH_EMULATE #Support for x87 emulation via #new math emulator options "COMPAT_43" options USER_LDT #allow user-level control of i386 ldt options SYSVSHM options SYSVSEM options SYSVMSG options "MD5" options "VM86" options PERFMON options UCONSOLE options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support options MROUTING # Multicast routing options FFS #Fast filesystem options NFS #Network File System options "CD9660" #ISO 9660 filesystem options MSDOSFS #MS DOS File System options INET #InterNETworking options USERCONFIG #boot -c editor options VISUAL_USERCONFIG #visual boot -c editor options INCLUDE_CONFIG_FILE # Include this file in kernel pseudo-device ether #Generic Ethernet pseudo-device loop #Network loopback device pseudo-device sl 2 #Serial Line IP pseudo-device ppp 2 #Point-to-point protocol pseudo-device bpfilter 6 #Berkeley packet filter pseudo-device tun 1 #Tunnel driver(user process ppp) pseudo-device pty 16 #Pseudo ttys - can go as high as 256 pseudo-device log #Kernel syslog interface (/dev/klog) pseudo-device gzip #Exec gzipped a.out's pseudo-device vn #Vnode driver (turns a file into a device) pseudo-device snp 3 #Snoop device - to look at pty/vty/etc.. controller isa0 #device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint #options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 #options PCVT_NSCREENS=16 #options XSERVER # support for running an X server. #options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops #options PCVT_SCANSET=2 # IBM keyboards are non-std device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr options MAXCONS=16 # number of virtual consoles #options SLOW_VGA # do byte-wide i/o's to TS and GDC regs #options "STD8X16FONT" # Compile font in #makeoptions "STD8X16FONT"="cp850" options SC_HISTORY_SIZE=200 # number of history buffer lines options ATAPI #Enable ATAPI support for IDE bus options ATAPI_STATIC #Don't do it as an LKM options POWERFAIL_NMI # make it beep instead of panicing options PSM_CHECKSYNC #checks the header byte for sync. options PSM_HOOKAPM #hook the APM resume event, useful #for some laptops options PSM_RESETAFTERSUSPEND #reset the device at the resume event device npx0 at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13 vector npxintr controller wdc0 at isa? port "IO_WD1" bio irq 14 vector wdintr disk wd0 at wdc0 drive 0 device wcd0 controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fdc0 drive 0 device lpt0 at isa? port? tty irq 7 vector lptintr device psm0 at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr device sio0 at isa? port "IO_COM1" tty flags 0x10 irq 4 vector siointr device ed0 at isa? port 0x300 net irq 9 iomem 0xd8000 vector edintr # # pcm: PCM audio through various sound cards. # # This is the work in progress from Luigi Rizzo. This has support for # CS423x based cards, OPTi931, SB16 PnP, GusPnP. For more information # about this driver, take a look at sys/i386/isa/snd/README. # # The flags of the device tells the device a bit more info about the # device that normally is obtained through the PnP interface. # bit 2..0 secondary DMA channel; # bit 4 set if the board uses two dma channels; # bit 15..8 board type, overrides autodetection; leave it # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # # This driver will use the new PnP code if it's available. # # Luigi's snd code #device pcm0 at isa? port ? tty irq 5 drq 1 flags 0x00 vector pcmintr # sb: SoundBlaster PCM - SoundBlaster, SB Pro, SB16, ProAudioSpectrum # sbxvi: SoundBlaster 16 # sbmidi: SoundBlaster 16 MIDI interface # opl: Yamaha OPL-2 and OPL-3 FM - SB, SB Pro, SB 16, ProAudioSpectrum controller snd0 device sb0 at isa? port 0x220 irq 5 conflicts drq 1 vector sbintr device sbxvi0 at isa? irq? conflicts drq 5 device sbmidi0 at isa? port 0x330 irq? conflicts device awe0 at isa? port 0x620 device opl0 at isa? port 0x388 # Enable PnP support in the kernel. This allows you to automaticly # attach to PnP cards for drivers that support it and allows you to # configure cards from USERCONFIG. See pnp(4) for more info. controller pnp0 device apm0 at isa? device joy0 at isa? port "IO_GAME" controller pci0 controller crd0 controller pcic0 at crd? controller pcic1 at crd? -- Christopher Wiener N2CR CR Labs, Morris Plains, NJ DOMAIN: cwiener@CRLABS.COM "Live music is better ... bumper stickers should be issued." - Neil Young
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199709211534.LAA18602>