Date: Tue, 30 Apr 2002 19:59:18 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10558 for review Message-ID: <200205010259.g412xIV47235@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10558 Change 10558 by peter@peter_daintree on 2002/04/30 19:58:34 IFC @10557 Affected files ... ... //depot/projects/ia64/release/scripts/bin-install.sh#3 delete ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#9 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#6 integrate ... //depot/projects/ia64/sys/kern/kern_environment.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#8 integrate ... //depot/projects/ia64/sys/kern/subr_hints.c#4 integrate ... //depot/projects/ia64/sys/kern/vnode_if.pl#3 delete ... //depot/projects/ia64/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/drm/radeon/Makefile#2 integrate Differences ... ==== //depot/projects/ia64/sys/compat/linux/linux_misc.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.120 2002/04/20 14:43:34 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ */ #include "opt_compat.h" @@ -64,13 +64,7 @@ #include <vm/vm_object.h> #include <vm/swap_pager.h> -#include <machine/frame.h> #include <machine/limits.h> -#include <machine/psl.h> -#include <machine/sysarch.h> -#ifdef __i386__ -#include <machine/segments.h> -#endif #include <posix4/sched.h> ==== //depot/projects/ia64/sys/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.120 2002/04/29 06:35:25 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.121 2002/05/01 01:32:28 peter Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -82,6 +82,10 @@ KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy +.if defined(KMODDEPS) +.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.endif + .include <bsd.init.mk> .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S ==== //depot/projects/ia64/sys/kern/kern_environment.c#3 (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/kern/kern_environment.c,v 1.23 2002/04/25 20:25:15 bde Exp $ + * $FreeBSD: src/sys/kern/kern_environment.c,v 1.24 2002/05/01 02:51:50 peter Exp $ */ /* @@ -85,7 +85,7 @@ char *name, *value; size_t len, done; int error, i; - + KASSERT(dynamic_kenv, ("kenv: dynamic_kenv = 0")); error = 0; @@ -368,16 +368,16 @@ int getenv_string(const char *name, char *data, int size) { - char *tmp; + char *tmp; - tmp = getenv(name); - if (tmp != NULL) { - strncpy(data, tmp, size); - freeenv(tmp); - data[size - 1] = 0; - return (1); - } else - return (0); + tmp = getenv(name); + if (tmp != NULL) { + strncpy(data, tmp, size); + freeenv(tmp); + data[size - 1] = 0; + return (1); + } else + return (0); } /* @@ -386,14 +386,13 @@ int getenv_int(const char *name, int *data) { - quad_t tmp; - int rval; + quad_t tmp; + int rval; - rval = getenv_quad(name, &tmp); - if (rval) { - *data = (int) tmp; - } - return (rval); + rval = getenv_quad(name, &tmp); + if (rval) + *data = (int) tmp; + return (rval); } /* @@ -402,22 +401,21 @@ int getenv_quad(const char *name, quad_t *data) { - char *value; - char *vtp; - quad_t iv; - - if ((value = getenv(name)) == NULL) - return(0); - - iv = strtoq(value, &vtp, 0); - if ((vtp == value) || (*vtp != '\0')) { - freeenv(value); - return(0); - } - - freeenv(value); - *data = iv; - return(1); + char *value; + char *vtp; + quad_t iv; + + value = getenv(name); + if (value == NULL) + return (0); + iv = strtoq(value, &vtp, 0); + if ((vtp == value) || (*vtp != '\0')) { + freeenv(value); + return (0); + } + freeenv(value); + *data = iv; + return (1); } /* @@ -427,14 +425,15 @@ static char * kernenv_next(char *cp) { - if (cp != NULL) { - while (*cp != 0) - cp++; - cp++; - if (*cp == 0) - cp = NULL; - } - return(cp); + + if (cp != NULL) { + while (*cp != 0) + cp++; + cp++; + if (*cp == 0) + cp = NULL; + } + return (cp); } void ==== //depot/projects/ia64/sys/kern/kern_tc.c#8 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/kern/kern_tc.c,v 1.131 2002/04/30 20:42:06 phk Exp $ + * $FreeBSD: src/sys/kern/kern_tc.c,v 1.132 2002/05/01 01:31:26 peter Exp $ */ #include "opt_ntp.h" @@ -19,8 +19,6 @@ #include <sys/timepps.h> #include <sys/timex.h> -#include <machine/psl.h> - /* * Implement a dummy timecounter which we can use until we get a real one * in the air. This allows the console and other early stuff to use ==== //depot/projects/ia64/sys/kern/subr_hints.c#4 (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/kern/subr_hints.c,v 1.6 2002/04/27 22:32:57 peter Exp $ + * $FreeBSD: src/sys/kern/subr_hints.c,v 1.7 2002/05/01 02:51:50 peter Exp $ */ #include <sys/param.h> @@ -61,7 +61,7 @@ if (checkmethod) { switch (hintmode) { - case 0: /* config supplied nothing */ + case 0: /* loader hints in environment only */ break; case 1: /* static hints only */ hintp = static_hints; @@ -118,9 +118,8 @@ sx_sunlock(&kenv_lock); return (ENOENT); } - } else { + } else cp = hintp; - } while (cp) { hit = 1; (*line)++; ==== //depot/projects/ia64/sys/modules/drm/mga/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/drm/mga/Makefile,v 1.2 2002/04/28 04:58:36 anholt Exp $ +# $FreeBSD: src/sys/modules/drm/mga/Makefile,v 1.3 2002/05/01 01:34:48 peter Exp $ .PATH: ${.CURDIR}/../../../dev/drm KMOD = mga NOMAN = YES SRCS = mga_drv.c mga_state.c mga_warp.c mga_dma.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h -KMODDEPS= agp .include <bsd.kmod.mk> ==== //depot/projects/ia64/sys/modules/drm/r128/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/drm/r128/Makefile,v 1.2 2002/04/28 04:58:37 anholt Exp $ +# $FreeBSD: src/sys/modules/drm/r128/Makefile,v 1.3 2002/05/01 01:34:48 peter Exp $ .PATH: ${.CURDIR}/../../../dev/drm KMOD = r128 NOMAN = YES SRCS = r128_cce.c r128_drv.c r128_state.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h -KMODDEPS= agp .include <bsd.kmod.mk> ==== //depot/projects/ia64/sys/modules/drm/radeon/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/drm/radeon/Makefile,v 1.2 2002/04/28 04:58:38 anholt Exp $ +# $FreeBSD: src/sys/modules/drm/radeon/Makefile,v 1.3 2002/05/01 01:34:48 peter Exp $ .PATH: ${.CURDIR}/../../../dev/drm KMOD = radeon NOMAN = YES SRCS = radeon_cp.c radeon_drv.c radeon_state.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h -KMODDEPS= agp .include <bsd.kmod.mk> 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?200205010259.g412xIV47235>