Date: Tue, 3 Dec 2002 15:59:47 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21886 for review Message-ID: <200212032359.gB3NxlEo088398@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21886 Change 21886 by jhb@jhb_laptop on 2002/12/03 15:59:10 IFC. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#18 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#9 integrate .. //depot/projects/smpng/sys/boot/efi/loader/version#3 integrate .. //depot/projects/smpng/sys/boot/libstand/ufs.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#28 integrate .. //depot/projects/smpng/sys/conf/NOTES#29 integrate .. //depot/projects/smpng/sys/conf/files#58 integrate .. //depot/projects/smpng/sys/conf/majors#19 integrate .. //depot/projects/smpng/sys/conf/options#42 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#1 branch .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#13 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#13 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#11 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.h#3 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#26 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#19 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#19 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#20 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#8 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#16 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#8 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#9 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#4 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/smpng/sys/geom/geom.h#16 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_slice.h#8 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#19 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#11 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#52 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/smpng/sys/i386/include/signal.h#8 integrate .. //depot/projects/smpng/sys/i386/include/stdarg.h#8 integrate .. //depot/projects/smpng/sys/i386/include/ucontext.h#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#40 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#21 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#4 integrate .. //depot/projects/smpng/sys/kern/init_main.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#38 integrate .. //depot/projects/smpng/sys/modules/Makefile#39 integrate .. //depot/projects/smpng/sys/modules/if_gre/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/lomac/Makefile#3 delete .. //depot/projects/smpng/sys/modules/lomac/Makefile.inc#3 delete .. //depot/projects/smpng/sys/modules/lomac/plm/Makefile#3 delete .. //depot/projects/smpng/sys/modules/lomac/syscall_gate/Makefile#3 delete .. //depot/projects/smpng/sys/modules/mac_lomac/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/Makefile.inc#1 branch .. //depot/projects/smpng/sys/net/if_gre.c#5 integrate .. //depot/projects/smpng/sys/net/if_gre.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.h#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#12 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#28 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#19 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#25 integrate .. //depot/projects/smpng/sys/security/lomac/kernel_interface.c#6 delete .. //depot/projects/smpng/sys/security/lomac/kernel_interface.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_lkm.c#4 delete .. //depot/projects/smpng/sys/security/lomac/kernel_log.c#6 delete .. //depot/projects/smpng/sys/security/lomac/kernel_log.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_mediate.c#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_mediate.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#10 delete .. //depot/projects/smpng/sys/security/lomac/kernel_monitor.c#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_monitor.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_pipe.c#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_pipe.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_plm.c#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_plm.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_socket.c#11 delete .. //depot/projects/smpng/sys/security/lomac/kernel_socket.h#3 delete .. //depot/projects/smpng/sys/security/lomac/kernel_util.c#11 delete .. //depot/projects/smpng/sys/security/lomac/kernel_util.h#3 delete .. //depot/projects/smpng/sys/security/lomac/lomac.h#3 delete .. //depot/projects/smpng/sys/security/lomac/lomacfs.h#3 delete .. //depot/projects/smpng/sys/security/lomac/lomacfs_subr.c#5 delete .. //depot/projects/smpng/sys/security/lomac/lomacfs_vfsops.c#4 delete .. //depot/projects/smpng/sys/security/lomac/lomacfs_vnops.c#9 delete .. //depot/projects/smpng/sys/security/lomac/lomacio.h#3 delete .. //depot/projects/smpng/sys/security/lomac/policy_plm.h#3 delete .. //depot/projects/smpng/sys/security/lomac/syscall_gate.c#3 delete .. //depot/projects/smpng/sys/security/lomac/syscall_gate.h#3 delete .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#1 branch .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/bus_common.h#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#6 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#5 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#9 integrate .. //depot/projects/smpng/sys/sys/ctype.h#2 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#8 integrate .. //depot/projects/smpng/sys/sys/mac.h#10 integrate .. //depot/projects/smpng/sys/sys/rman.h#5 integrate .. //depot/projects/smpng/sys/sys/select.h#6 integrate .. //depot/projects/smpng/sys/sys/signal.h#11 integrate .. //depot/projects/smpng/sys/sys/syslimits.h#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#35 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#9 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#24 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#20 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#22 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.75 2002/11/22 23:57:01 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.76 2002/12/02 01:12:05 alc Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -393,6 +393,7 @@ if ((bp->b_flags & B_PHYS) == 0) panic("vunmapbuf"); + vm_page_lock_queues(); for (addr = (caddr_t)trunc_page(bp->b_data); addr < bp->b_data + bp->b_bufsize; addr += PAGE_SIZE) { @@ -400,6 +401,7 @@ pmap_kremove((vm_offset_t) addr); vm_page_unhold(PHYS_TO_VM_PAGE(pa)); } + vm_page_unlock_queues(); bp->b_data = bp->b_saveaddr; } ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.14 2002/10/07 08:14:10 phk Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.15 2002/11/27 20:13:15 jhb Exp $ .include <../Makefile.inc> @@ -14,7 +14,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. -CFLAGS+= -DUFS1_ONLY NOMAN=1 STRIP= BINDIR?= /boot ==== //depot/projects/smpng/sys/boot/common/ufsread.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ /* - * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.7 2002/10/08 15:46:45 phk Exp $ + * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.8 2002/11/27 02:18:57 mckusick Exp $ */ #include <ufs/ufs/dinode.h> @@ -243,7 +243,7 @@ return -1; if ((fs->fs_magic == FS_UFS1_MAGIC || (fs->fs_magic == FS_UFS2_MAGIC && - fs->fs_sblockloc == numfrags(fs, sblock_try[n]))) && + fs->fs_sblockloc == sblock_try[n])) && fs->fs_bsize <= MAXBSIZE && fs->fs_bsize >= sizeof(struct fs)) break; ==== //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.9 2002/10/24 07:53:12 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.10 2002/11/28 03:25:51 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -217,23 +217,6 @@ :: "r"(0), "r"(*(u_int64_t*)&pte)); __asm __volatile("srlz.i;;"); - bzero(&pte, sizeof(pte)); - pte.pte_p = 1; - pte.pte_ma = PTE_MA_UC; - pte.pte_a = 1; - pte.pte_d = 1; - pte.pte_pl = PTE_PL_KERN; - pte.pte_ar = PTE_AR_RWX; - pte.pte_ppn = 0xffffc000000 >> 12; - - __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_PHYS_TO_RR6(0xffffc000000))); - __asm __volatile("mov cr.itir=%0" :: "r"(26 << 2)); - //__asm __volatile("ptr.d %0,%1" :: "r"(IA64_PHYS_TO_RR6(0xffffc000000)), "r"(26<<2)); - __asm __volatile("srlz.i;;"); - __asm __volatile("itr.d dtr[%0]=%1;;" - :: "r"(1), "r"(*(u_int64_t*)&pte)); - __asm __volatile("srlz.i;;"); - enter_kernel(hdr->e_entry, bi); restore_ic(psr); ==== //depot/projects/smpng/sys/boot/efi/loader/version#3 (text+ko) ==== @@ -1,8 +1,11 @@ -$FreeBSD: src/sys/boot/efi/loader/version,v 1.3 2002/03/30 23:00:05 marcel Exp $ +$FreeBSD: src/sys/boot/efi/loader/version,v 1.4 2002/11/28 03:25:51 marcel Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.0: Don't map the I/O port range. We expect the kernel to do it. It + was done in the loader as a debugging aid and not intended as a + service/feature. 0.3: Pass the physical address of the bootinfo block in register r8 to the kernel. Continue to put it at the fixed address for now. 0.2: Much improved version. Significant is the support for passing ==== //depot/projects/smpng/sys/boot/libstand/ufs.c#2 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/libstand/ufs.c,v 1.12 2002/06/21 06:17:56 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/libstand/ufs.c,v 1.13 2002/11/27 02:18:58 mckusick Exp $"); /* * Stand-alone file reading package. @@ -534,7 +534,7 @@ goto out; if ((fs->fs_magic == FS_UFS1_MAGIC || (fs->fs_magic == FS_UFS2_MAGIC && - fs->fs_sblockloc == numfrags(fs, sblock_try[i]))) && + fs->fs_sblockloc == sblock_try[i])) && buf_size == SBLOCKSIZE && fs->fs_bsize <= MAXBSIZE && fs->fs_bsize >= sizeof(struct fs)) ==== //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.11 2002/11/10 19:17:36 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/devicename.c,v 1.12 2002/12/02 01:46:22 jake Exp $ */ #include <stand.h> @@ -91,7 +91,7 @@ if (OF_getprop(handle, "device_type", type, sizeof(type)) == -1) continue; for (i = 0; (dv = devsw[i]) != NULL; i++) { - if (strncmp(dv->dv_name, type, strlen(type)) == 0) + if (strncmp(dv->dv_name, type, strlen(dv->dv_name)) == 0) goto found; } } ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.115 2002/11/23 23:25:56 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.116 2002/11/29 15:40:10 yar Exp $ */ #ifdef _KERNEL @@ -611,6 +611,8 @@ if (error == 0) { if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0) daprevent(periph, PR_PREVENT); + } else { + cam_periph_release(periph); } cam_periph_unlock(periph); return (error); ==== //depot/projects/smpng/sys/conf/NOTES#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1116 2002/11/08 20:04:38 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1117 2002/11/26 17:32:39 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -764,6 +764,7 @@ options MAC_BSDEXTENDED options MAC_DEBUG options MAC_IFOFF +options MAC_LOMAC options MAC_MLS options MAC_NONE options MAC_PARTITION ==== //depot/projects/smpng/sys/conf/files#58 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.736 2002/11/16 06:35:51 deischen Exp $ +# $FreeBSD: src/sys/conf/files,v 1.739 2002/12/03 20:20:14 sos Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -290,6 +290,7 @@ dev/asr/asr.c optional asr pci dev/ata/ata-all.c optional ata dev/ata/ata-isa.c optional ata isa +dev/ata/ata-cbus.c optional ata pc98 dev/ata/ata-card.c optional ata card dev/ata/ata-card.c optional ata pccard dev/ata/ata-pci.c optional ata pci @@ -458,10 +459,10 @@ dev/lnc/if_lnc_pci.c optional lnc pci dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv card -#dev/ncv/ncr53c500_pccard.c optional ncv pccard +dev/ncv/ncr53c500_pccard.c optional ncv pccard dev/nsp/nsp.c optional nsp dev/nsp/nsp_pccard.c optional nsp card -#dev/nsp/nsp_pccard.c optional nsp pccard +dev/nsp/nsp_pccard.c optional nsp pccard dev/mca/mca_bus.c optional mca dev/mcd/mcd.c optional mcd isa nowerror dev/mcd/mcd_isa.c optional mcd isa nowerror @@ -705,7 +706,7 @@ dev/streams/streams.c optional streams dev/stg/tmc18c30.c optional stg dev/stg/tmc18c30_pccard.c optional stg card -#dev/stg/tmc18c30_pccard.c optional stg pccard +dev/stg/tmc18c30_pccard.c optional stg pccard dev/stg/tmc18c30_isa.c optional stg isa dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" @@ -1507,6 +1508,7 @@ security/mac_biba/mac_biba.c optional mac_biba security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended security/mac_ifoff/mac_ifoff.c optional mac_ifoff +security/mac_lomac/mac_lomac.c optional mac_lomac security/mac_mls/mac_mls.c optional mac_mls security/mac_none/mac_none.c optional mac_none security/mac_partition/mac_partition.c optional mac_partition ==== //depot/projects/smpng/sys/conf/majors#19 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.150 2002/11/13 01:42:59 peter Exp $ +$FreeBSD: src/sys/conf/majors,v 1.151 2002/11/28 04:29:52 rwatson Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -200,7 +200,6 @@ 179 raid RAIDframe (disk device) 180 nvidia NVIDIA (nvidiaN/nvidiactl) 181 casm HP/Compaq ProLiant Advanced Server Management <peter> -182 mdsio RS-485 driver for 8250-family UARTs <doconnor@gsoft.com.au> 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use 253 was:MFS was: used by MFS in <= RELENG_4 ==== //depot/projects/smpng/sys/conf/options#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.364 2002/11/18 06:17:07 jmallett Exp $ +# $FreeBSD: src/sys/conf/options,v 1.365 2002/11/26 17:32:39 rwatson Exp $ # # On the handling of kernel options # @@ -152,6 +152,7 @@ MAC_BSDEXTENDED opt_dontuse.h MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h +MAC_LOMAC opt_dontuse.h MAC_MLS opt_dontuse.h MAC_NONE opt_dontuse.h MAC_PARTITION opt_dontuse.h ==== //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#3 (text+ko) ==== @@ -1,4 +1,277 @@ ---------------------------------------- +15 November 2002. Summary of changes for version 20021115. + +1) ACPI CA Core Subsystem: + +Fixed a memory leak problem where an error during resolution +of method arguments during a method invocation from another +method failed to cleanup properly by deleting all successfully +resolved argument objects. + +Fixed a problem where the target of the Index() operator was +not correctly constructed if the source object was a package. +This problem has not been detected because the use of a target +operand with Index() is very rare. + +Fixed a problem with the Index() operator where an attempt was +made to delete the operand objects twice. + +Fixed a problem where an attempt was made to delete an operand +twice during execution of the CondRefOf() operator if the +target did not exist. + +Implemented the first of perhaps several internal create +object functions that create and initialize a specific object +type. This consolidates duplicated code wherever the object +is created, thus shrinking the size of the subsystem. + +Implemented improved debug/error messages for errors that +occur during nested method invocations. All executing method +pathnames are displayed (with the error) as the call stack is +unwound - thus simplifying debug. + +Fixed a problem introduced in the 10/02 release that caused +premature deletion of a buffer object if a buffer was used as +an ASL operand where an integer operand is required (Thus +causing an implicit object conversion from Buffer to Integer.) +The change in the 10/02 release was attempting to fix a memory +leak (albeit incorrectly.) + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, +and these values do not include any ACPI driver or OSPM code. +The debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 71.9K Code, 9.1K Data, 81.0K Total + Debug Version: 153.1K Code, 63.3K Data, 216.4K Total + Current Release: + Non-Debug Version: 71.3K Code, 9.0K Data, 80.3K Total + Debug Version: 152.7K Code, 63.2K Data, 215.5K Total + + +2) Linux + +Changed the implementation of the ACPI semaphores to use +down() instead of down_interruptable(). It is important that +the execution of ACPI control methods not be interrupted by +signals. Methods must run to completion, or the system may be +left in an unknown/unstable state. + +Fixed a compilation error when CONFIG_SOFTWARE_SUSPEND is not +set. (Shawn Starr) + + +3) iASL Compiler/Disassembler + +Changed the default location of output files. All output +files are now placed in the current directory by default +instead of in the directory of the source file. This change +may affect some existing makefiles, but it brings the behavior +of the compiler in line with other similar tools. The +location of the output files can be overridden with the -p +command line switch. + + +---------------------------------------- +11 November 2002. Summary of changes for version 20021111. + + +0) ACPI Specification 2.0B is released and is now available +at: http://www.acpi.info/index.html + + +1) ACPI CA Core Subsystem: + +Implemented support for the ACPI 2.0 SMBus Operation Regions. +This includes the early detection and handoff of the request +to the SMBus region handler (avoiding all of the complex field +support code), and support for the bidirectional return packet +from an SMBus write operation. This paves the way for the +development of SMBus drivers in each host operating system. + +Fixed a problem where the semaphore WAIT_FOREVER constant was +defined as 32 bits, but must be 16 bits according to the ACPI +specification. This had the side effect of causing ASL +Mutex/Event timeouts even though the ASL code requested a wait +forever. Changed all internal references to the ACPI timeout +parameter to 16 bits to prevent future problems. Changed the +name of WAIT_FOREVER to ACPI_WAIT_FOREVER. + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, +and these values do not include any ACPI driver or OSPM code. +The debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 71.4K Code, 9.0K Data, 80.4K Total + Debug Version: 152.3K Code, 63.0K Data, 215.3K Total + Current Release: + Non-Debug Version: 71.9K Code, 9.1K Data, 81.0K Total + Debug Version: 153.1K Code, 63.3K Data, 216.4K Total + + +2) Linux + +Module loading/unloading fixes (John Cagle) + + +3) iASL Compiler/Disassembler + +Added support for the SMBBlockProcessCall keyword (ACPI 2.0) + +Implemented support for the disassembly of all SMBus protocol +keywords (SMBQuick, SMBWord, etc.) + +---------------------------------------- +01 November 2002. Summary of changes for version 20021101. + + +1) ACPI CA Core Subsystem: + +Fixed a problem where platforms that have a GPE1 block but no +GPE0 block were not handled correctly. This resulted in a +"GPE overlap" error message. GPE0 is no longer required. + +Removed code added in the previous release that inserted nodes +into the namespace in alphabetical order. This caused some +side-effects on various machines. The root cause of the +problem is still under investigation since in theory, the +internal ordering of the namespace nodes should not matter. + +Enhanced error reporting for the case where a named object is +not found during control method execution. The full ACPI +namepath (name reference) of the object that was not found is +displayed in this case. + +Note: as a result of the overhaul of the namespace object +types in the previous release, the namespace nodes for the +predefined scopes (_TZ, _PR, etc.) are now of the type +ACPI_TYPE_LOCAL_SCOPE instead of ACPI_TYPE_ANY. This +simplifies the namespace management code but may affect code +that walks the namespace tree looking for specific object +types. + +Code and Data Size: Current core subsystem library sizes are +shown below. These are the code and data sizes for the +acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, +and these values do not include any ACPI driver or OSPM code. +The debug version of the code includes the debug output trace +mechanism and has a much larger code and data size. Note that +these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. + + Previous Release + Non-Debug Version: 70.7K Code, 8.6K Data, 79.3K Total + Debug Version: 151.7K Code, 62.4K Data, 214.1K Total + Current Release: + Non-Debug Version: 71.4K Code, 9.0K Data, 80.4K Total + Debug Version: 152.3K Code, 63.0K Data, 215.3K Total + + +2) Linux + +Fixed a problem introduced in the previous release where the +Processor and Thermal objects were not recognized and +installed in /proc. This was related to the scope type change +described above. + + +3) iASL Compiler/Disassembler + +Implemented the -g option to get all of the required ACPI +tables from the registry and save them to files (Windows +version of the compiler only.) The required tables are the +FADT, FACS, and DSDT. + +Added ACPI table checksum validation during table disassembly +in order to catch corrupted tables. + + +---------------------------------------- +22 October 2002. Summary of changes for version 20021022. + +1) ACPI CA Core Subsystem: + +Implemented a restriction on the Scope operator that the +target must already exist in the namespace at the time the +operator is encountered (during table load or method +execution). In other words, forward references are not +allowed and Scope() cannot create a new object. This changes +the previous behavior where the interpreter would create the +name if not found. This new behavior correctly enables the +search-to-root algorithm during namespace lookup of the target +name. Because of this upsearch, this fixes the known Compaq +_SB_.OKEC problem and makes both the AML interpreter and iASL +compiler compatible with other ACPI implementations. + +Completed a major overhaul of the internal ACPI object types +for the ACPI Namespace and the associated operand objects. +Many of these types had become obsolete with the introduction +of the two-pass namespace load. This cleanup simplifies the +code and makes the entire namespace load mechanism much +clearer and easier to understand. + +Improved debug output for tracking scope opening/closing to +help diagnose scoping issues. The old scope name as well as +the new scope name are displayed. Also improved error +messages for problems with ASL Mutex objects and error +messages for GPE problems. + +Cleaned up the namespace dump code, removed obsolete code. + +All string output (for all namespace/object dumps) now uses +the common ACPI string output procedure which handles escapes +properly and does not emit non-printable characters. + +Fixed some issues with constants in the 64-bit version of the +local C library (utclib.c) + + +2) Linux + +EC Driver: No longer attempts to acquire the Global Lock at +interrupt level. + + +3) iASL Compiler/Disassembler + +Implemented ACPI 2.0B grammar change that disallows all Type 1 +and 2 opcodes outside of a control method. This means that +the "executable" operators (versus the "namespace" operators) +cannot be used at the table level; they can only be used +within a control method. + +Implemented the restriction on the Scope() operator where the +target must already exist in the namespace at the time the +operator is encountered (during ASL compilation). In other +words, forward references are not allowed and Scope() cannot +create a new object. This makes the iASL compiler compatible +with other ACPI implementations and makes the Scope() +implementation adhere to the ACPI specification. + +Fixed a problem where namepath optimization for the Alias +operator was optimizing the wrong path (of the two namepaths.) +This caused a "Missing alias link" error message. + +Fixed a problem where an "unknown reserved name" warning could +be incorrectly generated for names like "_SB" when the +trailing underscore is not used in the original ASL. + +Fixed a problem where the reserved name check did not handle +NamePaths with multiple NameSegs correctly. The first nameseg +of the NamePath was examined instead of the last NameSeg. + + +---------------------------------------- 02 October 2002. Summary of changes for this release. ==== //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#2 (text+ko) ==== @@ -146,10 +146,18 @@ char *Suffix); ACPI_STATUS +FlSplitInputPathname ( + char *InputPath, + char **OutDirectoryPath, + char **OutFilename); + +ACPI_STATUS AdAmlDisassemble ( BOOLEAN OutToFile, char *Filename, - char **OutFilename); + char *Prefix, + char **OutFilename, + BOOLEAN GetAllTables); void AdPrintStatistics (void); @@ -164,7 +172,8 @@ ACPI_STATUS AdGetTables ( - char *Filename); + char *Filename, + BOOLEAN GetAllTables); ACPI_STATUS AdParseTables (void); ==== //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#14 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acconfig.h - Global configuration constants - * $Revision: 112 $ + * $Revision: 118 $ * *****************************************************************************/ @@ -145,7 +145,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20021002 +#define ACPI_CA_VERSION 0x20021115 /* Version of ACPI supported */ @@ -257,6 +257,10 @@ #define ACPI_RSDP_CHECKSUM_LENGTH 20 #define ACPI_RSDP_XCHECKSUM_LENGTH 36 +/* SMBus bidirectional buffer size */ + +#define ACPI_SMBUS_BUFFER_SIZE 34 + /****************************************************************************** * ==== //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdisasm.h - AML disassembler - * $Revision: 3 $ + * $Revision: 5 $ * *****************************************************************************/ @@ -199,10 +199,6 @@ char *Name); void -AcpiDmString ( - char *String); - -void AcpiDmUnicode ( ACPI_PARSE_OBJECT *Op); @@ -334,6 +330,9 @@ AcpiDmBitList ( UINT16 Mask); +void +AcpiDmDecodeAttribute ( + UINT8 Attribute); /* * dmresrcl ==== //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#7 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acdispat.h - dispatcher (parser to interpreter interface) - * $Revision: 54 $ + * $Revision: 55 $ * *****************************************************************************/ @@ -469,6 +469,10 @@ AcpiDsResolveOperands ( ACPI_WALK_STATE *WalkState); +void +AcpiDsClearOperands ( + ACPI_WALK_STATE *WalkState); + /* * dswscope - Scope Stack manipulation ==== //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#7 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acevents.h - Event subcomponent prototypes and defines - * $Revision: 79 $ + * $Revision: 80 $ * *****************************************************************************/ @@ -154,7 +154,7 @@ ACPI_STATUS AcpiEvAcquireGlobalLock( - UINT32 Timeout); + UINT16 Timeout); ACPI_STATUS AcpiEvReleaseGlobalLock( ==== //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#11 (text+ko) ==== @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acglobal.h - Declarations for global variables - * $Revision: 131 $ + * $Revision: 132 $ * *****************************************************************************/ @@ -243,7 +243,7 @@ * ****************************************************************************/ -#define NUM_NS_TYPES INTERNAL_TYPE_INVALID+1 +#define NUM_NS_TYPES ACPI_TYPE_INVALID+1 #if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) #define NUM_PREDEFINED_NAMES 10 @@ -370,8 +370,8 @@ /* * Statistic globals */ -ACPI_EXTERN UINT16 AcpiGbl_ObjTypeCount[INTERNAL_TYPE_NODE_MAX+1]; -ACPI_EXTERN UINT16 AcpiGbl_NodeTypeCount[INTERNAL_TYPE_NODE_MAX+1]; +ACPI_EXTERN UINT16 AcpiGbl_ObjTypeCount[ACPI_TYPE_NS_NODE_MAX+1]; +ACPI_EXTERN UINT16 AcpiGbl_NodeTypeCount[ACPI_TYPE_NS_NODE_MAX+1]; ACPI_EXTERN UINT16 AcpiGbl_ObjTypeCountMisc; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212032359.gB3NxlEo088398>