Date: Sat, 4 Nov 2006 05:17:24 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109214 for review Message-ID: <200611040517.kA45HOUM001493@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109214 Change 109214 by jb@jb_freebsd8 on 2006/11/04 05:16:40 IFC Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/DEFAULTS#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/DEFAULTS#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#6 integrate Differences ... ==== //depot/projects/dtrace/src/sys/amd64/conf/DEFAULTS#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:24 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ machine amd64 ==== //depot/projects/dtrace/src/sys/i386/conf/DEFAULTS#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/i386 # -# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ machine i386 ==== //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/ia64 # -# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ machine ia64 ==== //depot/projects/dtrace/src/sys/pc98/conf/DEFAULTS#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/pc98 # -# $FreeBSD: src/sys/pc98/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/pc98/conf/DEFAULTS,v 1.8 2006/11/04 04:58:10 jb Exp $ machine pc98 i386 options PC98 ==== //depot/projects/dtrace/src/sys/powerpc/conf/DEFAULTS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/powerpc # -# $FreeBSD: src/sys/powerpc/conf/DEFAULTS,v 1.5 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/powerpc/conf/DEFAULTS,v 1.6 2006/11/04 04:58:10 jb Exp $ machine powerpc ==== //depot/projects/dtrace/src/sys/sparc64/conf/DEFAULTS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/sparc64 # -# $FreeBSD: src/sys/sparc64/conf/DEFAULTS,v 1.7 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/sparc64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:10 jb Exp $ machine sparc64 ==== //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.130 2006/10/26 21:42:22 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.131 2006/11/04 04:58:10 jb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -330,6 +330,12 @@ tick_init(clock); /* + * Initialize global registers. + */ + pc = (struct pcpu *)(pcpu0 + (PCPU_PAGES * PAGE_SIZE)) - 1; + cpu_setregs(pc); + + /* * Initialize the console before printing anything. */ cninit(); @@ -409,7 +415,6 @@ * stack, so don't pass the real size (PAGE_SIZE) to pcpu_init or * it'll zero it out from under us. */ - pc = (struct pcpu *)(pcpu0 + (PCPU_PAGES * PAGE_SIZE)) - 1; pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; @@ -421,11 +426,6 @@ pc->pc_tlb_ctx_max = TLB_CTX_USER_MAX; /* - * Initialize global registers. - */ - cpu_setregs(pc); - - /* * Initialize the message buffer (after setting trap table). */ msgbufinit(msgbufp, MSGBUF_SIZE); ==== //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#6 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/sun4v # -# $FreeBSD: src/sys/sun4v/conf/DEFAULTS,v 1.2 2006/10/26 22:05:25 jb Exp $ +# $FreeBSD: src/sys/sun4v/conf/DEFAULTS,v 1.3 2006/11/04 04:58:10 jb Exp $ machine sun4v
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611040517.kA45HOUM001493>