Date: Mon, 11 Oct 2004 21:40:04 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63018 for review Message-ID: <200410112140.i9BLe4LA094043@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63018 Change 63018 by peter@peter_daintree on 2004/10/11 21:39:56 IFC @63017 Affected files ... .. //depot/projects/hammer/lib/msun/Makefile#18 integrate .. //depot/projects/hammer/lib/msun/man/ieee.3#6 integrate .. //depot/projects/hammer/lib/msun/man/math.3#4 integrate .. //depot/projects/hammer/lib/msun/src/math.h#23 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogbl.c#1 branch .. //depot/projects/hammer/share/man/man9/pfil.9#9 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#6 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#35 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#26 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#14 integrate .. //depot/projects/hammer/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/hammer/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#29 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#13 integrate .. //depot/projects/hammer/sys/net/netisr.c#10 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#33 integrate .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-ilogb.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.c#1 branch Differences ... ==== //depot/projects/hammer/lib/msun/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.52 2004/10/01 15:38:07 kensmith Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.53 2004/10/11 18:13:52 stefanf Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -85,7 +85,7 @@ s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \ s_fminf.c s_fminl.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ - s_isfinite.c s_isnan.c s_isnormal.c s_ldexpf.c \ + s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c s_ldexpf.c \ s_lib_version.c s_log1p.c \ s_log1pf.c s_logb.c s_logbf.c s_matherr.c s_modff.c \ s_nearbyint.c s_nextafter.c s_nextafterf.c \ @@ -167,7 +167,8 @@ MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 hypotf.3 MLINKS+=ieee.3 copysign.3 ieee.3 copysignf.3 ieee.3 copysignl.3 \ ieee.3 finite.3 ieee.3 finitef.3 \ - ieee.3 ilogb.3 ieee.3 ilogbf.3 ieee.3 nextafter.3 ieee.3 nextafterf.3 \ + ieee.3 ilogb.3 ieee.3 ilogbf.3 ieee.3 ilogbl.3 \ + ieee.3 nextafter.3 ieee.3 nextafterf.3 \ ieee.3 remainder.3 ieee.3 remainderf.3 \ ieee.3 scalbln.3 ieee.3 scalblnf.3 ieee.3 scalbn.3 ieee.3 scalbnf.3 MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3 ==== //depot/projects/hammer/lib/msun/man/ieee.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.17 2004/07/02 23:52:20 ru Exp $ +.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.18 2004/10/11 18:13:52 stefanf Exp $ .\" .Dd June 20, 2004 .Dt IEEE 3 @@ -43,6 +43,7 @@ .Nm finitef , .Nm ilogb , .Nm ilogbf , +.Nm ilogbl , .Nm nextafter , .Nm nextafterf , .Nm remainder , @@ -70,6 +71,8 @@ .Fn ilogb "double x" .Ft int .Fn ilogbf "float x" +.Ft int +.Fn ilogbl "long double x" .Ft double .Fn nextafter "double x" "double y" .Ft float @@ -116,9 +119,10 @@ .Fa x is \*(Na). .Pp -.Fn ilogb +.Fn ilogb , +.Fn ilogbf and -.Fn ilogbf +.Fn ilogbl return .Fa x Ns 's exponent, in integer format. ==== //depot/projects/hammer/lib/msun/man/math.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)math.3 6.10 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/math.3,v 1.12 2004/06/20 10:39:09 das Exp $ +.\" $FreeBSD: src/lib/msun/man/math.3,v 1.13 2004/10/11 20:13:52 das Exp $ .\" .Dd June 11, 2004 .Dt MATH 3 @@ -43,13 +43,13 @@ \\$1\\(if\\$2 .. .Sh NAME -math \- introduction to mathematical library functions +math \- floating-point mathematical library +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In math.h .Sh DESCRIPTION -These functions constitute the C math library, -.I libm. -The link editor searches this library under the \*(lq\-lm\*(rq option. -Declarations for these functions may be obtained from the include file -.In math.h . +These functions constitute the C math library. .Sh "LIST OF FUNCTIONS" Each of the following .Vt double @@ -76,6 +76,10 @@ .Ft long double .Fn acosl "long double x" , respectively. +.Pp +The programs are accurate to within the numbers +of \*(ups tabulated below; an \*(up is one \fIU\fRnit in the \fIL\fRast +\fIP\fRlace. .sp 2 .nf .ta \w'nexttoward'u+10n +\w'remainder with partial quot'u @@ -83,29 +87,29 @@ .ta \w'nexttoward'u+4n +\w'remainder with partial quotient'u+6nC .sp 5p .\" XXX Many of these error bounds are wrong for the current implementation! -acos inverse trigonometric function 3 -acosh inverse hyperbolic function 3 -asin inverse trigonometric function 3 -asinh inverse hyperbolic function 3 -atan inverse trigonometric function 1 -atanh inverse hyperbolic function 3 -atan2 inverse trigonometric function 2 +acos inverse trigonometric function ??? +acosh inverse hyperbolic function ??? +asin inverse trigonometric function ??? +asinh inverse hyperbolic function ??? +atan inverse trigonometric function ??? +atanh inverse hyperbolic function ??? +atan2 inverse trigonometric function ??? cbrt cube root 1 ceil integer no less than 0 copysign copy sign bit 0 cos trigonometric function 1 -cosh hyperbolic function 3 -erf error function ??? -erfc complementary error function ??? +cosh hyperbolic function ??? +erf error function 1 +erfc complementary error function 1 exp exponential base e 1 .\" exp2 exponential base 2 ??? expm1 exp(x)\-1 1 fabs absolute value 0 -.\" fdim positive difference ??? +fdim positive difference 1 floor integer no greater than 0 .\" fma multiply-add ??? -.\" fmax maximum function 0 -.\" fmin minimum function 0 +fmax maximum function 0 +fmin minimum function 0 fmod remainder function ??? frexp extract mantissa and exponent 0 hypot Euclidean distance 1 @@ -114,19 +118,19 @@ j1 bessel function ??? jn bessel function ??? ldexp multiply by power of 2 0 -lgamma log gamma function ??? +lgamma log gamma function 1 .\" llrint round to integer 0 .\" llround round to nearest integer 0 log natural logarithm 1 -log10 logarithm to base 10 3 +log10 logarithm to base 10 1 log1p log(1+x) 1 .\" log2 base 2 logarithm 0 logb exponent extraction 0 .\" lrint round to integer 0 .\" lround round to nearest integer 0 -modf extract fractional part ??? +modf extract fractional part 0 .\" nan return quiet \*(Na) 0 -.\" nearbyint round to integer 0 +nearbyint round to integer 0 nextafter next representable value 0 .\" nexttoward next representable value 0 pow exponential x**y 60\-500 @@ -137,11 +141,11 @@ scalbln exponent adjustment 0 scalbn exponent adjustment 0 sin trigonometric function 1 -sinh hyperbolic function 3 +sinh hyperbolic function ??? sqrt square root 1 -tan trigonometric function 3 -tanh hyperbolic function 3 -tgamma gamma function ??? +tan trigonometric function 1 +tanh hyperbolic function ??? +tgamma gamma function 1 trunc round towards zero 0 y0 bessel function ??? y1 bessel function ??? @@ -157,12 +161,10 @@ it primarily defines representations of numbers and abstract properties of arithmetic operations relating to precision, rounding, and exceptional cases, as described below. -The programs are accurate to within the numbers -of \*(ups tabulated above; an \*(up is one \fIU\fRnit in the \fIL\fRast -\fIP\fRlace. .Pp \fBIEEE STANDARD 754 Floating\-Point Arithmetic:\fR .Pp +.\" XXX mention single- and extended-/quad- precisions Properties of IEEE 754 Double\-Precision: .Bd -filled -offset indent Wordsize: 64 bits, 8 bytes. Radix: Binary. @@ -462,6 +464,14 @@ are missing, and many functions are not available in their .Vt long double variants. +.Pp +On some architectures, trigonometric argument reduction is not +performed accurately, resulting in errors greater than 1 ulp for large +arguments to +.Fn cos , +.Fn sin , +and +.Fn tan . .Sh SEE ALSO .Xr fenv 3 , .Xr ieee 3 ==== //depot/projects/hammer/lib/msun/src/math.h#23 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.44 2004/09/17 05:15:33 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.45 2004/10/11 18:13:52 stefanf Exp $ */ #ifndef _MATH_H_ @@ -447,7 +447,9 @@ long double fmodl(long double, long double); long double frexpl(long double value, int *); long double hypotl(long double, long double); +#endif int ilogbl(long double); +#if 0 long double ldexpl(long double, int); long double lgammal(long double); long long llrintl(long double); ==== //depot/projects/hammer/share/man/man9/pfil.9#9 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/pfil.9,v 1.17 2004/10/08 12:07:20 mlaier Exp $ +.\" $FreeBSD: src/share/man/man9/pfil.9,v 1.18 2004/10/11 18:40:50 green Exp $ .\" .Dd September 29, 2004 .Dt PFIL 9 @@ -207,7 +207,7 @@ of time. .Fn pfil_run_hooks will return -.Dv ENOBUF +.Dv ENOBUFS to indicate this. .Sh SEE ALSO .Xr bpf 4 , ==== //depot/projects/hammer/share/man/man9/rtalloc.9#6 (text+ko) ==== @@ -26,8 +26,8 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.18 2004/10/08 09:52:00 glebius Exp $ -.Dd October 7, 2004 +.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.19 2004/10/11 20:48:36 glebius Exp $ +.Dd October 11, 2004 .Os .Dt RTALLOC 9 .Sh NAME @@ -49,6 +49,10 @@ .Ft void .Fn rtfree "struct rt_entry *rt" .Fn RTFREE "struct rt_entry *rt" +.Fn RT_LOCK "struct rt_entry *rt" +.Fn RT_UNLOCK "struct rt_entry *rt" +.Fn RT_ADDREF "struct rt_entry *rt" +.Fn RT_REMREF "struct rt_entry *rt" .Sh DESCRIPTION The kernel uses a radix tree structure to manage routes for the networking subsystem. @@ -189,12 +193,31 @@ .Fn rtalloc or .Fn rtalloc_ign . +The +.Fn RTFREE +macro decrements the reference count on the routing table entry (see below), +and frees it if the reference count has reached zero. +.Pp The preferred usage is allocating a route using .Fn rtalloc or .Fn rtalloc_ign and freeing using .Fn RTFREE . +.Pp +The +.Fn RT_LOCK +macro is used to lock a routing table entry. +The +.Fn RT_UNLOCK +macro is used to unlock a routing table entry. +.Pp +The +.Fn RT_ADDREF +macro increments the reference count on a previously locked route entry. +The +.Fn RT_REMREF +macro decrements the reference count on a previously locked route entry. .Sh RETURN VALUES The .Fn rtalloc , @@ -228,6 +251,8 @@ .Fn rtalloc1 first appeared in .Fx 2.0 . +Routing table locking was introduced in +.Fx 5.2 . .Sh AUTHORS This manual page was written by .An Garrett Wollman , ==== //depot/projects/hammer/sys/conf/kmod.mk#35 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.168 2004/10/09 13:51:28 joerg Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.169 2004/10/11 21:23:56 joerg Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -280,7 +280,7 @@ CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: - ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET} + ln -s ${KERNBUILDDIR}/${_src} ${.TARGET} .endif .endfor .else ==== //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#26 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.44 2004/10/11 06:06:42 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.45 2004/10/11 21:15:10 njl Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -464,14 +464,22 @@ /* * Bus mastering arbitration control is needed to keep caches coherent - * while sleeping in C3. If it's not present, we flush the caches before - * entering C3 instead. + * while sleeping in C3. If it's not present but a working flush cache + * instruction is present, flush the caches before entering C3 instead. + * Otherwise, just disable C3 completely. */ if (AcpiGbl_FADT->V1_Pm2CntBlk == 0 || AcpiGbl_FADT->Pm2CntLen == 0) { - cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "acpi_cpu%d: no BM control, using flush cache method\n", - device_get_unit(sc->cpu_dev))); + if (AcpiGbl_FADT->WbInvd && AcpiGbl_FADT->WbInvdFlush == 0) { + cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu%d: no BM control, using flush cache method\n", + device_get_unit(sc->cpu_dev))); + } else { + cpu_quirks |= CPU_QUIRK_NO_C3; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu%d: no BM control, C3 not available\n", + device_get_unit(sc->cpu_dev))); + } } /* @@ -857,9 +865,7 @@ * Check for bus master activity. If there was activity, clear * the bit and use the lowest non-C3 state. Note that the USB * driver polling for new devices keeps this bit set all the - * time if USB is loaded. If bus mastering control is not available, - * flush caches. This can be quite slow but may be useful since not - * all systems support BM control. + * time if USB is loaded. */ if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active, @@ -869,8 +875,7 @@ ACPI_MTX_DO_NOT_LOCK); cx_next_idx = min(cx_next_idx, cpu_non_c3); } - } else - ACPI_FLUSH_CPU_CACHE(); + } /* Select the next state and update statistics. */ cx_next = &sc->cpu_cx_states[cx_next_idx]; @@ -888,10 +893,17 @@ return; } - /* For C3, disable bus master arbitration and enable bus master wake. */ + /* + * For C3, disable bus master arbitration and enable bus master wake + * if BM control is available, otherwise flush the CPU cache. + */ if (cx_next->type == ACPI_STATE_C3) { - AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1, ACPI_MTX_DO_NOT_LOCK); + if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { + AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); + AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1, + ACPI_MTX_DO_NOT_LOCK); + } else + ACPI_FLUSH_CPU_CACHE(); } /* @@ -956,8 +968,8 @@ { /* - * C3 is not supported on multiple CPUs since this would require - * flushing all caches which is currently too expensive. + * C3 on multiple CPUs requires using the expensive flush cache + * instruction. */ if (mp_ncpus > 1) cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; ==== //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.41 2004/10/06 07:26:52 imp Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.42 2004/10/11 21:10:23 imp Exp $ */ #include "opt_acpi.h" #include <sys/param.h> @@ -32,6 +32,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/sysctl.h> #include "acpi.h" #include <dev/acpica/acpivar.h> @@ -300,6 +301,9 @@ return (acpi_pcib_route_interrupt(pcib, dev, pin)); } +static int acpi_host_mem_start = 0x80000000; +TUNABLE_INT("hw.acpi.host_mem_start", &acpi_host_mem_start); + struct resource * acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -314,7 +318,7 @@ * is liekly OK. */ if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) - start = 0xfe000000; + start = acpi_host_mem_start; return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } ==== //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.33 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.34 2004/10/11 19:52:31 njl Exp $"); struct ad1816_info; @@ -673,6 +673,7 @@ }; DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0); +DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_ad1816, 1); ==== //depot/projects/hammer/sys/dev/sound/isa/es1888.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include <isa/isavar.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.11 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.12 2004/10/11 19:52:31 njl Exp $"); #ifdef __alpha__ static int @@ -171,6 +171,7 @@ }; DRIVER_MODULE(snd_es1888, isa, es1888_driver, pcm_devclass, 0, 0); +DRIVER_MODULE(snd_es1888, acpi, es1888_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_es1888, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_es1888, 1); ==== //depot/projects/hammer/sys/dev/sound/isa/gusc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ #include <alpha/isa/isavar.h> #endif -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.14 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.15 2004/10/11 19:52:31 njl Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e @@ -656,6 +656,7 @@ * gusc can be attached to an isa bus. */ DRIVER_MODULE(snd_gusc, isa, gusc_driver, gusc_devclass, 0, 0); +DRIVER_MODULE(snd_gusc, acpi, gusc_driver, gusc_devclass, 0, 0); MODULE_DEPEND(snd_gusc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_gusc, 1); ==== //depot/projects/hammer/sys/dev/sound/isa/sbc.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ #include <isa/isavar.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.42 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.43 2004/10/11 19:52:31 njl Exp $"); #define IO_MAX 3 #define IRQ_MAX 1 @@ -790,5 +790,6 @@ /* sbc can be attached to an isa bus. */ DRIVER_MODULE(snd_sbc, isa, sbc_driver, sbc_devclass, 0, 0); +DRIVER_MODULE(snd_sbc, acpi, sbc_driver, sbc_devclass, 0, 0); MODULE_DEPEND(snd_sbc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_sbc, 1); ==== //depot/projects/hammer/sys/geom/geom_io.c#29 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.62 2004/10/06 20:59:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.63 2004/10/11 21:22:59 ups Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -254,6 +254,9 @@ bp->bio_length, cp->provider->sectorsize)); } + g_trace(G_T_BIO, "bio_request(%p) from %p(%s) to %p(%s) cmd %d", + bp, cp, cp->geom->name, pp, pp->name, bp->bio_cmd); + bp->bio_from = cp; bp->bio_to = pp; bp->bio_error = 0; @@ -280,8 +283,6 @@ g_bioq_unlock(&g_bio_run_down); /* Pass it on down. */ - g_trace(G_T_BIO, "bio_request(%p) from %p(%s) to %p(%s) cmd %d", - bp, cp, cp->geom->name, pp, pp->name, bp->bio_cmd); wakeup(&g_wait_down); } ==== //depot/projects/hammer/sys/i386/pci/pci_bus.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.114 2004/10/06 15:18:12 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.115 2004/10/11 21:10:23 imp Exp $"); #include "opt_cpu.h" @@ -35,6 +35,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/sysctl.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -469,6 +470,16 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); + +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + static struct resource * legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -481,9 +492,12 @@ * found to do it. This is typically only used on older laptops * that don't have pci busses behind pci bridge, so assuming > 32MB * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. */ if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) - start = 0xfe000000; + start = legacy_host_mem_start; return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } ==== //depot/projects/hammer/sys/kern/uipc_mbuf2.c#13 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.28 2004/10/10 09:16:48 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.29 2004/10/11 18:40:19 glebius Exp $"); /*#define PULLDOWN_DEBUG*/ @@ -302,8 +302,8 @@ } /* Free a packet tag. */ -static void -_m_tag_free(struct m_tag *t) +void +m_tag_free_default(struct m_tag *t) { #ifdef MAC if (t->m_tag_id == PACKET_TAG_MACLABEL) @@ -325,7 +325,7 @@ if (t == NULL) return NULL; m_tag_setup(t, cookie, type, len); - t->m_tag_free = _m_tag_free; + t->m_tag_free = m_tag_free_default; return t; } ==== //depot/projects/hammer/sys/net/netisr.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/netisr.c,v 1.14 2004/09/03 01:37:02 rwatson Exp $ + * $FreeBSD: src/sys/net/netisr.c,v 1.15 2004/10/11 20:01:43 andre Exp $ */ #include "opt_net.h" @@ -185,6 +185,7 @@ ni->ni_handler = NULL; if (ni->ni_queue != NULL) IF_DRAIN(ni->ni_queue); + ni->ni_queue = NULL; } struct isrstat { ==== //depot/projects/hammer/sys/sys/mbuf.h#33 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.161 2004/10/10 09:16:48 glebius Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.162 2004/10/11 18:40:19 glebius Exp $ */ #ifndef _SYS_MBUF_H_ @@ -648,6 +648,7 @@ struct m_tag *m_tag_alloc(u_int32_t, int, int, int); void m_tag_delete(struct mbuf *, struct m_tag *); void m_tag_delete_chain(struct mbuf *, struct m_tag *); +void m_tag_free_default(struct m_tag *); struct m_tag *m_tag_locate(struct mbuf *, u_int32_t, int, struct m_tag *); struct m_tag *m_tag_copy(struct m_tag *, int); int m_tag_copy_chain(struct mbuf *, struct mbuf *, int); ==== //depot/projects/hammer/tools/regression/lib/msun/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.1 2004/06/11 03:22:34 das Exp $ +# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.2 2004/10/11 18:40:45 stefanf Exp $ -TESTS= test-fenv +TESTS= test-fenv test-ilogb CFLAGS+= -O0 -lm ARCH!= uname -m .if ${ARCH} == "alpha"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410112140.i9BLe4LA094043>