Date: Sun, 6 Mar 2005 04:10:42 GMT From: John-Mark Gurney <jmg@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 72548 for review Message-ID: <200503060410.j264AgrT032613@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=72548 Change 72548 by jmg@jmg_carbon on 2005/03/06 04:10:09 pull in latest changes in hopes that my latest hangs are due to a fixed bug in -current.. Affected files ... .. //depot/projects/arm/src/sys/Makefile#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/arm/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/bus_amd64.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/profile.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/arm/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/conf/files.i386#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#3 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpiio.h#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/arm/src/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/arm/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/arm/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/arm/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/arm/src/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/arm/src/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/arm/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/arm/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/arm/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/arm/src/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/arm/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/arm/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/arm/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/arm/src/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/arm/src/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/arm/src/sys/i386/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/bus_at386.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/profile.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/arm/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/arm/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/arm/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/arm/src/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/bpf.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/arm/src/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhcvar.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/arm/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/arm/src/sys/sys/dir.h#2 integrate .. //depot/projects/arm/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/arm/src/sys/sys/ktr.h#2 integrate .. //depot/projects/arm/src/sys/sys/linker_set.h#2 integrate .. //depot/projects/arm/src/sys/sys/proc.h#2 integrate .. //depot/projects/arm/src/sys/sys/queue.h#2 integrate .. //depot/projects/arm/src/sys/sys/syslimits.h#2 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#2 integrate Differences ... ==== //depot/projects/arm/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $ +# $FreeBSD: src/sys/Makefile,v 1.32 2005/03/05 00:56:15 grog Exp $ # The boot loader .if !defined(NO_BOOT) @@ -7,11 +7,30 @@ .endif .endif +# Directories to include in cscope name file and TAGS. +CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ + isofs kern libkern modules net netatalk netatm netgraph \ + netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ + pccard pci posix4 sys ufs vm ${ARCHDIR} + +ARCHDIR ?= i386 + # Loadable kernel modules + .if defined(MODULES_WITH_WORLD) SUBDIR+=modules .endif HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` +cscope: ${.CURDIR}/cscopenamefile + cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile + +${.CURDIR}/cscopenamefile: + cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} + +TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile + rm -f ${.CURDIR}/TAGS + cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile + .include <bsd.subdir.mk> ==== //depot/projects/arm/src/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.233 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -194,6 +194,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; long totalphysmem; /* total amount of physical memory in system */ long resvmem; /* amount of memory reserved for PROM */ @@ -250,6 +251,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); + realmem = alpha_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/arm/src/sys/alpha/include/_types.h#2 (text+ko) ==== @@ -33,12 +33,16 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -97,7 +101,7 @@ /* * Unusual type definitions. */ -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifdef __GNUCLIKE_BUILTIN_VAALIST typedef __builtin_va_list __va_list; /* internally known to gcc */ #else typedef struct { @@ -105,8 +109,9 @@ int __offset; int __pad; } __va_list; -#endif /* post GCC 2.95 */ -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#endif /* __GNUCLIKE_BUILTIN_VAALIST */ +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/arm/src/sys/alpha/include/atomic.h#2 (text+ko) ==== @@ -23,12 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.19 2004/09/10 05:00:27 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.20 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include <machine/alpha_cpu.h> /* @@ -50,7 +54,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %2\n\t" /* load old value */ "bis %0, %3, %0\n\t" /* calculate new value */ @@ -66,7 +70,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -82,7 +86,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ @@ -98,7 +102,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ @@ -114,7 +118,7 @@ { u_int32_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ @@ -133,7 +137,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ @@ -149,7 +153,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -165,7 +169,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "addq %0, %2, %0\n\t" /* calculate new value */ @@ -181,7 +185,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "subq %0, %2, %0\n\t" /* calculate new value */ @@ -197,7 +201,7 @@ { u_int64_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldq_l %0,%2\n\t" /* load current value, asserting lock */ @@ -336,7 +340,7 @@ { u_int32_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ @@ -363,7 +367,7 @@ { u_int64_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ ==== //depot/projects/arm/src/sys/alpha/include/cpufunc.h#2 (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/alpha/include/cpufunc.h,v 1.15 2002/04/01 23:51:22 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -35,9 +35,13 @@ #include <machine/chipset.h> #include <machine/alpha_cpu.h> +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + struct thread; -#ifdef __GNUC__ +#if defined(__GNUCLIKE_ASM) static __inline void breakpoint(void) ==== //depot/projects/arm/src/sys/alpha/include/critical.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in <arch>/<arch>/critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE /* * cpu_critical_enter: @@ -75,12 +75,12 @@ intr_restore(td->td_md.md_savecrit); } -#else /* !__GNUC__ */ +#else /* !__CC_SUPPORTS___INLINE */ void cpu_critical_enter(struct thread *td); void cpu_critical_exit(struct thread *td); -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE */ __END_DECLS ==== //depot/projects/arm/src/sys/alpha/include/endian.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.15 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -64,7 +64,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#ifdef __GNUC__ +#if defined(__CC_SUPPORTS___INLINE) && defined(__GNUCLIKE_ASM) static __inline __uint64_t __bswap64(__uint64_t _x) @@ -113,7 +113,7 @@ #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) -#else /* !__GNUC__ */ +#else /* !(__CC_SUPPORTS___INLINE && __GNUCLIKE_ASM) */ /* * No optimizations are available for this compiler. Fall back to @@ -122,6 +122,6 @@ */ #define _BYTEORDER_FUNC_DEFINED -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE && __GNUCLIKE_ASM */ #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/arm/src/sys/alpha/include/in_cksum.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.6 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ @@ -45,7 +45,7 @@ * in the normal case (where there are no options and the header length is * therefore always exactly five 32-bit words. */ -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE static __inline void in_cksum_update(struct ip *ip) ==== //depot/projects/arm/src/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.4 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IOCTL_BT848_H_ #define _MACHINE_IOCTL_BT848_H_ -#ifdef __GNUC__ +#include <sys/cdefs.h> + +#ifdef __CC_SUPPORTS_WARNING #warning Include dev/bktr/ioctl_bt848.h instead of this header. #endif ==== //depot/projects/arm/src/sys/alpha/include/ioctl_meteor.h#2 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.4 2003/12/08 07:22:41 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.5 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifdef __GNUC__ +#include <sys/cdefs.h> + +#ifdef __CC_SUPPORTS_WARNING #warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif ==== //depot/projects/arm/src/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -28,13 +28,15 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.14 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.15 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ -#if __GNUC__ +#include <sys/cdefs.h> + +#ifdef __CC_SUPPORTS_WARNING #warning "machine/limits.h is deprecated. Include sys/limits.h instead." #endif ==== //depot/projects/arm/src/sys/alpha/include/stdarg.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 * $NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.6 2002/10/06 22:01:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -47,7 +47,7 @@ typedef __va_list va_list; #endif -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ __builtin_stdarg_start((ap), (last)) @@ -63,7 +63,7 @@ #define va_end(ap) \ __builtin_va_end(ap) -#else /* ! __GNUC__ post GCC 2.95 */ +#else /* !__GNUCLIKE_BUILTIN_STDARG */ #ifdef __lint__ #define __builtin_saveregs() (0) @@ -87,6 +87,6 @@ #define va_end(ap) ((void)0) -#endif /* __GNUC__ post GCC 2.95 */ +#endif /* __GNUCLIKE_BUILTIN_STDARG */ #endif /* !_MACHINE_STDARG_H_ */ ==== //depot/projects/arm/src/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -38,13 +38,17 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.6 2003/09/01 03:01:45 kan Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_VARARGS_H_ #define _MACHINE_VARARGS_H_ -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +#if defined(__GNUCLIKE_BUILTIN_VARARGS) #include <sys/_types.h> @@ -61,23 +65,21 @@ #define va_arg(ap, type) __builtin_va_arg((ap), type) #define va_end(ap) __builtin_va_end(ap) -#else /* ! __GNUC__ post GCC 2.95 */ +#else /* ! __GNUCLIKE_BUILTIN_VARARGS */ #include <machine/stdarg.h> -#if __GNUC__ == 1 -#define __va_ellipsis -#else #define __va_ellipsis ... -#endif +#ifdef __GNUCLIKE_BUILTIN_VAALIST #define va_alist __builtin_va_alist #define va_dcl long __builtin_va_alist; __va_ellipsis +#endif #undef va_start #define va_start(ap) \ ((ap) = *(va_list *)__builtin_saveregs(), (ap).__pad = 0) -#endif /* __GNUC__ post GCC 2.95 */ +#endif /* __GNUCLIKE_BUILTIN_VARARGS */ #endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/arm/src/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.155 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.156 2005/03/02 21:33:21 joerg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,7 +63,7 @@ * Floating point support. */ -#if defined(__GNUC__) && !defined(lint) +#if defined(__GNUCLIKE_ASM) && !defined(lint) #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) #define fnclex() __asm("fnclex") @@ -77,7 +77,7 @@ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* not __GNUC__ */ +#else /* !__GNUCLIKE_ASM */ void fldcw(caddr_t addr); void fnclex(void); @@ -89,7 +89,7 @@ void start_emulating(void); void stop_emulating(void); -#endif /* __GNUC__ */ +#endif /* __GNUCLIKE_ASM */ #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.630 2005/03/01 04:18:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.632 2005/03/05 18:57:30 des Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -866,8 +866,8 @@ { int i, physmap_idx, pa_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; + u_long physmem_tunable; pt_entry_t *pte; - char *cp; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; quad_t dcons_addr, dcons_size; @@ -907,13 +907,12 @@ if (boothowto & RB_VERBOSE) printf( "Overlapping or non-montonic memory region, ignoring second region\n"); - goto next_run; + continue; } } if (smap->base == physmap[physmap_idx + 1]) { physmap[physmap_idx + 1] += smap->length; -next_run: continue; } @@ -957,40 +956,8 @@ Maxmem = MAXMEM / 4; #endif - /* - * hw.physmem is a size in bytes; we also allow k, m, and g suffixes - * for the appropriate modifiers. This overrides MAXMEM. - */ - cp = getenv("hw.physmem"); - if (cp != NULL) { - u_int64_t AllowMem, sanity; - char *ep; - - sanity = AllowMem = strtouq(cp, &ep, 0); - if ((ep != cp) && (*ep != 0)) { - switch(*ep) { - case 'g': - case 'G': - AllowMem <<= 10; - case 'm': - case 'M': - AllowMem <<= 10; - case 'k': - case 'K': - AllowMem <<= 10; - break; - default: - AllowMem = sanity = 0; - } - if (AllowMem < sanity) - AllowMem = 0; - } - if (AllowMem == 0) - printf("Ignoring invalid memory size of '%s'\n", cp); - else - Maxmem = atop(AllowMem); - freeenv(cp); - } + if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) + Maxmem = atop(physmem_tunable); if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) ==== //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.22 2005/01/11 03:44:17 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.23 2005/03/02 21:33:21 joerg Exp $"); #ifdef GUPROF #if 0 @@ -69,7 +69,7 @@ #endif #endif /* GUPROF */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ GM_STATE = 0 \n\ GMON_PROF_OFF = 3 \n\ @@ -140,9 +140,9 @@ .mcount_exit: \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ #ifdef GUPROF /* @@ -151,7 +151,7 @@ * dependent file together with cputime(), __mcount and [.]mcount. cputime() * can't just be put in machdep.c because it has to be compiled without -pg. */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ .text \n\ # \n\ @@ -194,9 +194,9 @@ .mexitcount_exit: \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ /* * Return the time elapsed since the last call. The units are machine- @@ -379,7 +379,7 @@ } #else /* !GUPROF */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ .text \n\ .p2align 4,0x90 \n\ @@ -387,7 +387,7 @@ " __XSTRING(HIDENAME(mexitcount)) ": \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ ==== //depot/projects/arm/src/sys/amd64/include/_types.h#2 (text+ko) ==== @@ -33,12 +33,16 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.6 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.7 2005/03/02 21:33:21 joerg Exp $ */ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -97,12 +101,13 @@ /* * Unusual type definitions. */ -#if defined(__GNUC__) +#ifdef __GNUCLIKE_BUILTIN_VARARGS typedef __builtin_va_list __va_list; /* internally known to gcc */ #elif defined(lint) typedef char * __va_list; /* pretend */ #endif -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/arm/src/sys/amd64/include/atomic.h#2 (text+ko) ==== @@ -23,11 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.32 2003/11/21 03:02:00 peter Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.33 2005/03/02 21:33:21 joerg Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Various simple arithmetic on memory which is atomic in the presence >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503060410.j264AgrT032613>