From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:11:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ED2637B404; Wed, 30 Apr 2003 15:11:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 588E037B401 for ; Wed, 30 Apr 2003 15:11:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E577A43F3F for ; Wed, 30 Apr 2003 15:11:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3UMBs0U003477 for ; Wed, 30 Apr 2003 15:11:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMBsSH003465 for perforce@freebsd.org; Wed, 30 Apr 2003 15:11:54 -0700 (PDT) Date: Wed, 30 Apr 2003 15:11:54 -0700 (PDT) Message-Id: <200304302211.h3UMBsSH003465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2003 22:11:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30155 Change 30155 by peter@peter_daintree on 2003/04/30 15:11:07 IFC @30154 Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/i386_module.c#4 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#4 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#15 integrate .. //depot/projects/hammer/sys/sys/user.h#6 integrate Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/i386_module.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/boot/i386/libi386/i386_module.c,v 1.9 2002/09/05 11:16:23 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.10 2003/04/30 22:02:39 peter Exp $ */ /* @@ -51,7 +51,7 @@ /* autoload ACPI support */ if (file_findfile(NULL, "elf64 kernel") != NULL) - return (0); /* ACPI is mandatory on hammer */ + return (0); /* ACPI is mandatory */ /* XXX should be in 4th keyed off acpi_load */ disabled = 0; ==== //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 - * $FreeBSD: src/sys/boot/powerpc/loader/metadata.c,v 1.2 2002/11/10 19:17:36 jake Exp $ + * $FreeBSD: src/sys/boot/powerpc/loader/metadata.c,v 1.3 2003/04/30 22:00:15 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.8 2002/11/10 19:17:36 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.9 2003/04/30 22:00:16 peter Exp $ */ #include ==== //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#11 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.53 2003/04/25 01:50:30 deischen Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.55 2003/04/30 22:09:26 peter Exp $"); #include "opt_ddb.h" #include "opt_compat.h" ==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27 - * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.90 2003/04/25 01:50:30 deischen Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.92 2003/04/30 22:09:26 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/sys/user.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)user.h 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/sys/user.h,v 1.51 2002/10/15 00:02:50 peter Exp $ + * $FreeBSD: src/sys/sys/user.h,v 1.52 2003/04/30 22:06:39 peter Exp $ */ #ifndef _SYS_USER_H_ @@ -74,7 +74,8 @@ * to initialize it in two places: kern/kern_proc.c in the function * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist. */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || \ + defined(__amd64__) #define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */ #endif #ifdef __i386__