From owner-p4-projects@FreeBSD.ORG Tue Apr 6 12:28:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDCAA16A4D0; Tue, 6 Apr 2004 12:28:30 -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 B7D5B16A4CE for ; Tue, 6 Apr 2004 12:28:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99D9D43D53 for ; Tue, 6 Apr 2004 12:28:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i36JRMGe039218 for ; Tue, 6 Apr 2004 12:27:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i36JRMR9039215 for perforce@freebsd.org; Tue, 6 Apr 2004 12:27:22 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 6 Apr 2004 12:27:22 -0700 (PDT) Message-Id: <200404061927.i36JRMR9039215@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 50497 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: Tue, 06 Apr 2004 19:28:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=50497 Change 50497 by peter@peter_daintree on 2004/04/06 12:26:58 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/db_interface.c#18 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#62 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#38 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#10 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#24 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#26 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#28 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/db_interface.c#18 (text+ko) ==== @@ -57,18 +57,6 @@ static jmp_buf db_global_jmpbuf; -static __inline u_short -rss(void) -{ - u_short ss; -#ifdef __GNUC__ - __asm __volatile("mov %%ss,%0" : "=r" (ss)); -#else - ss = 0; /* XXXX Fix for other compilers. */ -#endif - return ss; -} - /* * kdb_trap - field a TRACE or BPT trap */ ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#62 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#38 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#10 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#24 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1148) +# (XXX from i386:NOTES,v 1.1150) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # @@ -254,6 +254,14 @@ #device pst # +# 3ware 9000 series PATA/SATA RAID controller driver and options. +# The driver is implemented as a SIM, and so, needs the CAM infrastructure. +# +options TWA_DEBUG # 0-10; 10 prints the most messages. +options TWA_FLASH_FIRMWARE # firmware image bundled when defined. +device twa # 3ware 9000 series PATA/SATA RAID + +# # SCSI host adapters: # # ncv: NCR 53C500 based SCSI host adapters. ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#26 (text+ko) ==== @@ -498,6 +498,14 @@ return (sel); } +static __inline u_int +rss(void) +{ + u_int sel; + __asm __volatile("movl %%ss,%0" : "=rm" (sel)); + return (sel); +} + static __inline void load_ds(u_int sel) { ==== //depot/projects/hammer/sys/amd64/include/pmap.h#28 (text+ko) ==== @@ -257,7 +257,6 @@ extern caddr_t CADDR1; extern pt_entry_t *CMAP1; extern vm_paddr_t avail_end; -extern vm_paddr_t avail_start; extern vm_paddr_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end;