From owner-p4-projects@FreeBSD.ORG Fri Oct 14 18:52:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C5ED16A421; Fri, 14 Oct 2005 18:52:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 CCFE516A41F for ; Fri, 14 Oct 2005 18:52:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F4FA43D6E for ; Fri, 14 Oct 2005 18:52:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9EIq770077079 for ; Fri, 14 Oct 2005 18:52:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9EIq7PE077076 for perforce@freebsd.org; Fri, 14 Oct 2005 18:52:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Oct 2005 18:52:07 GMT Message-Id: <200510141852.j9EIq7PE077076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 85298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Oct 2005 18:52:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=85298 Change 85298 by jhb@jhb_slimer on 2005/10/14 18:51:44 IFC @85297. Affected files ... .. //depot/projects/smpng/sys/arm/include/atomic.h#21 integrate .. //depot/projects/smpng/sys/conf/files#153 integrate .. //depot/projects/smpng/sys/conf/options#108 integrate .. //depot/projects/smpng/sys/dev/sx/cd1865.h#3 delete .. //depot/projects/smpng/sys/dev/sx/sx.c#7 delete .. //depot/projects/smpng/sys/dev/sx/sx.h#6 delete .. //depot/projects/smpng/sys/dev/sx/sx_pci.c#5 delete .. //depot/projects/smpng/sys/dev/sx/sx_util.c#3 delete .. //depot/projects/smpng/sys/dev/sx/sx_util.h#3 delete .. //depot/projects/smpng/sys/dev/sx/sxvar.h#3 delete .. //depot/projects/smpng/sys/i386/conf/NOTES#107 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#44 integrate Differences ... ==== //depot/projects/smpng/sys/arm/include/atomic.h#21 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.11 2005/09/27 17:39:10 jhb Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.13 2005/10/14 18:36:49 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/smpng/sys/conf/files#153 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1056 2005/10/06 19:06:06 pjd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1057 2005/10/14 18:24:57 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -901,10 +901,6 @@ dev/stg/tmc18c30_pci.c optional stg pci dev/stg/tmc18c30_subr.c optional stg dev/streams/streams.c optional streams -dev/sx/sx.c optional sx -#dev/sx/sx_isa.c optional sx isa -dev/sx/sx_util.c optional sx -dev/sx/sx_pci.c optional sx pci dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" dev/syscons/blank/blank_saver.c optional blank_saver ==== //depot/projects/smpng/sys/conf/options#108 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.516 2005/10/05 10:09:14 glebius Exp $ +# $FreeBSD: src/sys/conf/options,v 1.517 2005/10/14 18:24:58 jhb Exp $ # # On the handling of kernel options # @@ -478,7 +478,6 @@ LOCKF_DEBUG opt_debug_lockf.h NETATALKDEBUG opt_atalk.h SI_DEBUG opt_debug_si.h -SX_DEBUG opt_debug_sx.h # Fb options FB_DEBUG opt_fb.h ==== //depot/projects/smpng/sys/i386/conf/NOTES#107 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1207 2005/10/14 17:22:28 ru Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1208 2005/10/14 18:24:58 jhb Exp $ # # @@ -692,9 +692,6 @@ device spic hint.spic.0.at="isa" hint.spic.0.port="0x10a0" -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu ==== //depot/projects/smpng/sys/pc98/conf/NOTES#44 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.63 2005/10/07 09:23:51 glebius Exp $ +# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.64 2005/10/14 18:24:58 jhb Exp $ # # @@ -460,9 +460,6 @@ hint.pmc.0.at="isa" hint.pmc.0.port="0x8f0" device pmtimer # Adjust system timer at wakeup time -# sx device is i386 and pc98 only at the moment. -device sx -options SX_DEBUG # # Laptop/Notebook options: