From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:12:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2007037B401; Wed, 30 Apr 2003 21:12:33 -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 7C5CA37B426 for ; Wed, 30 Apr 2003 21:12:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02D6743FAF for ; Wed, 30 Apr 2003 21:12:32 -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 h414CV0U009118 for ; Wed, 30 Apr 2003 21:12:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414CVAo009115 for perforce@freebsd.org; Wed, 30 Apr 2003 21:12:31 -0700 (PDT) Date: Wed, 30 Apr 2003 21:12:31 -0700 (PDT) Message-Id: <200305010412.h414CVAo009115@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 30263 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: Thu, 01 May 2003 04:12:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30263 Change 30263 by peter@peter_daintree on 2003/04/30 21:12:29 rcsid and header sync Affected files ... .. //depot/projects/hammer/sys/boot/common/load_elf32.c#3 edit .. //depot/projects/hammer/sys/boot/common/load_elf64.c#3 edit .. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#4 edit .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#6 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/load_elf32.c#3 (text+ko) ==== @@ -1,2 +1,3 @@ +* $FreeBSD: src/sys/boot/common/load_elf32.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */ #define __ELF_WORD_SIZE 32 #include "load_elf.c" ==== //depot/projects/hammer/sys/boot/common/load_elf64.c#3 (text+ko) ==== @@ -1,2 +1,3 @@ +/* $FreeBSD: src/sys/boot/common/load_elf64.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */ #define __ELF_WORD_SIZE 64 #include "load_elf.c" ==== //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#4 (text+ko) ==== @@ -1,3 +1,35 @@ +/*- + * Copyright (c) 2003 Peter Wemm + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (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/boot/i386/libi386/amd64_tramp.S,v 1.1 2003/05/01 03:56:29 peter Exp $ + */ + +/* + * Quick and dirty trampoline to get into 64 bit (long) mode and running + * with paging enabled so that we enter the kernel at its linked address. + */ #define MSR_EFER 0xc0000080 #define EFER_LME 0x00000100 #define CR4_PAE 0x00000020 ==== //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#6 (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/biosmem.c,v 1.6 2002/09/23 18:54:26 alfred Exp $ + * FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */ /*