From owner-p4-projects@FreeBSD.ORG Sun Apr 27 09:36:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADE6737B410; Sun, 27 Apr 2003 09:36:44 -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 3B2DE37B405 for ; Sun, 27 Apr 2003 09:36:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C441543F93 for ; Sun, 27 Apr 2003 09:36:43 -0700 (PDT) (envelope-from obrien@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 h3RGah0U093781 for ; Sun, 27 Apr 2003 09:36:43 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RGahJd093771 for perforce@freebsd.org; Sun, 27 Apr 2003 09:36:43 -0700 (PDT) Date: Sun, 27 Apr 2003 09:36:43 -0700 (PDT) Message-Id: <200304271636.h3RGahJd093771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29879 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: Sun, 27 Apr 2003 16:36:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=29879 Change 29879 by obrien@obrien_trang on 2003/04/27 09:36:19 xl(4) works. Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#10 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# +# ex:ts=8 # GENERIC -- Generic kernel configuration file for FreeBSD/i386 # # For more information on this file, please read the handbook section on @@ -40,6 +40,7 @@ device miibus device bge device fxp +device xl device random # Entropy device device loop From owner-p4-projects@FreeBSD.ORG Sun Apr 27 09:46:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85A7137B404; Sun, 27 Apr 2003 09:46:57 -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 2224E37B401 for ; Sun, 27 Apr 2003 09:46:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B381443F75 for ; Sun, 27 Apr 2003 09:46:56 -0700 (PDT) (envelope-from obrien@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 h3RGku0U001318 for ; Sun, 27 Apr 2003 09:46:56 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RGkuTD001313 for perforce@freebsd.org; Sun, 27 Apr 2003 09:46:56 -0700 (PDT) Date: Sun, 27 Apr 2003 09:46:56 -0700 (PDT) Message-Id: <200304271646.h3RGkuTD001313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29880 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: Sun, 27 Apr 2003 16:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=29880 Change 29880 by obrien@obrien_trang on 2003/04/27 09:46:08 sync layout with i386/GENERIC so we can more easily see what's present and what's missing. Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.368 2002/10/13 16:29:15 mike Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ machine x86_64 cpu HAMMER @@ -25,41 +25,29 @@ makeoptions NO_MODULES=not_yet -options INET -options SCHED_4BSD -options FFS -options SOFTUPDATES -options MD_ROOT -device isa -device sio +#To statically compile in device wiring instead of /boot/device.hints +#hints "GENERIC.hints" #Default places to look for devices. -options INVARIANTS -options INVARIANT_SUPPORT +options SCHED_4BSD #4BSD scheduler +options INET #InterNETworking +options FFS #Berkeley Fast Filesystem +options SOFTUPDATES #Enable FFS soft updates support +options MD_ROOT #MD is a potential root device +options NFSCLIENT #Network Filesystem Client +options NFS_ROOT #NFS usable as root device, requires NFSCLIENT -device pci -device miibus -device bge -device fxp -device xl +# Debugging for use in -current +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -device random # Entropy device -device loop -device ether -device md +device isa +device pci -device ata -device atadisk -device atapicd # ATAPI CDROM drives +# ATA and ATAPI devices +device ata +device atadisk # ATA disk drives +device atapicd # ATAPI CDROM drives -# USB support -#device uhci # UHCI PCI->USB interface -#device ohci # OHCI PCI->USB interface -#device usb # USB Bus (required) -#device ugen # Generic -#device uhid # "Human Interface Devices" -#device ukbd # Keyboard - - # atkbdc0 controls both the keyboard and the PS/2 mouse #device atkbdc # AT keyboard controller #device atkbd # AT keyboard @@ -74,7 +62,31 @@ #device agp # support several AGP chipsets +# Serial (COM) ports +device sio # 8250, 16[45]50 based serial ports + # Parallel port #device ppc #device ppbus # Parallel port bus (required) #device lpt # Printer + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') +device bge # Broadcom BCM570xx Gigabit Ethernet + +# Pseudo devices - the number indicates how many units to allocate. +device random # Entropy device +device loop # Network loopback +device ether # Ethernet support +device md # Memory "disks" + +# USB support +#device uhci # UHCI PCI->USB interface +#device ohci # OHCI PCI->USB interface +#device usb # USB Bus (required) +#device ugen # Generic +#device uhid # "Human Interface Devices" +#device ukbd # Keyboard From owner-p4-projects@FreeBSD.ORG Sun Apr 27 09:56:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 363A037B404; Sun, 27 Apr 2003 09:56:09 -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 DBD8A37B401 for ; Sun, 27 Apr 2003 09:56:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 737D243F75 for ; Sun, 27 Apr 2003 09:56:08 -0700 (PDT) (envelope-from obrien@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 h3RGu80U007724 for ; Sun, 27 Apr 2003 09:56:08 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RGu8rE007717 for perforce@freebsd.org; Sun, 27 Apr 2003 09:56:08 -0700 (PDT) Date: Sun, 27 Apr 2003 09:56:08 -0700 (PDT) Message-Id: <200304271656.h3RGu8rE007717@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29881 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: Sun, 27 Apr 2003 16:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=29881 Change 29881 by obrien@obrien_trang on 2003/04/27 09:56:01 Crud. The last commit included NFSCLIENT and NFS_ROOT, which I wanted to commit seperately. Well, they work. :-) # df / Filesystem 512-blocks Used Avail Capacity Mounted on 192.168.1.1:/FBSD/x86-64/nfsroot 52458200 40438300 7823244 0% / Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Apr 27 11:13:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59AD737B404; Sun, 27 Apr 2003 11:13:43 -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 E037837B401 for ; Sun, 27 Apr 2003 11:13:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 788F443F85 for ; Sun, 27 Apr 2003 11:13:42 -0700 (PDT) (envelope-from jmallett@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 h3RIDg0U064637 for ; Sun, 27 Apr 2003 11:13:42 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RIDgER064628 for perforce@freebsd.org; Sun, 27 Apr 2003 11:13:42 -0700 (PDT) Date: Sun, 27 Apr 2003 11:13:42 -0700 (PDT) Message-Id: <200304271813.h3RIDgER064628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29882 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: Sun, 27 Apr 2003 18:13:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=29882 Change 29882 by jmallett@jmallett_dalek on 2003/04/27 11:13:08 Grrr. (Was re: chase config(8) version.) Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#9 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#9 (text+ko) ==== @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500011 +%VERSREQ= 500012 # We support multiple platforms, and would do well to have a variable for # the platform we are building for. From owner-p4-projects@FreeBSD.ORG Sun Apr 27 11:31:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F1C837B404; Sun, 27 Apr 2003 11:31:04 -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 57F9637B401 for ; Sun, 27 Apr 2003 11:31:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02D1B43FA3 for ; Sun, 27 Apr 2003 11:31:04 -0700 (PDT) (envelope-from marcel@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 h3RIV30U077089 for ; Sun, 27 Apr 2003 11:31:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RIV3L7077081 for perforce@freebsd.org; Sun, 27 Apr 2003 11:31:03 -0700 (PDT) Date: Sun, 27 Apr 2003 11:31:03 -0700 (PDT) Message-Id: <200304271831.h3RIV3L7077081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29883 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: Sun, 27 Apr 2003 18:31:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=29883 Change 29883 by marcel@marcel_nfs on 2003/04/27 11:30:56 Prefer ar.bsp over ar.bspstore. The value of ar.bspstore is supposed to be equal to the value of ar.bsp due to flushing the register stack, but a PAL bug existed where a PMI could cause RSE spills or fills to fail to complete. This makes me wonder: why use a register that has a more dynamic nature than one that is invariant over the course of this function and has the value we're interested in? This change doesn't fix a problem (alas, because it means I still have to fix the problem I hoped this would fix :-) and is probably gratuitous for all practical purposes but it has higher quality this way. For example: ar.bsp may have faster access times because it's invariant. The RSE has to synchronize access to ar.bspstore with RSE operation... Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#13 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#13 (text+ko) ==== @@ -197,7 +197,7 @@ } { .mmi st8 [r31]=r16,16 // pr - mov r17=ar.bspstore + mov r17=ar.bsp mov r16=ar.pfs ;; } From owner-p4-projects@FreeBSD.ORG Sun Apr 27 11:47:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F0A037B404; Sun, 27 Apr 2003 11:47:25 -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 CF25737B401 for ; Sun, 27 Apr 2003 11:47:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B34243F3F for ; Sun, 27 Apr 2003 11:47:24 -0700 (PDT) (envelope-from marcel@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 h3RIlO0U089449 for ; Sun, 27 Apr 2003 11:47:24 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RIlN43089443 for perforce@freebsd.org; Sun, 27 Apr 2003 11:47:23 -0700 (PDT) Date: Sun, 27 Apr 2003 11:47:23 -0700 (PDT) Message-Id: <200304271847.h3RIlN43089443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29884 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: Sun, 27 Apr 2003 18:47:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=29884 Change 29884 by marcel@marcel_nfs on 2003/04/27 11:46:42 Make DDB usable again. This is not complete yet. Handling of stacked registers has been left out (just like for the handling of the unaligned accesses). Also, we don't print the preserved registers because we have to unwind to get them. This all begs for some thought and planning. While typing commit logs, I may as well add that it would be nice to more clearly see which registers have NaT bits set. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#5 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/db_trace.c#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#5 (text+ko) ==== @@ -69,71 +69,61 @@ int db_active; db_regs_t ddb_regs; -static u_int64_t zero; static int db_get_rse_reg(struct db_variable *vp, db_expr_t *valuep, int op); -static int db_get_pc_reg(struct db_variable *vp, db_expr_t *valuep, int op); +static int db_get_ip_reg(struct db_variable *vp, db_expr_t *valuep, int op); struct db_variable db_regs[] = { /* Misc control/app registers */ #define DB_MISC_REGS 13 /* make sure this is correct */ - {"pc", (db_expr_t*) 0, db_get_pc_reg}, - {"ip", (db_expr_t*) &ddb_regs.tf_special.iip, FCN_NULL}, + {"ip", NULL, db_get_ip_reg}, {"psr", (db_expr_t*) &ddb_regs.tf_special.psr, FCN_NULL}, {"cr.isr", (db_expr_t*) &ddb_regs.tf_special.isr, FCN_NULL}, {"cr.ifa", (db_expr_t*) &ddb_regs.tf_special.ifa, FCN_NULL}, {"pr", (db_expr_t*) &ddb_regs.tf_special.pr, FCN_NULL}, {"ar.rsc", (db_expr_t*) &ddb_regs.tf_special.rsc, FCN_NULL}, {"ar.pfs", (db_expr_t*) &ddb_regs.tf_special.pfs, FCN_NULL}, - {"cr.ifs", (db_expr_t*) &ddb_regs.tf_special.ifs, FCN_NULL}, + {"cr.ifs", (db_expr_t*) &ddb_regs.tf_special.cfm, FCN_NULL}, {"ar.bspstore", (db_expr_t*) &ddb_regs.tf_special.bspstore, FCN_NULL}, + {"ndirty", (db_expr_t*) &ddb_regs.tf_special.ndirty, FCN_NULL}, {"ar.rnat", (db_expr_t*) &ddb_regs.tf_special.rnat, FCN_NULL}, - {"ar.unat", (db_expr_t*) &ddb_regs.tf_special.nat, FCN_NULL}, + {"ar.unat", (db_expr_t*) &ddb_regs.tf_special.unat, FCN_NULL}, {"ar.fpsr", (db_expr_t*) &ddb_regs.tf_special.fpsr, FCN_NULL}, /* Branch registers */ - {"rp", (db_expr_t*) &ddb_regs.tf_b[0], FCN_NULL}, - {"b1", (db_expr_t*) &ddb_regs.tf_b[1], FCN_NULL}, - {"b2", (db_expr_t*) &ddb_regs.tf_b[2], FCN_NULL}, - {"b3", (db_expr_t*) &ddb_regs.tf_b[3], FCN_NULL}, - {"b4", (db_expr_t*) &ddb_regs.tf_b[4], FCN_NULL}, - {"b5", (db_expr_t*) &ddb_regs.tf_b[5], FCN_NULL}, - {"b6", (db_expr_t*) &ddb_regs.tf_b[6], FCN_NULL}, - {"b7", (db_expr_t*) &ddb_regs.tf_b[7], FCN_NULL}, + {"rp", (db_expr_t*) &ddb_regs.tf_special.rp, FCN_NULL}, + /* b1, b2, b3, b4, b5 are preserved */ + {"b6", (db_expr_t*) &ddb_regs.tf_scratch.br6, FCN_NULL}, + {"b7", (db_expr_t*) &ddb_regs.tf_scratch.br7, FCN_NULL}, /* Static registers */ - {"r0", (db_expr_t*) &zero, FCN_NULL}, - {"gp", (db_expr_t*) &ddb_regs.tf_r[FRAME_R1], FCN_NULL}, - {"r2", (db_expr_t*) &ddb_regs.tf_r[FRAME_R2], FCN_NULL}, - {"r3", (db_expr_t*) &ddb_regs.tf_r[FRAME_R3], FCN_NULL}, - {"r4", (db_expr_t*) &ddb_regs.tf_r[FRAME_R4], FCN_NULL}, - {"r5", (db_expr_t*) &ddb_regs.tf_r[FRAME_R5], FCN_NULL}, - {"r6", (db_expr_t*) &ddb_regs.tf_r[FRAME_R6], FCN_NULL}, - {"r7", (db_expr_t*) &ddb_regs.tf_r[FRAME_R7], FCN_NULL}, - {"r8", (db_expr_t*) &ddb_regs.tf_r[FRAME_R8], FCN_NULL}, - {"r9", (db_expr_t*) &ddb_regs.tf_r[FRAME_R9], FCN_NULL}, - {"r10", (db_expr_t*) &ddb_regs.tf_r[FRAME_R10], FCN_NULL}, - {"r11", (db_expr_t*) &ddb_regs.tf_r[FRAME_R11], FCN_NULL}, - {"sp", (db_expr_t*) &ddb_regs.tf_r[FRAME_R12], FCN_NULL}, - {"r13", (db_expr_t*) &ddb_regs.tf_r[FRAME_R13], FCN_NULL}, - {"r14", (db_expr_t*) &ddb_regs.tf_r[FRAME_R14], FCN_NULL}, - {"r15", (db_expr_t*) &ddb_regs.tf_r[FRAME_R15], FCN_NULL}, - {"r16", (db_expr_t*) &ddb_regs.tf_r[FRAME_R16], FCN_NULL}, - {"r17", (db_expr_t*) &ddb_regs.tf_r[FRAME_R17], FCN_NULL}, - {"r18", (db_expr_t*) &ddb_regs.tf_r[FRAME_R18], FCN_NULL}, - {"r19", (db_expr_t*) &ddb_regs.tf_r[FRAME_R19], FCN_NULL}, - {"r20", (db_expr_t*) &ddb_regs.tf_r[FRAME_R20], FCN_NULL}, - {"r21", (db_expr_t*) &ddb_regs.tf_r[FRAME_R21], FCN_NULL}, - {"r22", (db_expr_t*) &ddb_regs.tf_r[FRAME_R22], FCN_NULL}, - {"r23", (db_expr_t*) &ddb_regs.tf_r[FRAME_R23], FCN_NULL}, - {"r24", (db_expr_t*) &ddb_regs.tf_r[FRAME_R24], FCN_NULL}, - {"r25", (db_expr_t*) &ddb_regs.tf_r[FRAME_R25], FCN_NULL}, - {"r26", (db_expr_t*) &ddb_regs.tf_r[FRAME_R26], FCN_NULL}, - {"r27", (db_expr_t*) &ddb_regs.tf_r[FRAME_R27], FCN_NULL}, - {"r28", (db_expr_t*) &ddb_regs.tf_r[FRAME_R28], FCN_NULL}, - {"r29", (db_expr_t*) &ddb_regs.tf_r[FRAME_R29], FCN_NULL}, - {"r30", (db_expr_t*) &ddb_regs.tf_r[FRAME_R30], FCN_NULL}, - {"r31", (db_expr_t*) &ddb_regs.tf_r[FRAME_R31], FCN_NULL}, + {"gp", (db_expr_t*) &ddb_regs.tf_special.gp, FCN_NULL}, + {"r2", (db_expr_t*) &ddb_regs.tf_scratch.gr2, FCN_NULL}, + {"r3", (db_expr_t*) &ddb_regs.tf_scratch.gr3, FCN_NULL}, + {"r8", (db_expr_t*) &ddb_regs.tf_scratch.gr8, FCN_NULL}, + {"r9", (db_expr_t*) &ddb_regs.tf_scratch.gr9, FCN_NULL}, + {"r10", (db_expr_t*) &ddb_regs.tf_scratch.gr10, FCN_NULL}, + {"r11", (db_expr_t*) &ddb_regs.tf_scratch.gr11, FCN_NULL}, + {"sp", (db_expr_t*) &ddb_regs.tf_special.sp, FCN_NULL}, + {"tp", (db_expr_t*) &ddb_regs.tf_special.tp, FCN_NULL}, + {"r14", (db_expr_t*) &ddb_regs.tf_scratch.gr14, FCN_NULL}, + {"r15", (db_expr_t*) &ddb_regs.tf_scratch.gr15, FCN_NULL}, + {"r16", (db_expr_t*) &ddb_regs.tf_scratch.gr16, FCN_NULL}, + {"r17", (db_expr_t*) &ddb_regs.tf_scratch.gr17, FCN_NULL}, + {"r18", (db_expr_t*) &ddb_regs.tf_scratch.gr18, FCN_NULL}, + {"r19", (db_expr_t*) &ddb_regs.tf_scratch.gr19, FCN_NULL}, + {"r20", (db_expr_t*) &ddb_regs.tf_scratch.gr20, FCN_NULL}, + {"r21", (db_expr_t*) &ddb_regs.tf_scratch.gr21, FCN_NULL}, + {"r22", (db_expr_t*) &ddb_regs.tf_scratch.gr22, FCN_NULL}, + {"r23", (db_expr_t*) &ddb_regs.tf_scratch.gr23, FCN_NULL}, + {"r24", (db_expr_t*) &ddb_regs.tf_scratch.gr24, FCN_NULL}, + {"r25", (db_expr_t*) &ddb_regs.tf_scratch.gr25, FCN_NULL}, + {"r26", (db_expr_t*) &ddb_regs.tf_scratch.gr26, FCN_NULL}, + {"r27", (db_expr_t*) &ddb_regs.tf_scratch.gr27, FCN_NULL}, + {"r28", (db_expr_t*) &ddb_regs.tf_scratch.gr28, FCN_NULL}, + {"r29", (db_expr_t*) &ddb_regs.tf_scratch.gr29, FCN_NULL}, + {"r30", (db_expr_t*) &ddb_regs.tf_scratch.gr30, FCN_NULL}, + {"r31", (db_expr_t*) &ddb_regs.tf_scratch.gr31, FCN_NULL}, /* Stacked registers */ {"r32", (db_expr_t*) 32, db_get_rse_reg}, @@ -238,28 +228,37 @@ static int db_get_rse_reg(struct db_variable *vp, db_expr_t *valuep, int op) { - int sof = ddb_regs.tf_cr_ifs & 0x7f; + int sof = ddb_regs.tf_special.cfm & 0x7f; int regno = (db_expr_t) vp->valuep; - u_int64_t *bsp = (u_int64_t *) (ddb_regs.tf_ar_bspstore + ddb_regs.tf_ndirty); +#if 0 + u_int64_t *bsp; u_int64_t *reg; +#endif if (regno - 32 >= sof) { if (op == DB_VAR_GET) *valuep = 0xdeadbeefdeadbeef; } else { +#if 0 + bsp = (u_int64_t *)(ddb_regs.tf_special.bspstore + + ddb_regs.tf_special.ndirty); bsp = ia64_rse_previous_frame(bsp, sof); reg = ia64_rse_register_address(bsp, regno); if (op == DB_VAR_GET) *valuep = *reg; else *reg = *valuep; +#else + if (op == DB_VAR_GET) + *valuep = 0xdeadbeefdeadbeef; +#endif } return 0; } static int -db_get_pc_reg(struct db_variable *vp, db_expr_t *valuep, int op) +db_get_ip_reg(struct db_variable *vp, db_expr_t *valuep, int op) { /* Read only */ if (op == DB_VAR_GET) @@ -350,8 +349,8 @@ /* * XXX pretend that registers outside the current frame don't exist. */ - db_eregs = db_regs + DB_MISC_REGS + 8 + 32 - + (ddb_regs.tf_cr_ifs & 0x7f); + db_eregs = db_regs + DB_MISC_REGS + 3 + 27 + + (ddb_regs.tf_special.cfm & 0x7f); __asm __volatile("flushrs"); /* so we can look at them */ @@ -462,10 +461,13 @@ return (0); if (regno < 32) { - return (regs->tf_r[regno - 1]); + return (0xdeadbeefdeadbeef); + /* return (regs->tf_r[regno - 1]); */ } else { - int sof = ddb_regs.tf_cr_ifs & 0x7f; - u_int64_t *bsp = (u_int64_t *) (ddb_regs.tf_ar_bspstore + ddb_regs.tf_ndirty); +#if 0 + int sof = ddb_regs.tf_special.cfm & 0x7f; + u_int64_t *bsp = (u_int64_t *)(ddb_regs.tf_special.bspstore + + ddb_regs.tf_special.ndirty); u_int64_t *reg; if (regno - 32 >= sof) { @@ -475,6 +477,9 @@ reg = ia64_rse_register_address(bsp, regno); return *reg; } +#else + return 0xdeadbeefdeadbeef; +#endif } } @@ -536,10 +541,10 @@ /* * Skip past the break instruction. */ - ddb_regs.tf_cr_ipsr += IA64_PSR_RI_1; - if ((ddb_regs.tf_cr_ipsr & IA64_PSR_RI) > IA64_PSR_RI_2) { - ddb_regs.tf_cr_ipsr &= ~IA64_PSR_RI; - ddb_regs.tf_cr_iip += 16; + ddb_regs.tf_special.psr += IA64_PSR_RI_1; + if ((ddb_regs.tf_special.psr & IA64_PSR_RI) > IA64_PSR_RI_2) { + ddb_regs.tf_special.psr &= ~IA64_PSR_RI; + ddb_regs.tf_special.iip += 16; } } ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_trace.c#3 (text+ko) ==== @@ -49,6 +49,7 @@ void db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) { +#if 0 struct ia64_unwind_state *us; if (count == -1) @@ -112,6 +113,7 @@ } ia64_free_unwind_state(us); +#endif } void From owner-p4-projects@FreeBSD.ORG Sun Apr 27 13:15:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 442BB37B404; Sun, 27 Apr 2003 13:15:19 -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 F05AF37B401 for ; Sun, 27 Apr 2003 13:15:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D23043F93 for ; Sun, 27 Apr 2003 13:15:18 -0700 (PDT) (envelope-from obrien@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 h3RKFI0U059704 for ; Sun, 27 Apr 2003 13:15:18 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RKFIwV059697 for perforce@freebsd.org; Sun, 27 Apr 2003 13:15:18 -0700 (PDT) Date: Sun, 27 Apr 2003 13:15:18 -0700 (PDT) Message-Id: <200304272015.h3RKFIwV059697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29891 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: Sun, 27 Apr 2003 20:15:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=29891 Change 29891 by obrien@obrien_trang on 2003/04/27 13:14:47 It's helpful to define TARGET_64BIT_DEFAULT. Unless one enjoys: cc1: sorry, not implemented: 64-bit mode not compiled in Affected files ... .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#5 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#5 (text+ko) ==== @@ -143,6 +143,10 @@ echo 'union tree_node;' >> ${.TARGET} echo 'typedef union tree_node *tree;' >> ${.TARGET} echo '' >> ${.TARGET} +# XXX: consider including i386/biarch64.h instead of below +.if ${TARGET_ARCH} == "amd64" + echo '#define TARGET_64BIT_DEFAULT 1' >>${.TARGET} +.endif .if ${TARGET_ARCH} == "ia64" echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} .endif From owner-p4-projects@FreeBSD.ORG Sun Apr 27 13:36:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9BE337B404; Sun, 27 Apr 2003 13:36:45 -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 81A0A37B401 for ; Sun, 27 Apr 2003 13:36:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B13243F85 for ; Sun, 27 Apr 2003 13:36:45 -0700 (PDT) (envelope-from marcel@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 h3RKai0U075283 for ; Sun, 27 Apr 2003 13:36:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RKai2j075274 for perforce@freebsd.org; Sun, 27 Apr 2003 13:36:44 -0700 (PDT) Date: Sun, 27 Apr 2003 13:36:44 -0700 (PDT) Message-Id: <200304272036.h3RKai2j075274@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29892 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: Sun, 27 Apr 2003 20:36:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=29892 Change 29892 by marcel@marcel_pluto2 on 2003/04/27 13:36:37 Step 1: Properly announce a constant timer as a bad timer. A constant timer is one that is both monotonically increasing and monotonically decreasing at the same time. This fixes the announcement on the HP rx2600 where we basicly read a bogus register due to not properly using the v2 ACPI tables and invariable read the same value. We were quite happy with this even if it made time stop completely when booting a SMP kernel. The 100% CPU usage for ntpd in an attempt to make time advance didn't make us unhappy. Except Kerberos: the time skew prevented logging in... Step 2 is to fix getting the ACPI timer info from the tables. This is in progress... Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#9 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#9 (text+ko) ==== @@ -129,14 +129,14 @@ } if (max - min > 2) n = 0; - else if (min < 0) + else if (min < 0 || max == 0) n = 0; else n = 1; if (bootverbose) printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", n ? "GOOD" : "BAD ", - min, max, max - min + 1); + min, max, max - min); return (n); } From owner-p4-projects@FreeBSD.ORG Sun Apr 27 14:44:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D252137B404; Sun, 27 Apr 2003 14:44:10 -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 8816B37B401 for ; Sun, 27 Apr 2003 14:44:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31D3343FD7 for ; Sun, 27 Apr 2003 14:44:10 -0700 (PDT) (envelope-from obrien@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 h3RLi90U024858 for ; Sun, 27 Apr 2003 14:44:09 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RLi9kd024849 for perforce@freebsd.org; Sun, 27 Apr 2003 14:44:09 -0700 (PDT) Date: Sun, 27 Apr 2003 14:44:09 -0700 (PDT) Message-Id: <200304272144.h3RLi9kd024849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29897 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: Sun, 27 Apr 2003 21:44:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=29897 Change 29897 by obrien@obrien_trang on 2003/04/27 14:43:33 Add NOSHLIBS. If one is using NOSHARED, why build the libs. Affected files ... .. //depot/projects/hammer/share/mk/bsd.lib.mk#3 edit Differences ... ==== //depot/projects/hammer/share/mk/bsd.lib.mk#3 (text+ko) ==== @@ -175,6 +175,7 @@ ${RANLIB} ${.TARGET} .endif +.if !defined(NOSHLIBS) .if defined(SHLIB_NAME) || \ defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) SOBJS+= ${OBJS:.o=.So} @@ -182,6 +183,7 @@ .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} +.endif ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library ${SHLIB_NAME} @@ -261,7 +263,7 @@ ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif -.if defined(SHLIB_NAME) +.if !defined(NOSHLIBS) && defined(SHLIB_NAME) ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} From owner-p4-projects@FreeBSD.ORG Sun Apr 27 15:44:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F72837B404; Sun, 27 Apr 2003 15:44:25 -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 3245337B401 for ; Sun, 27 Apr 2003 15:44:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C2CC243F3F for ; Sun, 27 Apr 2003 15:44:24 -0700 (PDT) (envelope-from marcel@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 h3RMiO0U069121 for ; Sun, 27 Apr 2003 15:44:24 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RMiO2S069114 for perforce@freebsd.org; Sun, 27 Apr 2003 15:44:24 -0700 (PDT) Date: Sun, 27 Apr 2003 15:44:24 -0700 (PDT) Message-Id: <200304272244.h3RMiO2S069114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29899 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: Sun, 27 Apr 2003 22:44:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=29899 Change 29899 by marcel@marcel_pluto2 on 2003/04/27 15:43:34 Step 2: Use the right field from the FADT table to get the hardware timer address. The ACPI CA code converts v1.x tables into v2 tables so we don't have to worry about it outselves. Strangely enough the timer still doesn't seem to work. So I guess a step 3 is needed as well. This isn't wrong AFAICT, so let's get this in... Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#10 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#10 (text+ko) ==== @@ -149,7 +149,8 @@ { device_t dev; char desc[40]; - int rid, i, j; + u_long rlen, rstart; + int i, j, rid, rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -164,10 +165,17 @@ return_VOID; } acpi_timer_dev = dev; + rid = 0; - bus_set_resource(dev, SYS_RES_IOPORT, rid, AcpiGbl_FADT->V1_PmTmrBlk, sizeof(u_int32_t)); - if ((acpi_timer_reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE)) == NULL) { - device_printf(dev, "couldn't allocate I/O resource (port 0x%x)\n", AcpiGbl_FADT->V1_PmTmrBlk); + rlen = 3 + AcpiGbl_FADT->TmrValExt; /* 24 or 32 bit timers. */ + rtype = (AcpiGbl_FADT->XPmTmrBlk.AddressSpaceId) + ? SYS_RES_IOPORT : SYS_RES_MEMORY; + rstart = AcpiGbl_FADT->XPmTmrBlk.Address; + bus_set_resource(dev, rtype, rid, rstart, 4); + acpi_timer_reg = bus_alloc_resource(dev, rtype, &rid, 0, ~0, 1, RF_ACTIVE); + if (acpi_timer_reg == NULL) { + device_printf(dev, "couldn't allocate I/O resource (%s 0x%lx)\n", + (rtype == SYS_RES_IOPORT) ? "port" : "mem", rstart); return_VOID; } if (testenv("debug.acpi.timer_test")) @@ -186,7 +194,7 @@ } tc_init(&acpi_timer_timecounter); - sprintf(desc, "%d-bit timer at 3.579545MHz", AcpiGbl_FADT->TmrValExt ? 32 : 24); + sprintf(desc, "%d-bit timer at 3.579545MHz", (int)(rlen << 3)); device_set_desc_copy(dev, desc); return_VOID; From owner-p4-projects@FreeBSD.ORG Sun Apr 27 15:45:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B4C637B404; Sun, 27 Apr 2003 15:45:27 -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 276CC37B401 for ; Sun, 27 Apr 2003 15:45:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE5AE43F93 for ; Sun, 27 Apr 2003 15:45:26 -0700 (PDT) (envelope-from marcel@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 h3RMjQ0U070050 for ; Sun, 27 Apr 2003 15:45:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RMjQSr070043 for perforce@freebsd.org; Sun, 27 Apr 2003 15:45:26 -0700 (PDT) Date: Sun, 27 Apr 2003 15:45:26 -0700 (PDT) Message-Id: <200304272245.h3RMjQSr070043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29900 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: Sun, 27 Apr 2003 22:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=29900 Change 29900 by marcel@marcel_pluto2 on 2003/04/27 15:45:23 IFia64 Affected files ... .. //depot/projects/ia64_epc/sys/dev/acpica/acpi_timer.c#2 integrate Differences ... ==== //depot/projects/ia64_epc/sys/dev/acpica/acpi_timer.c#2 (text+ko) ==== @@ -129,14 +129,14 @@ } if (max - min > 2) n = 0; - else if (min < 0) + else if (min < 0 || max == 0) n = 0; else n = 1; if (bootverbose) printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", n ? "GOOD" : "BAD ", - min, max, max - min + 1); + min, max, max - min); return (n); } @@ -149,7 +149,8 @@ { device_t dev; char desc[40]; - int rid, i, j; + u_long rlen, rstart; + int i, j, rid, rtype; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -164,10 +165,17 @@ return_VOID; } acpi_timer_dev = dev; + rid = 0; - bus_set_resource(dev, SYS_RES_IOPORT, rid, AcpiGbl_FADT->V1_PmTmrBlk, sizeof(u_int32_t)); - if ((acpi_timer_reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1, RF_ACTIVE)) == NULL) { - device_printf(dev, "couldn't allocate I/O resource (port 0x%x)\n", AcpiGbl_FADT->V1_PmTmrBlk); + rlen = 3 + AcpiGbl_FADT->TmrValExt; /* 24 or 32 bit timers. */ + rtype = (AcpiGbl_FADT->XPmTmrBlk.AddressSpaceId) + ? SYS_RES_IOPORT : SYS_RES_MEMORY; + rstart = AcpiGbl_FADT->XPmTmrBlk.Address; + bus_set_resource(dev, rtype, rid, rstart, 4); + acpi_timer_reg = bus_alloc_resource(dev, rtype, &rid, 0, ~0, 1, RF_ACTIVE); + if (acpi_timer_reg == NULL) { + device_printf(dev, "couldn't allocate I/O resource (%s 0x%lx)\n", + (rtype == SYS_RES_IOPORT) ? "port" : "mem", rstart); return_VOID; } if (testenv("debug.acpi.timer_test")) @@ -186,7 +194,7 @@ } tc_init(&acpi_timer_timecounter); - sprintf(desc, "%d-bit timer at 3.579545MHz", AcpiGbl_FADT->TmrValExt ? 32 : 24); + sprintf(desc, "%d-bit timer at 3.579545MHz", (int)(rlen << 3)); device_set_desc_copy(dev, desc); return_VOID; From owner-p4-projects@FreeBSD.ORG Sun Apr 27 15:52:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9280A37B404; Sun, 27 Apr 2003 15:52:37 -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 10D5737B401 for ; Sun, 27 Apr 2003 15:52:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE31F43F3F for ; Sun, 27 Apr 2003 15:52:36 -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 h3RMqa0U074714 for ; Sun, 27 Apr 2003 15:52:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RMqZ4i074701 for perforce@freebsd.org; Sun, 27 Apr 2003 15:52:35 -0700 (PDT) Date: Sun, 27 Apr 2003 15:52:35 -0700 (PDT) Message-Id: <200304272252.h3RMqZ4i074701@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 29901 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: Sun, 27 Apr 2003 22:52:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=29901 Change 29901 by peter@peter_daintree on 2003/04/27 15:52:11 vfork(2) definately cannot work with syscall. Hardcode int $0x80 for now. I think I'll tweak the syscall ABI so that it preserves a couple of "scratch" registers (%rdi,%rsi) for use by the wrappers. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/Ovfork.S#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/Ovfork.S#4 (text+ko) ==== @@ -49,7 +49,8 @@ ENTRY(__sys_vfork) popq %rcx /* my rta into ecx */ mov $SYS_vfork,%rax - KERNCALL + /* cant use KERNCALL yet, no scratch regs, cant use stack */ + int $0x80 jb 1f jmp *%rcx 1: From owner-p4-projects@FreeBSD.ORG Sun Apr 27 15:54:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96B0437B404; Sun, 27 Apr 2003 15:54:40 -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 43ABF37B401 for ; Sun, 27 Apr 2003 15:54:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3D7D43F75 for ; Sun, 27 Apr 2003 15:54:39 -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 h3RMsd0U076528 for ; Sun, 27 Apr 2003 15:54:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RMsdsq076523 for perforce@freebsd.org; Sun, 27 Apr 2003 15:54:39 -0700 (PDT) Date: Sun, 27 Apr 2003 15:54:39 -0700 (PDT) Message-Id: <200304272254.h3RMsdsq076523@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 29902 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: Sun, 27 Apr 2003 22:54:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=29902 Change 29902 by peter@peter_daintree on 2003/04/27 15:54:18 make pipe(2) work with syscall for now. int 0x80 preserves all registers except for the return values. syscall does not. This can be simplified when I make the fast_syscall handler preserve some scratch registers. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#3 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#3 (text+ko) ==== @@ -42,9 +42,20 @@ #include "SYS.h" -SYSCALL(pipe) - movq 8(%rsp),%rcx /* XXX wrong!! %rdi!! */ + .weak _pipe + .set _pipe,__sys_pipe + .weak pipe + .set pipe,__sys_pipe +ENTRY(__sys_pipe) + pushq %rdi + mov $SYS_pipe,%rax + KERNCALL + jb 1f + popq %rcx movq %rax,(%rcx) movq %rdx,8(%rcx) movq $0,%rax ret +1: + popq %rdi + jmp PIC_PLT(HIDENAME(cerror) From owner-p4-projects@FreeBSD.ORG Sun Apr 27 15:56:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C80337B404; Sun, 27 Apr 2003 15:56:44 -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 B8D2737B401 for ; Sun, 27 Apr 2003 15:56:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A95D43FE3 for ; Sun, 27 Apr 2003 15:56:43 -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 h3RMug0U078389 for ; Sun, 27 Apr 2003 15:56:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3RMugsV078382 for perforce@freebsd.org; Sun, 27 Apr 2003 15:56:42 -0700 (PDT) Date: Sun, 27 Apr 2003 15:56:42 -0700 (PDT) Message-Id: <200304272256.h3RMugsV078382@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 29903 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: Sun, 27 Apr 2003 22:56:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=29903 Change 29903 by peter@peter_daintree on 2003/04/27 15:55:44 GRR. another HIDENAME() victim. These have got to go. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#4 (text+ko) ==== @@ -58,4 +58,4 @@ ret 1: popq %rdi - jmp PIC_PLT(HIDENAME(cerror) + jmp PIC_PLT(HIDENAME(cerror)) From owner-p4-projects@FreeBSD.ORG Sun Apr 27 18:48:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D144837B404; Sun, 27 Apr 2003 18:48:16 -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 6F92737B401 for ; Sun, 27 Apr 2003 18:48:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18C9543FAF for ; Sun, 27 Apr 2003 18:48:16 -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 h3S1mF0U009274 for ; Sun, 27 Apr 2003 18:48:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S1mFfV009269 for perforce@freebsd.org; Sun, 27 Apr 2003 18:48:15 -0700 (PDT) Date: Sun, 27 Apr 2003 18:48:15 -0700 (PDT) Message-Id: <200304280148.h3S1mFfV009269@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 29912 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: Mon, 28 Apr 2003 01:48:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=29912 Change 29912 by peter@peter_daintree on 2003/04/27 18:48:04 as a bonus, preserve %rsi and %rdi across 'syscall'. This means we dont have to use PCB_FULLCTX on return from execve() which passes arguments in %rdi and %rsi. It also makes life easier for things like the pipe(2) wrapper in libc. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#32 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#32 (text+ko) ==== @@ -241,8 +241,10 @@ call ast jmp 1b 2: /* restore preserved registers */ + movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ + movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ + movq TF_RDX(%rsp),%rdx /* return value 2 */ movq TF_RAX(%rsp),%rax /* return value 1 */ - movq TF_RDX(%rsp),%rdx /* return value 2 */ movq TF_RBX(%rsp),%rbx /* C preserved */ movq TF_RBP(%rsp),%rbp /* C preserved */ movq TF_R12(%rsp),%r12 /* C preserved */ @@ -251,8 +253,8 @@ movq TF_R15(%rsp),%r15 /* C preserved */ movq TF_RFLAGS(%rsp),%r11 /* original %rflags */ movq TF_RIP(%rsp),%rcx /* original %rip */ - movq TF_RSP(%rsp),%rdi /* user stack pointer */ - movq %rdi,%rsp /* original %rsp */ + movq TF_RSP(%rsp),%r9 /* user stack pointer */ + movq %r9,%rsp /* original %rsp */ #swapgs sysretq 3: /* Requested full context restore, use doreti for that */ From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:10:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89CE037B404; Sun, 27 Apr 2003 19:10:44 -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 1F08F37B401 for ; Sun, 27 Apr 2003 19:10:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A78C043FB1 for ; Sun, 27 Apr 2003 19:10:43 -0700 (PDT) (envelope-from jmallett@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 h3S2Ah0U025775 for ; Sun, 27 Apr 2003 19:10:43 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2Ah00025767 for perforce@freebsd.org; Sun, 27 Apr 2003 19:10:43 -0700 (PDT) Date: Sun, 27 Apr 2003 19:10:43 -0700 (PDT) Message-Id: <200304280210.h3S2Ah00025767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29913 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: Mon, 28 Apr 2003 02:10:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=29913 Change 29913 by jmallett@jmallett_dalek on 2003/04/27 19:10:20 Add R4600, R5000. Affected files ... .. //depot/projects/mips/sys/conf/options.mips#9 edit Differences ... ==== //depot/projects/mips/sys/conf/options.mips#9 (text+ko) ==== @@ -5,6 +5,8 @@ R4000 opt_global.h R4400 opt_global.h +R4600 opt_global.h +R5000 opt_global.h R10000 opt_global.h SGIMIPS opt_platform.h From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:28:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDE4237B404; Sun, 27 Apr 2003 19:28:05 -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 862C037B401 for ; Sun, 27 Apr 2003 19:28:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FC7043F3F for ; Sun, 27 Apr 2003 19:28:05 -0700 (PDT) (envelope-from jmallett@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 h3S2S50U038874 for ; Sun, 27 Apr 2003 19:28:05 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2S4kK038870 for perforce@freebsd.org; Sun, 27 Apr 2003 19:28:04 -0700 (PDT) Date: Sun, 27 Apr 2003 19:28:04 -0700 (PDT) Message-Id: <200304280228.h3S2S4kK038870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29914 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: Mon, 28 Apr 2003 02:28:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=29914 Change 29914 by jmallett@jmallett_dalek on 2003/04/27 19:27:18 s/cpu_prid/cpu_id/ for NetBSD compat. Affected files ... .. //depot/projects/mips/sys/mips/include/md_var.h#6 edit .. //depot/projects/mips/sys/mips/mips/locore.S#3 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#13 edit Differences ... ==== //depot/projects/mips/sys/mips/include/md_var.h#6 (text+ko) ==== @@ -31,6 +31,9 @@ extern vm_offset_t kstack0; extern vm_paddr_t kstack0_phys; +extern int cpu_id; +extern int fpu_id; + void cpu_halt(void); void cpu_reset(void); void mips_init(void); ==== //depot/projects/mips/sys/mips/mips/locore.S#3 (text+ko) ==== @@ -90,7 +90,7 @@ # coprocessor 1. mfc0 t0, MIPS_COP_0_PRID cfc1 t1, MIPS_FPU_ID - sw t0, cpu_prid + sw t0, cpu_id sw t1, fpu_id # Call the platform-specific startup code. ==== //depot/projects/mips/sys/mips/mips/machdep.c#13 (text+ko) ==== @@ -40,7 +40,7 @@ #include int cold = 1; -int cpu_prid, fpu_id; +int cpu_id, fpu_id; struct pcpu pcpu0; From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:49:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A66F537B404; Sun, 27 Apr 2003 19:49:32 -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 40CF637B401 for ; Sun, 27 Apr 2003 19:49:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8AC543FBD for ; Sun, 27 Apr 2003 19:49:31 -0700 (PDT) (envelope-from jmallett@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 h3S2nV0U053826 for ; Sun, 27 Apr 2003 19:49:31 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2nV23053821 for perforce@freebsd.org; Sun, 27 Apr 2003 19:49:31 -0700 (PDT) Date: Sun, 27 Apr 2003 19:49:31 -0700 (PDT) Message-Id: <200304280249.h3S2nV23053821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29915 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: Mon, 28 Apr 2003 02:49:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=29915 Change 29915 by jmallett@jmallett_dalek on 2003/04/27 19:49:19 Add the external cache enable bit from NetBSD. Affected files ... .. //depot/projects/mips/sys/mips/include/cpuregs.h#4 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpuregs.h#4 (text+ko) ==== @@ -316,6 +316,9 @@ ((base) << (((config) & (mask)) >> (shift))) #endif +/* External cache enable: Controls L2 for R5000/Rm527x and L3 for Rm7000 */ +#define MIPS3_CONFIG_SE 0x00001000 + /* Block ordering: 0: sequential, 1: sub-block */ #define MIPS3_CONFIG_EB 0x00002000 From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:51:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2E4A37B404; Sun, 27 Apr 2003 19:51:35 -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 90BAE37B401 for ; Sun, 27 Apr 2003 19:51:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3511D43FD7 for ; Sun, 27 Apr 2003 19:51:35 -0700 (PDT) (envelope-from jmallett@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 h3S2pY0U055314 for ; Sun, 27 Apr 2003 19:51:34 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2pY6H055304 for perforce@freebsd.org; Sun, 27 Apr 2003 19:51:34 -0700 (PDT) Date: Sun, 27 Apr 2003 19:51:34 -0700 (PDT) Message-Id: <200304280251.h3S2pY6H055304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29916 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: Mon, 28 Apr 2003 02:51:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=29916 Change 29916 by jmallett@jmallett_dalek on 2003/04/27 19:51:03 Add things for NetBSD compatibility. Mostly just new macros and so on. I don't like these huge headers, in principle, but they make life easier for now. I've at least stripped out bits that don't pertain to what we're supporting (e.g. MIPS1 stuff is gone where I saw it.) Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#5 edit .. //depot/projects/mips/sys/mips/include/locore.h#1 add .. //depot/projects/mips/sys/mips/include/mipsNN.h#1 add Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#5 (text+ko) ==== @@ -75,4 +75,33 @@ return (++now); } +#ifndef _LOCORE +/* XXX simonb + * Should the following be in a cpu_info type structure? + * And how many of these are per-cpu vs. per-system? (Ie, + * we can assume that all cpus have the same mmu-type, but + * maybe not that all cpus run at the same clock speed. + * Some SGI's apparently support R12k and R14k in the same + * box.) + */ +extern int cpu_arch; +extern int mips_cpu_flags; +extern int mips_has_r4k_mmu; +extern int mips_has_llsc; +extern int mips3_pg_cached; + +#define CPU_MIPS_R4K_MMU 0x0001 +#define CPU_MIPS_NO_LLSC 0x0002 +#define CPU_MIPS_CAUSE_IV 0x0004 +#define CPU_MIPS_HAVE_SPECIAL_CCA 0x0008 /* Defaults to '3' if not set. */ +#define CPU_MIPS_CACHED_CCA_MASK 0x0070 +#define CPU_MIPS_CACHED_CCA_SHIFT 4 +#define CPU_MIPS_DOUBLE_COUNT 0x0080 /* 1 cp0 count == 2 clock cycles */ +#define CPU_MIPS_USE_WAIT 0x0100 /* Use "wait"-based cpu_idle() */ +#define CPU_MIPS_NO_WAIT 0x0200 /* Inverse of previous, for mips32/64 */ +#define CPU_MIPS_D_CACHE_COHERENT 0x0400 /* D-cache is fully coherent */ +#define CPU_MIPS_I_D_CACHE_COHERENT 0x0800 /* I-cache funcs don't need to flush the D-cache */ +#define MIPS_NOT_SUPP 0x8000 +#endif + #endif /* !_MACHINE_CPU_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:51:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 602E737B404; Sun, 27 Apr 2003 19:51:37 -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 4BB5F37B411 for ; Sun, 27 Apr 2003 19:51:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E587943FAF for ; Sun, 27 Apr 2003 19:51:35 -0700 (PDT) (envelope-from obrien@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 h3S2pZ0U055331 for ; Sun, 27 Apr 2003 19:51:35 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2pZs7055320 for perforce@freebsd.org; Sun, 27 Apr 2003 19:51:35 -0700 (PDT) Date: Sun, 27 Apr 2003 19:51:35 -0700 (PDT) Message-Id: <200304280251.h3S2pZs7055320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29917 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: Mon, 28 Apr 2003 02:51:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=29917 Change 29917 by obrien@obrien_trang on 2003/04/27 19:51:11 WTF wasn't this using TARGET_ARCH?? Affected files ... .. //depot/projects/hammer/lib/msun/Makefile#2 edit Differences ... ==== //depot/projects/hammer/lib/msun/Makefile#2 (text+ko) ==== @@ -41,7 +41,7 @@ # default standard # -.if ${MACHINE_ARCH} == "alpha" +.if ${TARGET_ARCH} == "alpha" .PATH: ${.CURDIR)/alpha ARCH= alpha ARCH_SRCS = s_copysign.S s_copysignf.S @@ -50,7 +50,7 @@ # handling is broken (doesn't exist!) on the Alpha port. # Stock gcc 2.7.2.1 doesn't understand these options. #CFLAGS += -mtrap-precision=i -mfp-trap-mode=su -.elif ${MACHINE_ARCH} == "i386" +.elif ${TARGET_ARCH} == "i386" ARCH= i387 ARCH_PREFIX= ${ARCH}_ ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \ From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:52:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE7E237B404; Sun, 27 Apr 2003 19:52:38 -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 7648037B401 for ; Sun, 27 Apr 2003 19:52:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 208E543F93 for ; Sun, 27 Apr 2003 19:52:38 -0700 (PDT) (envelope-from jmallett@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 h3S2qb0U056231 for ; Sun, 27 Apr 2003 19:52:37 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2qb4C056220 for perforce@freebsd.org; Sun, 27 Apr 2003 19:52:37 -0700 (PDT) Date: Sun, 27 Apr 2003 19:52:37 -0700 (PDT) Message-Id: <200304280252.h3S2qb4C056220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29918 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: Mon, 28 Apr 2003 02:52:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=29918 Change 29918 by jmallett@jmallett_dalek on 2003/04/27 19:52:03 Add NetBSD cache code. It compiles but doesn't link, as I've yet to get a version of locore_mips3.S ready for submission. As such, it is left out of the kernel build. Affected files ... .. //depot/projects/mips/sys/mips/include/cache.h#1 add .. //depot/projects/mips/sys/mips/include/cache_mipsNN.h#1 add .. //depot/projects/mips/sys/mips/include/cache_r4k.h#1 add .. //depot/projects/mips/sys/mips/include/cache_r5k.h#1 add .. //depot/projects/mips/sys/mips/mips/cache.c#1 add .. //depot/projects/mips/sys/mips/mips/cache_mipsNN.c#1 add .. //depot/projects/mips/sys/mips/mips/cache_r4k.c#1 add .. //depot/projects/mips/sys/mips/mips/cache_r5k.c#1 add .. //depot/projects/mips/sys/mips/mips/cache_r5k_subr.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 27 19:53:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D354437B404; Sun, 27 Apr 2003 19:53:40 -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 83B6137B401 for ; Sun, 27 Apr 2003 19:53:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 196EB43FAF for ; Sun, 27 Apr 2003 19:53:40 -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 h3S2rd0U057239 for ; Sun, 27 Apr 2003 19:53:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2rdDu057231 for perforce@freebsd.org; Sun, 27 Apr 2003 19:53:39 -0700 (PDT) Date: Sun, 27 Apr 2003 19:53:39 -0700 (PDT) Message-Id: <200304280253.h3S2rdDu057231@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 29919 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: Mon, 28 Apr 2003 02:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=29919 Change 29919 by peter@peter_daintree on 2003/04/27 19:53:20 oops! pipe(3) takes an array of ints, not longs Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#5 (text+ko) ==== @@ -52,8 +52,8 @@ KERNCALL jb 1f popq %rcx - movq %rax,(%rcx) - movq %rdx,8(%rcx) + movl %eax,(%rcx) + movl %edx,4(%rcx) movq $0,%rax ret 1: From owner-p4-projects@FreeBSD.ORG Sun Apr 27 20:14:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E734437B404; Sun, 27 Apr 2003 20:14:05 -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 97C1837B401 for ; Sun, 27 Apr 2003 20:14:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 441DA43FA3 for ; Sun, 27 Apr 2003 20:14:05 -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 h3S3E50U072586 for ; Sun, 27 Apr 2003 20:14:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S3E4NX072579 for perforce@freebsd.org; Sun, 27 Apr 2003 20:14:04 -0700 (PDT) Date: Sun, 27 Apr 2003 20:14:04 -0700 (PDT) Message-Id: <200304280314.h3S3E4NX072579@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 29920 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: Mon, 28 Apr 2003 03:14:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=29920 Change 29920 by peter@peter_daintree on 2003/04/27 20:13:58 take advantage of register preservation across syscall Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/Ovfork.S#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/Ovfork.S#5 (text+ko) ==== @@ -47,12 +47,11 @@ .weak vfork .set vfork,__sys_vfork ENTRY(__sys_vfork) - popq %rcx /* my rta into ecx */ + popq %rsi /* fetch return address (%rsi preserved) */ mov $SYS_vfork,%rax - /* cant use KERNCALL yet, no scratch regs, cant use stack */ - int $0x80 + KERNCALL jb 1f - jmp *%rcx + jmp *%rsi 1: pushq %rcx jmp PIC_PLT(HIDENAME(cerror)) From owner-p4-projects@FreeBSD.ORG Sun Apr 27 20:32:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43AD937B404; Sun, 27 Apr 2003 20:32: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 D06EC37B401 for ; Sun, 27 Apr 2003 20:32:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C02C743FBD for ; Sun, 27 Apr 2003 20:32:28 -0700 (PDT) (envelope-from jmallett@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 h3S3WS0U085632 for ; Sun, 27 Apr 2003 20:32:28 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S3WSuj085626 for perforce@freebsd.org; Sun, 27 Apr 2003 20:32:28 -0700 (PDT) Date: Sun, 27 Apr 2003 20:32:28 -0700 (PDT) Message-Id: <200304280332.h3S3WSuj085626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29922 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: Mon, 28 Apr 2003 03:32:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=29922 Change 29922 by jmallett@jmallett_dalek on 2003/04/27 20:31:36 Oops; compile. Affected files ... .. //depot/projects/mips/sys/mips/include/cache_r4k.h#2 edit .. //depot/projects/mips/sys/mips/include/cache_r5k.h#2 edit .. //depot/projects/mips/sys/mips/mips/cache.c#2 edit .. //depot/projects/mips/sys/mips/mips/cache_r5k.c#2 edit .. //depot/projects/mips/sys/mips/mips/cache_r5k_subr.S#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cache_r4k.h#2 (text+ko) ==== @@ -55,7 +55,7 @@ #define CACHEOP_R4K_HIT_WB (6 << 2) /* I, D, SD */ #define CACHEOP_R4K_HIT_SET_VIRTUAL (7 << 2) /* SI, SD */ -#if !defined(_LOCORE) +#if !defined(LOCORE) /* * cache_r4k_op_line: @@ -378,4 +378,4 @@ void r4k_sdcache_inv_range_generic(vm_paddr_t, vm_size_t); void r4k_sdcache_wb_range_generic(vm_paddr_t, vm_size_t); -#endif /* !_LOCORE */ +#endif /* !LOCORE */ ==== //depot/projects/mips/sys/mips/include/cache_r5k.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if defined(_KERNEL) && !defined(_LOCORE) +#if defined(_KERNEL) && !defined(LOCORE) void r5k_icache_sync_all_32(void); void r5k_icache_sync_range_32(vm_paddr_t, vm_size_t); @@ -68,4 +68,4 @@ void r5k_sdcache_inv_range(vm_paddr_t, vm_size_t); void r5k_sdcache_wb_range(vm_paddr_t, vm_size_t); -#endif /* _KERNEL && !_LOCORE */ +#endif /* _KERNEL && !LOCORE */ ==== //depot/projects/mips/sys/mips/mips/cache.c#2 (text+ko) ==== ==== //depot/projects/mips/sys/mips/mips/cache_r5k.c#2 (text+ko) ==== @@ -37,10 +37,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* * Cache operations for R5000-style caches: @@ -85,8 +87,8 @@ void r5k_icache_sync_all_32(void) { - vaddr_t va = MIPS_PHYS_TO_KSEG0(0); - vaddr_t eva = va + mips_picache_size; + vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); + vm_paddr_t eva = va + mips_picache_size; /* * Since we're hitting the whole thing, we don't have to @@ -104,9 +106,9 @@ } void -r5k_icache_sync_range_32(vaddr_t va, vsize_t size) +r5k_icache_sync_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); va = trunc_line(va); @@ -126,9 +128,9 @@ } void -r5k_icache_sync_range_index_32(vaddr_t va, vsize_t size) +r5k_icache_sync_range_index_32(vm_paddr_t va, vm_size_t size) { - vaddr_t w2va, eva, orig_va; + vm_paddr_t w2va, eva, orig_va; orig_va = va; @@ -169,8 +171,8 @@ void r5k_pdcache_wbinv_all_16(void) { - vaddr_t va = MIPS_PHYS_TO_KSEG0(0); - vaddr_t eva = va + mips_pdcache_size; + vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); + vm_paddr_t eva = va + mips_pdcache_size; /* * Since we're hitting the whole thing, we don't have to @@ -187,8 +189,8 @@ void r5k_pdcache_wbinv_all_32(void) { - vaddr_t va = MIPS_PHYS_TO_KSEG0(0); - vaddr_t eva = va + mips_pdcache_size; + vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); + vm_paddr_t eva = va + mips_pdcache_size; /* * Since we're hitting the whole thing, we don't have to @@ -203,9 +205,9 @@ } void -r4600v1_pdcache_wbinv_range_32(vaddr_t va, vsize_t size) +r4600v1_pdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); uint32_t ostatus; /* @@ -239,9 +241,9 @@ } void -r4600v2_pdcache_wbinv_range_32(vaddr_t va, vsize_t size) +r4600v2_pdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); uint32_t ostatus; va = trunc_line(va); @@ -267,9 +269,9 @@ } void -vr4131v1_pdcache_wbinv_range_16(vaddr_t va, vsize_t size) +vr4131v1_pdcache_wbinv_range_16(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line16(va + size); + vm_paddr_t eva = round_line16(va + size); va = trunc_line16(va); @@ -289,9 +291,9 @@ } void -r5k_pdcache_wbinv_range_16(vaddr_t va, vsize_t size) +r5k_pdcache_wbinv_range_16(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line16(va + size); + vm_paddr_t eva = round_line16(va + size); va = trunc_line16(va); @@ -308,9 +310,9 @@ } void -r5k_pdcache_wbinv_range_32(vaddr_t va, vsize_t size) +r5k_pdcache_wbinv_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); va = trunc_line(va); @@ -327,9 +329,9 @@ } void -r5k_pdcache_wbinv_range_index_16(vaddr_t va, vsize_t size) +r5k_pdcache_wbinv_range_index_16(vm_paddr_t va, vm_size_t size) { - vaddr_t w2va, eva; + vm_paddr_t w2va, eva; /* * Since we're doing Index ops, we expect to not be able @@ -359,9 +361,9 @@ } void -r5k_pdcache_wbinv_range_index_32(vaddr_t va, vsize_t size) +r5k_pdcache_wbinv_range_index_32(vm_paddr_t va, vm_size_t size) { - vaddr_t w2va, eva; + vm_paddr_t w2va, eva; /* * Since we're doing Index ops, we expect to not be able @@ -391,9 +393,9 @@ } void -r4600v1_pdcache_inv_range_32(vaddr_t va, vsize_t size) +r4600v1_pdcache_inv_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); uint32_t ostatus; /* @@ -418,9 +420,9 @@ } void -r4600v2_pdcache_inv_range_32(vaddr_t va, vsize_t size) +r4600v2_pdcache_inv_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); uint32_t ostatus; va = trunc_line(va); @@ -449,9 +451,9 @@ } void -r5k_pdcache_inv_range_16(vaddr_t va, vsize_t size) +r5k_pdcache_inv_range_16(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line16(va + size); + vm_paddr_t eva = round_line16(va + size); va = trunc_line16(va); @@ -467,9 +469,9 @@ } void -r5k_pdcache_inv_range_32(vaddr_t va, vsize_t size) +r5k_pdcache_inv_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); va = trunc_line(va); @@ -485,9 +487,9 @@ } void -r4600v1_pdcache_wb_range_32(vaddr_t va, vsize_t size) +r4600v1_pdcache_wb_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); uint32_t ostatus; /* @@ -512,9 +514,9 @@ } void -r4600v2_pdcache_wb_range_32(vaddr_t va, vsize_t size) +r4600v2_pdcache_wb_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); uint32_t ostatus; va = trunc_line(va); @@ -543,9 +545,9 @@ } void -r5k_pdcache_wb_range_16(vaddr_t va, vsize_t size) +r5k_pdcache_wb_range_16(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line16(va + size); + vm_paddr_t eva = round_line16(va + size); va = trunc_line16(va); @@ -561,9 +563,9 @@ } void -r5k_pdcache_wb_range_32(vaddr_t va, vsize_t size) +r5k_pdcache_wb_range_32(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_line(va + size); + vm_paddr_t eva = round_line(va + size); va = trunc_line(va); @@ -600,8 +602,8 @@ void r5k_sdcache_wbinv_all(void) { - vaddr_t va = MIPS_PHYS_TO_KSEG0(0); - vaddr_t eva = va + mips_sdcache_size; + vm_paddr_t va = MIPS_PHYS_TO_KSEG0(0); + vm_paddr_t eva = va + mips_sdcache_size; while (va < eva) { cache_op_r4k_line(va, R5K_Page_Invalidate_S); @@ -611,7 +613,7 @@ /* XXX: want wbinv_range_index here instead? */ void -r5k_sdcache_wbinv_rangeall(vaddr_t va, vsize_t size) +r5k_sdcache_wbinv_rangeall(vm_paddr_t va, vm_size_t size) { r5k_sdcache_wbinv_all(); } @@ -620,9 +622,9 @@ #define trunc_page(x) ((x) & ~(128 * 32 - 1)) void -r5k_sdcache_wbinv_range(vaddr_t va, vsize_t size) +r5k_sdcache_wbinv_range(vm_paddr_t va, vm_size_t size) { - vaddr_t eva = round_page(va + size); + vm_paddr_t eva = round_page(va + size); va = trunc_page(va); while (va < eva) { @@ -632,7 +634,7 @@ } void -r5k_sdcache_wb_range(vaddr_t va, vsize_t size) +r5k_sdcache_wb_range(vm_paddr_t va, vm_size_t size) { /* Write-through cache, no need to WB */ } ==== //depot/projects/mips/sys/mips/mips/cache_r5k_subr.S#2 (text+ko) ==== @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#include -#include -#include -#include +#include +#include +#include +#include .set mips3 .set noreorder @@ -39,8 +39,8 @@ * * Enable and clear out the R5k secondary (unified) cache. */ -LEAF_NOPROFILE(r5k_enable_sdcache) - lw t2, _C_LABEL(mips_sdcache_size) +LEAF(r5k_enable_sdcache) + lw t2, mips_sdcache_size la t1, MIPS_KSEG0_START beq t2, zero, 3f # if no sdcache, we can bail now From owner-p4-projects@FreeBSD.ORG Sun Apr 27 20:32:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 325EF37B40F; Sun, 27 Apr 2003 20:32:31 -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 07A4937B405 for ; Sun, 27 Apr 2003 20:32:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C31243FBF for ; Sun, 27 Apr 2003 20:32:29 -0700 (PDT) (envelope-from jmallett@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 h3S3WT0U085643 for ; Sun, 27 Apr 2003 20:32:29 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S3WS2u085635 for perforce@freebsd.org; Sun, 27 Apr 2003 20:32:28 -0700 (PDT) Date: Sun, 27 Apr 2003 20:32:28 -0700 (PDT) Message-Id: <200304280332.h3S3WS2u085635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29923 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: Mon, 28 Apr 2003 03:32:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=29923 Change 29923 by jmallett@jmallett_dalek on 2003/04/27 20:32:21 We -DLOCORE not -D_LOCORE. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#6 edit .. //depot/projects/mips/sys/mips/include/endian.h#3 edit .. //depot/projects/mips/sys/mips/include/pte.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#6 (text+ko) ==== @@ -75,7 +75,7 @@ return (++now); } -#ifndef _LOCORE +#ifndef LOCORE /* XXX simonb * Should the following be in a cpu_info type structure? * And how many of these are per-cpu vs. per-system? (Ie, ==== //depot/projects/mips/sys/mips/include/endian.h#3 (text+ko) ==== @@ -39,7 +39,9 @@ #define _MACHINE_ENDIAN_H_ #include +#ifndef LOCORE #include +#endif #ifdef _KERNEL #include "opt_endian.h" @@ -86,6 +88,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif +#ifndef LOCORE #ifdef __GNUC__ static __inline __uint16_t @@ -128,5 +131,6 @@ #define _BYTEORDER_FUNC_DEFINED #endif /* __GNUC__ */ +#endif #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/mips/sys/mips/include/pte.h#2 (text+ko) ==== @@ -99,7 +99,7 @@ * R4000 hardware page table entry */ -#ifndef _LOCORE +#ifndef LOCORE struct mips3_pte { #if BYTE_ORDER == BIG_ENDIAN unsigned int pg_prot:2, /* SW: access control */ @@ -129,7 +129,7 @@ int tlb_lo0; /* XXX maybe 64 bits (only 32 really used) */ int tlb_lo1; /* XXX maybe 64 bits (only 32 really used) */ }; -#endif /* _LOCORE */ +#endif /* LOCORE */ #define MIPS3_PG_WIRED 0x80000000 /* SW */ #define MIPS3_PG_RO 0x40000000 /* SW */ @@ -199,7 +199,7 @@ #define PG_ASID 0x000000ff /* Address space ID */ -#ifndef _LOCORE +#ifndef LOCORE #include typedef union pt_entry { @@ -227,9 +227,9 @@ #define mips_tlbpfn_to_paddr(x) mips3_tlbpfn_to_paddr((vaddr_t)(x)) #define mips_paddr_to_tlbpfn(x) mips3_paddr_to_tlbpfn((x)) -#endif /* ! _LOCORE */ +#endif /* ! LOCORE */ -#if defined(_KERNEL) && !defined(_LOCORE) +#if defined(_KERNEL) && !defined(LOCORE) /* * Kernel virtual address to page table entry and visa versa. */ @@ -240,5 +240,5 @@ extern pt_entry_t *kptemap; /* kernel pte table */ extern vm_size_t kptemapsize; /* number of pte's in Sysmap */ -#endif /* defined(_KERNEL) && !defined(_LOCORE) */ +#endif /* defined(_KERNEL) && !defined(LOCORE) */ #endif /* __MIPS_PTE_H__ */ From owner-p4-projects@FreeBSD.ORG Sun Apr 27 20:38:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBC4E37B404; Sun, 27 Apr 2003 20:38:42 -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 9F77B37B401 for ; Sun, 27 Apr 2003 20:38:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 480AB43F93 for ; Sun, 27 Apr 2003 20:38:42 -0700 (PDT) (envelope-from jmallett@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 h3S3cg0U090367 for ; Sun, 27 Apr 2003 20:38:42 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S3cfqB090362 for perforce@freebsd.org; Sun, 27 Apr 2003 20:38:41 -0700 (PDT) Date: Sun, 27 Apr 2003 20:38:41 -0700 (PDT) Message-Id: <200304280338.h3S3cfqB090362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29924 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: Mon, 28 Apr 2003 03:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=29924 Change 29924 by jmallett@jmallett_dalek on 2003/04/27 20:38:19 Make cache code link. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#4 edit .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#1 add .. //depot/projects/mips/sys/mips/mips/machdep.c#14 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#4 (text+ko) ==== @@ -68,11 +68,19 @@ #define _ENTRY(x) \ .text; .align 2; .globl x; .ent x; .type x,@function; x: +#define _XLEAF(x) \ + .globl x; x: + +#define _LEAF(x) \ + .globl x; .ent x; x: ; .frame sp, 0, ra; + #define _END(x) \ .end x +#define GLOBAL(y) _GLOBAL(CNAME(y)) #define ENTRY(y) _ENTRY(CNAME(y)); _PROF_PROLOGUE -#define GLOBAL(y) _GLOBAL(CNAME(y)) +#define XLEAF(y) _XLEAF(CNAME(y)); +#define LEAF(y) _LEAF(CNAME(y)); _PROF_PROLOGUE #define END(y) _END(CNAME(y)) #define ASMSTR .asciz ==== //depot/projects/mips/sys/mips/mips/machdep.c#14 (text+ko) ==== @@ -39,6 +39,14 @@ #include #include +int cpu_arch; +int mips_cpu_flags; +int mips_has_r4k_mmu; +int mips_has_llsc; +int mips3_pg_cached; + +int mips_num_tlb_entries; + int cold = 1; int cpu_id, fpu_id; From owner-p4-projects@FreeBSD.ORG Sun Apr 27 20:39:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAFC837B404; Sun, 27 Apr 2003 20:39:44 -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 8E3BA37B401 for ; Sun, 27 Apr 2003 20:39:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38CD143F3F for ; Sun, 27 Apr 2003 20:39:44 -0700 (PDT) (envelope-from jmallett@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 h3S3di0U090813 for ; Sun, 27 Apr 2003 20:39:44 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S3dhBc090808 for perforce@freebsd.org; Sun, 27 Apr 2003 20:39:43 -0700 (PDT) Date: Sun, 27 Apr 2003 20:39:43 -0700 (PDT) Message-Id: <200304280339.h3S3dhBc090808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29925 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: Mon, 28 Apr 2003 03:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=29925 Change 29925 by jmallett@jmallett_dalek on 2003/04/27 20:38:42 Add cache code. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#14 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#14 (text+ko) ==== @@ -13,12 +13,19 @@ mips/mips/critical.c standard mips/mips/elf_machdep.c standard mips/mips/locore.S standard no-obj +mips/mips/locore_mips3.S standard mips/mips/machdep.c standard mips/mips/pmap.c standard mips/mips/sig_machdep.c standard mips/mips/support.S standard mips/mips/sys_machdep.c standard mips/mips/vm_machdep.c standard +# XXX cache code needs to be split up per CPU type, but yuck. +mips/mips/cache.c standard +mips/mips/cache_mipsNN.c standard +mips/mips/cache_r4k.c standard +mips/mips/cache_r5k.c standard +mips/mips/cache_r5k_subr.S standard # This stanza is platform files, per platform. geom/geom_fx.c optional sgimips From owner-p4-projects@FreeBSD.ORG Sun Apr 27 21:22:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24C6737B404; Sun, 27 Apr 2003 21:22:40 -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 B152B37B401 for ; Sun, 27 Apr 2003 21:22:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D7CE43F93 for ; Sun, 27 Apr 2003 21:22:38 -0700 (PDT) (envelope-from jmallett@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 h3S4Mc0U028117 for ; Sun, 27 Apr 2003 21:22:38 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S4Mc0p028110 for perforce@freebsd.org; Sun, 27 Apr 2003 21:22:38 -0700 (PDT) Date: Sun, 27 Apr 2003 21:22:38 -0700 (PDT) Message-Id: <200304280422.h3S4Mc0p028110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29929 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: Mon, 28 Apr 2003 04:22:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=29929 Change 29929 by jmallett@jmallett_dalek on 2003/04/27 21:21:59 Add cpu_identify and related. Protected code to set up exception vectors with the preprocessor. Will use it once I bother to get the exception stuff in place. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#7 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#15 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#7 (text+ko) ==== @@ -75,6 +75,20 @@ return (++now); } +/* + * Macros to find the CPU architecture we're on at run-time, + * or if possible, at compile-time. + */ + +#define CPU_ARCH_MIPSx 0 /* XXX unknown */ +#define CPU_ARCH_MIPS1 (1 << 0) +#define CPU_ARCH_MIPS2 (1 << 1) +#define CPU_ARCH_MIPS3 (1 << 2) +#define CPU_ARCH_MIPS4 (1 << 3) +#define CPU_ARCH_MIPS5 (1 << 4) +#define CPU_ARCH_MIPS32 (1 << 5) +#define CPU_ARCH_MIPS64 (1 << 6) + #ifndef LOCORE /* XXX simonb * Should the following be in a cpu_info type structure? ==== //depot/projects/mips/sys/mips/mips/machdep.c#15 (text+ko) ==== @@ -1,4 +1,121 @@ +/* + * Copyright 2002 Wasabi Systems, Inc. + * All rights reserved. + * + * Written by Simon Burge for Wasabi Systems, Inc. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed for the NetBSD Project by + * Wasabi Systems, Inc. + * 4. The name of Wasabi Systems, Inc. may not be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC + * 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. + */ + +/* + * Copyright 2000, 2001 + * Broadcom Corporation. All rights reserved. + * + * This software is furnished under license and may be used and copied only + * in accordance with the following terms and conditions. Subject to these + * conditions, you may download, copy, install, use, modify and distribute + * modified or unmodified copies of this software in source and/or binary + * form. No title or ownership is transferred hereby. + * + * 1) Any source code used, modified or distributed must reproduce and + * retain this copyright notice and list of conditions as they appear in + * the source file. + * + * 2) No right is granted to use any trade name, trademark, or logo of + * Broadcom Corporation. The "Broadcom Corporation" name may not be + * used to endorse or promote products derived from this software + * without the prior written permission of Broadcom Corporation. + * + * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR + * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE + * FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE + * LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + /*- + * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, + * NASA Ames Research Center and by Chris Demetriou. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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. + */ + +/* + * Copyright 1996 The Board of Trustees of The Leland Stanford + * Junior University. All Rights Reserved. + * + * Permission to use, copy, modify, and distribute this + * software and its documentation for any purpose and without + * fee is hereby granted, provided that the above copyright + * notice appear in all copies. Stanford University + * makes no representations about the suitability of this + * software for any purpose. It is provided "as is" without + * express or implied warranty. + */ + +/*- * Copyright (c) 2002 Juli Mallett * All rights reserved. * @@ -35,9 +152,15 @@ #include #include +#include +#include #include +#include #include +#include #include +#include +#include int cpu_arch; int mips_cpu_flags; @@ -60,6 +183,8 @@ { struct pcpu *pc; + mips_vector_init(); + cpu_identify(); proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); thread0.td_kstack = kstack0; pc = &pcpu0; @@ -171,3 +296,568 @@ { return (-1); } + +#if 0 +mips_locore_jumpvec_t mips_locore_jumpvec; + +long *mips_locoresw[3]; +#endif + +struct pridtab { + int cpu_cid; + int cpu_pid; + int cpu_rev; /* -1 == wildcard */ + int cpu_copts; /* -1 == wildcard */ + int cpu_isa; /* -1 == probed (mips32/mips64) */ + int cpu_ntlb; /* -1 == unknown, 0 == probed */ + int cpu_flags; + char *cpu_name; +}; + +/* + * Assumptions: + * - All MIPS3+ have an r4k-style MMU. _Many_ assumptions throughout + * much of the mips code about this. Includes overloaded usage of + * MIPS3_PLUS. + * - All MIPS3+ use the same exception model (cp0 status, cause bits, + * etc). _Many_ assumptions throughout much of the mips code about + * this. Includes overloaded usage of MIPS3_PLUS. + * - All MIPS3+ have a count register. MIPS_HAS_CLOCK in + * will need to be revised if this is false. + */ +#define MIPS32_FLAGS CPU_MIPS_R4K_MMU | CPU_MIPS_CAUSE_IV | CPU_MIPS_USE_WAIT +#define MIPS64_FLAGS MIPS32_FLAGS /* same as MIPS32 flags (for now) */ + +static const struct pridtab *mycpu; + +static const struct pridtab cputab[] = { + { 0, MIPS_R2000, -1, -1, CPU_ARCH_MIPS1, 64, + CPU_MIPS_NO_LLSC, "MIPS R2000 CPU" }, + { 0, MIPS_R3000, MIPS_REV_R3000, -1, CPU_ARCH_MIPS1, 64, + CPU_MIPS_NO_LLSC, "MIPS R3000 CPU" }, + { 0, MIPS_R3000, MIPS_REV_R3000A, -1, CPU_ARCH_MIPS1, 64, + CPU_MIPS_NO_LLSC, "MIPS R3000A CPU" }, + { 0, MIPS_R6000, -1, -1, CPU_ARCH_MIPS2, 32, + MIPS_NOT_SUPP, "MIPS R6000 CPU" }, + + /* + * rev 0x00 and 0x30 are R4000, 0x40, 0x50 and 0x60 are R4400. + * should we allow ranges and use 0x00 - 0x3f for R4000 and + * 0x40 - 0xff for R4400? + */ + { 0, MIPS_R4000, MIPS_REV_R4000_A, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "MIPS R4000 CPU" }, + { 0, MIPS_R4000, MIPS_REV_R4000_B, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "MIPS R4000 CPU" }, + { 0, MIPS_R4000, MIPS_REV_R4400_A, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "MIPS R4400 CPU" }, + { 0, MIPS_R4000, MIPS_REV_R4400_B, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "MIPS R4400 CPU" }, + { 0, MIPS_R4000, MIPS_REV_R4400_C, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "MIPS R4400 CPU" }, + + { 0, MIPS_R3LSI, -1, -1, CPU_ARCH_MIPS1, -1, + MIPS_NOT_SUPP, "LSI Logic R3000 derivative" }, + { 0, MIPS_R6000A, -1, -1, CPU_ARCH_MIPS2, 32, + MIPS_NOT_SUPP, "MIPS R6000A CPU" }, + { 0, MIPS_R3IDT, -1, -1, CPU_ARCH_MIPS1, -1, + MIPS_NOT_SUPP, "IDT R3041 or RC36100 CPU" }, + { 0, MIPS_R4100, -1, -1, CPU_ARCH_MIPS3, 32, + CPU_MIPS_R4K_MMU | CPU_MIPS_NO_LLSC, "NEC VR4100 CPU" }, + { 0, MIPS_R4200, -1, -1, CPU_ARCH_MIPS3, -1, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "NEC VR4200 CPU" }, + { 0, MIPS_R4300, -1, -1, CPU_ARCH_MIPS3, 32, + CPU_MIPS_R4K_MMU, "NEC VR4300 CPU" }, + { 0, MIPS_R4600, -1, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "QED R4600 Orion CPU" }, + { 0, MIPS_R4700, -1, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU, "QED R4700 Orion CPU" }, + + { 0, MIPS_R8000, -1, -1, CPU_ARCH_MIPS4, 384, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "MIPS R8000 Blackbird/TFP CPU" }, + { 0, MIPS_R10000, -1, -1, CPU_ARCH_MIPS4, 64, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "MIPS R10000 CPU" }, + { 0, MIPS_R12000, -1, -1, CPU_ARCH_MIPS4, 64, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "MIPS R12000 CPU" }, + { 0, MIPS_R14000, -1, -1, CPU_ARCH_MIPS4, 64, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "MIPS R14000 CPU" }, + + /* XXX + * If the Processor Revision ID of the 4650 isn't 0, the following + * entry needs to be adjusted. Can't use a wildcard match because + * the TX39 series processors share the same Processor ID value. + * Or maybe put TX39 CPUs first if the revid doesn't overlap with + * the 4650... + */ + { 0, MIPS_R4650, 0, -1, CPU_ARCH_MIPS3, -1, + MIPS_NOT_SUPP /* no MMU! */, "QED R4650 CPU" }, + { 0, MIPS_TX3900, MIPS_REV_TX3912, -1, CPU_ARCH_MIPS1, 32, + CPU_MIPS_NO_LLSC, "Toshiba TX3912 CPU" }, + { 0, MIPS_TX3900, MIPS_REV_TX3922, -1, CPU_ARCH_MIPS1, 64, + CPU_MIPS_NO_LLSC, "Toshiba TX3922 CPU" }, + { 0, MIPS_TX3900, MIPS_REV_TX3927, -1, CPU_ARCH_MIPS1, 64, + CPU_MIPS_NO_LLSC, "Toshiba TX3927 CPU" }, + { 0, MIPS_R5000, -1, -1, CPU_ARCH_MIPS4, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "MIPS R5000 CPU" }, + { 0, MIPS_RM5200, -1, -1, CPU_ARCH_MIPS4, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_CAUSE_IV | CPU_MIPS_DOUBLE_COUNT | + CPU_MIPS_USE_WAIT, "QED RM5200 CPU" }, + + /* XXX + * The rm7000 rev 2.0 can have 64 tlbs, and has 6 extra interrupts. See + * "Migrating to the RM7000 from other MIPS Microprocessors" + * for more details. + */ + { 0, MIPS_RM7000, -1, -1, CPU_ARCH_MIPS4, 48, + MIPS_NOT_SUPP | CPU_MIPS_CAUSE_IV | CPU_MIPS_DOUBLE_COUNT | + CPU_MIPS_USE_WAIT, "QED RM7000 CPU" }, + + /* + * IDT RC32300 core is a 32 bit MIPS2 processor with + * MIPS3/MIPS4 extensions. It has an R4000-style TLB, + * while all registers are 32 bits and any 64 bit + * instructions like ld/sd/dmfc0/dmtc0 are not allowed. + * + * note that the Config register has a non-standard base + * for IC and DC (2^9 instead of 2^12). + * + */ + { 0, MIPS_RC32300, -1, -1, CPU_ARCH_MIPS3, 16, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "IDT RC32300 CPU" }, + { 0, MIPS_RC32364, -1, -1, CPU_ARCH_MIPS3, 16, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "IDT RC32364 CPU" }, + { 0, MIPS_RC64470, -1, -1, CPU_ARCH_MIPSx, -1, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "IDT RC64474/RC64475 CPU" }, + + { 0, MIPS_R5400, -1, -1, CPU_ARCH_MIPSx, -1, + MIPS_NOT_SUPP | CPU_MIPS_R4K_MMU, "NEC VR5400 CPU" }, + { 0, MIPS_R5900, -1, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_NO_LLSC | CPU_MIPS_R4K_MMU, "Toshiba R5900 CPU" }, + + { 0, MIPS_TX4900, MIPS_REV_TX4927, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "Toshiba TX4927 CPU" }, + { 0, MIPS_TX4900, -1, -1, CPU_ARCH_MIPS3, 48, + CPU_MIPS_R4K_MMU | CPU_MIPS_DOUBLE_COUNT, + "Toshiba TX4900 CPU" }, + +#if 0 /* ID collisions : can we use a CU1 test or similar? */ + { 0, MIPS_R3SONY, -1, -1, CPU_ARCH_MIPS1, -1, + MIPS_NOT_SUPP, "SONY R3000 derivative" }, /* 0x21; crash R4700? */ + { 0, MIPS_R3NKK, -1, -1, CPU_ARCH_MIPS1, -1, + MIPS_NOT_SUPP, "NKK R3000 derivative" }, /* 0x23; crash R5000? */ +#endif + + { MIPS_PRID_CID_MTI, MIPS_4Kc, -1, -1, -1, 0, + MIPS32_FLAGS | CPU_MIPS_DOUBLE_COUNT, "4Kc" }, + { MIPS_PRID_CID_MTI, MIPS_4KEc, -1, -1, -1, 0, + MIPS32_FLAGS | CPU_MIPS_DOUBLE_COUNT, "4KEc" }, + { MIPS_PRID_CID_MTI, MIPS_4KSc, -1, -1, -1, 0, + MIPS32_FLAGS | CPU_MIPS_DOUBLE_COUNT, "4KSc" }, + { MIPS_PRID_CID_MTI, MIPS_5Kc, -1, -1, -1, 0, + MIPS64_FLAGS | CPU_MIPS_DOUBLE_COUNT, "5Kc" }, + { MIPS_PRID_CID_MTI, MIPS_20Kc, -1, -1, -1, 0, + MIPS64_FLAGS, "20Kc" }, + + { MIPS_PRID_CID_ALCHEMY, MIPS_AU_REV1, -1, MIPS_AU1000, -1, 0, + MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, + "Au1000 (Rev 1 core)" }, + { MIPS_PRID_CID_ALCHEMY, MIPS_AU_REV2, -1, MIPS_AU1000, -1, 0, + MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, + "Au1000 (Rev 2 core)" }, + + { MIPS_PRID_CID_ALCHEMY, MIPS_AU_REV1, -1, MIPS_AU1500, -1, 0, + MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, + "Au1500 (Rev 1 core)" }, + { MIPS_PRID_CID_ALCHEMY, MIPS_AU_REV2, -1, MIPS_AU1500, -1, 0, + MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, + "Au1500 (Rev 2 core)" }, + + { MIPS_PRID_CID_ALCHEMY, MIPS_AU_REV1, -1, MIPS_AU1100, -1, 0, + MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, + "Au1100 (Rev 1 core)" }, + { MIPS_PRID_CID_ALCHEMY, MIPS_AU_REV2, -1, MIPS_AU1100, -1, 0, + MIPS32_FLAGS | CPU_MIPS_NO_WAIT | CPU_MIPS_I_D_CACHE_COHERENT, + "Au1100 (Rev 2 core)" }, + + /* The SB1 CPUs use a CCA of 5 - "Cacheable Coherent Shareable" */ + { MIPS_PRID_CID_SIBYTE, MIPS_SB1, -1, -1, -1, 0, + MIPS64_FLAGS | CPU_MIPS_D_CACHE_COHERENT | + CPU_MIPS_HAVE_SPECIAL_CCA | (5 << CPU_MIPS_CACHED_CCA_SHIFT), + "SB1" }, + + { 0, 0, 0, 0, 0, 0, + 0, NULL } +}; + +static const struct pridtab fputab[] = { + { 0, MIPS_SOFT, -1, 0, 0, 0, 0, "software emulated floating point" }, + { 0, MIPS_R2360, -1, 0, 0, 0, 0, "MIPS R2360 Floating Point Board" }, + { 0, MIPS_R2010, -1, 0, 0, 0, 0, "MIPS R2010 FPC" }, + { 0, MIPS_R3010, -1, 0, 0, 0, 0, "MIPS R3010 FPC" }, + { 0, MIPS_R6010, -1, 0, 0, 0, 0, "MIPS R6010 FPC" }, + { 0, MIPS_R4010, -1, 0, 0, 0, 0, "MIPS R4010 FPC" }, +}; + +/* + * Company ID's are not sparse (yet), this array is indexed directly + * by pridtab->cpu_cid. + */ +static const char *cidnames[] = { + "Prehistoric", + "MIPS", /* or "MIPS Technologies, Inc. */ + "Broadcom", /* or "Broadcom Corp." */ + "Alchemy", /* or "Alchemy Semiconductor" */ + "SiByte", /* or "Broadcom Corp. (SiByte)" */ + "SandCraft", +}; +#define ncidnames (sizeof(cidnames) / sizeof(cidnames[0])) + +#ifdef notyet +/* + * MIPS64 locore function vector + */ +const mips_locore_jumpvec_t mips64_locore_vec = +{ + mips64_SetPID, + mips64_TBIAP, + mips64_TBIS, + mips64_TLBUpdate, + mips64_wbflush, +}; + +static void +mips64_vector_init(void) +{ + /* r4000 exception handler address and end */ + extern char mips64_exception[], mips64_exceptionEnd[]; + + /* TLB miss handler address and end */ + extern char mips64_TLBMiss[], mips64_TLBMissEnd[]; + extern char mips64_XTLBMiss[], mips64_XTLBMissEnd[]; + + /* Cache error handler */ + extern char mips64_cache[], mips64_cacheEnd[]; + + /* MIPS32/MIPS64 interrupt exception handler */ + extern char mips64_intr[], mips64_intrEnd[]; + + /* + * Copy down exception vector code. + */ + + if (mips64_TLBMissEnd - mips64_TLBMiss > 0x80) + panic("startup: UTLB vector code too large"); + memcpy((void *)MIPS_UTLB_MISS_EXC_VEC, mips64_TLBMiss, + mips64_TLBMissEnd - mips64_TLBMiss); + + if (mips64_XTLBMissEnd - mips64_XTLBMiss > 0x80) + panic("startup: XTLB vector code too large"); + memcpy((void *)MIPS3_XTLB_MISS_EXC_VEC, mips64_XTLBMiss, + mips64_XTLBMissEnd - mips64_XTLBMiss); + + if (mips64_cacheEnd - mips64_cache > 0x80) + panic("startup: Cache error vector code too large"); + memcpy((void *)MIPS3_CACHE_ERR_EXC_VEC, mips64_cache, + mips64_cacheEnd - mips64_cache); + + if (mips64_exceptionEnd - mips64_exception > 0x80) + panic("startup: General exception vector code too large"); + memcpy((void *)MIPS3_GEN_EXC_VEC, mips64_exception, + mips64_exceptionEnd - mips64_exception); + + if (mips64_intrEnd - mips64_intr > 0x80) + panic("startup: interrupt exception vector code too large"); +#if 0 /* XXX - why doesn't mipsNN_intr() work? */ + memcpy((void *)MIPS3_INTR_EXC_VEC, mips64_intr, + mips64_intrEnd - mips64_intr); +#else + memcpy((void *)MIPS3_INTR_EXC_VEC, mips64_exception, + mips64_exceptionEnd - mips64_exception); +#endif + + /* + * Copy locore-function vector. + */ + memcpy(&mips_locore_jumpvec, &mips64_locore_vec, + sizeof(mips_locore_jumpvec_t)); + + mips_icache_sync_all(); + mips_dcache_wbinv_all(); + + /* Clear BEV in SR so we start handling our own exceptions */ + mips_cp0_status_write(mips_cp0_status_read() & ~MIPS_SR_BEV); +} +#endif /* notyet */ + +/* + * Do all the stuff that locore normally does before calling main(), + * that is common to all mips-CPU NetBSD ports. + * + * The principal purpose of this function is to examine the + * variable cpu_id, into which the kernel locore start code + * writes the cpu ID register, and to then copy appropriate + * code into the CPU exception-vector entries and the jump tables + * used to hide the differences in cache and TLB handling in + * different MIPS CPUs. + * + * This should be the very first thing called by each port's + * init_main() function. + */ + +/* + * Initialize the hardware exception vectors, and the jump table used to + * call locore cache and TLB management functions, based on the kind + * of CPU the kernel is running on. + */ +void +mips_vector_init(void) +{ + const struct pridtab *ct; + + mycpu = NULL; + for (ct = cputab; ct->cpu_name != NULL; ct++) { + if (MIPS_PRID_CID(cpu_id) != ct->cpu_cid || + MIPS_PRID_IMPL(cpu_id) != ct->cpu_pid) + continue; + if (ct->cpu_rev >= 0 && + MIPS_PRID_REV(cpu_id) != ct->cpu_rev) + continue; + if (ct->cpu_copts >= 0 && + MIPS_PRID_COPTS(cpu_id) != ct->cpu_copts) + continue; + + mycpu = ct; + cpu_arch = ct->cpu_isa; + mips_num_tlb_entries = ct->cpu_ntlb; + break; + } + + if (mycpu == NULL) + panic("CPU type (0x%x) not supported", cpu_id); + + if (MIPS_PRID_CID(cpu_id) != 0) { + /* MIPS32/MIPS64, use coprocessor 0 config registers */ + uint32_t cfg, cfg1; + + cfg = mips3_cp0_config_read(); + cfg1 = mipsNN_cp0_config1_read(); + + /* pick CPU type */ + switch (MIPSNN_GET(CFG_AT, cfg)) { + case MIPSNN_CFG_AT_MIPS32: + cpu_arch = CPU_ARCH_MIPS32; + break; + case MIPSNN_CFG_AT_MIPS64: + cpu_arch = CPU_ARCH_MIPS64; + break; + case MIPSNN_CFG_AT_MIPS64S: + default: + panic("MIPS32/64 architecture type %d not supported", + MIPSNN_GET(CFG_AT, cfg)); + } + + if (MIPSNN_GET(CFG_AR, cfg) != MIPSNN_CFG_AR_REV1) + printf("WARNING: MIPS32/64 arch revision != revision 1!\n"); + + /* figure out MMU type (and number of TLB entries) */ + switch (MIPSNN_GET(CFG_MT, cfg)) { + case MIPSNN_CFG_MT_TLB: + mips_num_tlb_entries = MIPSNN_CFG1_MS(cfg1); + break; + case MIPSNN_CFG_MT_NONE: + case MIPSNN_CFG_MT_BAT: + case MIPSNN_CFG_MT_FIXED: + default: + panic("MIPS32/64 MMU type %d not supported", + MIPSNN_GET(CFG_MT, cfg)); + } + } + + if (cpu_arch < 1) + panic("Unknown CPU ISA for CPU type 0x%x", cpu_id); + if (mips_num_tlb_entries < 1) + panic("Unknown number of TLBs for CPU type 0x%x", cpu_id); + + /* + * Check cpu-specific flags. + */ + mips_cpu_flags = mycpu->cpu_flags; + mips_has_r4k_mmu = mips_cpu_flags & CPU_MIPS_R4K_MMU; + mips_has_llsc = (mips_cpu_flags & CPU_MIPS_NO_LLSC) == 0; + + if (mycpu->cpu_flags & CPU_MIPS_HAVE_SPECIAL_CCA) { + uint32_t cca; + + cca = (ct->cpu_flags & CPU_MIPS_CACHED_CCA_MASK) >> + CPU_MIPS_CACHED_CCA_SHIFT; + mips3_pg_cached = MIPS3_CCA_TO_PG(cca); + } else + mips3_pg_cached = MIPS3_DEFAULT_PG_CACHED; + +#ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG + mips_machdep_cache_config(); +#endif + + /* + * Determine cache configuration and initialize our cache + * frobbing routine function pointers. + */ + mips_config_cache(); + +#if notyet + /* + * Now initialize our ISA-dependent function vector. + */ + switch (cpu_arch) { + case CPU_ARCH_MIPS64: + mips3_cp0_wired_write(0); + mips64_TBIA(mips_num_tlb_entries); + mips3_cp0_wired_write(MIPS3_TLB_WIRED_UPAGES); + mips64_vector_init(); + memcpy(mips_locoresw, mips64_locoresw, sizeof(mips_locoresw)); + break; + default: + printf("cpu_arch 0x%x: not supported\n", cpu_arch); + cpu_reboot(RB_HALT, NULL); + } + +/* XXX simonb: ugg, another ugly #ifdef check... */ + /* + * Install power-saving idle routines. + */ + if ((mips_cpu_flags & CPU_MIPS_USE_WAIT) && + !(mips_cpu_flags & CPU_MIPS_NO_WAIT)) + CPU_IDLE = (long *)mips_wait_idle; +#endif /* notyet */ +} + +#if notyet +void +mips_set_wbflush(flush_fn) + void (*flush_fn)(void); +{ +#undef wbflush + mips_locore_jumpvec.wbflush = flush_fn; + (*flush_fn)(); +} +#endif + +/* + * Identify product revision IDs of cpu and fpu. + */ +void +cpu_identify(void) +{ + static const char * const waynames[] = { + "fully set-associative", /* 0 */ + "direct-mapped", /* 1 */ + "2-way set-associative", /* 2 */ + NULL, /* 3 */ + "4-way set-associative", /* 4 */ + }; +#define nwaynames (sizeof(waynames) / sizeof(waynames[0])) + static const char * const wtnames[] = { + "write-back", + "write-through", + }; + static const char * const label = "cpu0"; /* XXX */ + char *cpuname, *fpuname; + int i; + + cpuname = mycpu->cpu_name; + + fpuname = NULL; + for (i = 0; i < sizeof(fputab)/sizeof(fputab[0]); i++) { + if (MIPS_PRID_CID(fpu_id) == fputab[i].cpu_cid && + MIPS_PRID_IMPL(fpu_id) == fputab[i].cpu_pid) { + fpuname = fputab[i].cpu_name; + break; + } + } + if (fpuname == NULL && MIPS_PRID_IMPL(fpu_id) == MIPS_PRID_IMPL(cpu_id)) + fpuname = "built-in FPU"; + if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4700) /* FPU PRid is 0x20 */ + fpuname = "built-in FPU"; + if (MIPS_PRID_IMPL(cpu_id) == MIPS_RC64470) /* FPU PRid is 0x21 */ + fpuname = "built-in FPU"; + + if (mycpu->cpu_cid != 0) { + if (mycpu->cpu_cid <= ncidnames) + printf("%s ", cidnames[mycpu->cpu_cid]); + else { + printf("Unknown Company ID - 0x%x", mycpu->cpu_cid); + printf("%s: ", label); + } + } + if (cpuname != NULL) + printf("%s (0x%x)", cpuname, cpu_id); + else + printf("unknown CPU type (0x%x)", cpu_id); + if (MIPS_PRID_CID(cpu_id) == MIPS_PRID_CID_PREHISTORIC) + printf(" Rev. %d.%d", MIPS_PRID_REV_MAJ(cpu_id), + MIPS_PRID_REV_MIN(cpu_id)); + else + printf(" Rev. %d", MIPS_PRID_REV(cpu_id)); + + if (fpuname != NULL) + printf(" with %s", fpuname); + else + printf(" with unknown FPC type (0x%x)", fpu_id); + if (fpu_id != 0) { + if (MIPS_PRID_CID(cpu_id) == MIPS_PRID_CID_PREHISTORIC) + printf(" Rev. %d.%d", MIPS_PRID_REV_MAJ(fpu_id), + MIPS_PRID_REV_MIN(fpu_id)); + else + printf(" Rev. %d", MIPS_PRID_REV(fpu_id)); + } + printf("\n"); + + if (MIPS_PRID_CID(cpu_id) == MIPS_PRID_CID_PREHISTORIC && + MIPS_PRID_RSVD(cpu_id) != 0) { + printf("%s: NOTE: top 8 bits of prehistoric PRID not 0!\n", + label); + printf("%s: Please mail port-mips@netbsd.org with cpu0 " + "dmesg lines.\n", label); + } + + KASSERT(mips_picache_ways < nwaynames, "picache ways < nwaynames"); + KASSERT(mips_pdcache_ways < nwaynames, "pdcache ways < nwaynames"); + KASSERT(mips_sicache_ways < nwaynames, "sicache ways < nwaynames"); + KASSERT(mips_sdcache_ways < nwaynames, "sdcache ways < nwaynames"); + + switch (cpu_arch) { + case CPU_ARCH_MIPS3: + case CPU_ARCH_MIPS4: + case CPU_ARCH_MIPS32: + case CPU_ARCH_MIPS64: + if (mips_picache_size) + printf("%s: %dKB/%dB %s L1 Instruction cache, " + "%d TLB entries\n", label, mips_picache_size / 1024, + mips_picache_line_size, waynames[mips_picache_ways], + mips_num_tlb_entries); + else + printf("%s: %d TLB entries\n", label, mips_num_tlb_entries); + if (mips_pdcache_size) + printf("%s: %dKB/%dB %s %s L1 Data cache\n", label, + mips_pdcache_size / 1024, mips_pdcache_line_size, + waynames[mips_pdcache_ways], + wtnames[mips_pdcache_write_through]); + if (mips_sdcache_line_size) + printf("%s: %dKB/%dB %s %s L2 %s cache\n", label, + mips_sdcache_size / 1024, mips_sdcache_line_size, + waynames[mips_sdcache_ways], + wtnames[mips_sdcache_write_through], + mips_scache_unified ? "Unified" : "Data"); + break; + default: + panic("cpu_identify: impossible"); + } +} From owner-p4-projects@FreeBSD.ORG Sun Apr 27 22:18:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D57B137B404; Sun, 27 Apr 2003 22:18:47 -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 59F4737B401 for ; Sun, 27 Apr 2003 22:18:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E772043F3F for ; Sun, 27 Apr 2003 22:18:46 -0700 (PDT) (envelope-from marcel@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 h3S5Ik0U069156 for ; Sun, 27 Apr 2003 22:18:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S5Ik9a069150 for perforce@freebsd.org; Sun, 27 Apr 2003 22:18:46 -0700 (PDT) Date: Sun, 27 Apr 2003 22:18:46 -0700 (PDT) Message-Id: <200304280518.h3S5Ik9a069150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29930 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: Mon, 28 Apr 2003 05:18:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=29930 Change 29930 by marcel@marcel_pluto2 on 2003/04/27 22:18:08 Step 3: Aaarrrggghhh -- this is the second time I add support for memory mapped I/O and the source file contains an include for . Also: Add a barrier. We don't want timer reads to be reordered. Consequently: a macros isn't really suitable. Create a function and give it a better name. Lastly: Slightly change the initialization. It's less twisted this way. In short: We have a clock on pluto with SMP. Yay! Affected files ... .. //depot/projects/ia64_epc/sys/dev/acpica/acpi_timer.c#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/dev/acpica/acpi_timer.c#3 (text+ko) ==== @@ -37,7 +37,6 @@ #include #endif -#include #include #include #include @@ -61,9 +60,6 @@ static device_t acpi_timer_dev; struct resource *acpi_timer_reg; -#define TIMER_READ bus_space_read_4(rman_get_bustag(acpi_timer_reg), \ - rman_get_bushandle(acpi_timer_reg), \ - 0) static u_int acpi_timer_frequency = 14318182/4; @@ -75,6 +71,9 @@ static int acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS); static void acpi_timer_test(void); +static u_int32_t read_counter(void); +static int test_counter(void); + /* * Driver hung off ACPI. */ @@ -106,7 +105,20 @@ "ACPI" }; -static int test_counter(void); + +static u_int32_t +read_counter() +{ + bus_space_handle_t bsh; + bus_space_tag_t bst; + u_int32_t tv; + + bsh = rman_get_bushandle(acpi_timer_reg); + bst = rman_get_bustag(acpi_timer_reg); + tv = bus_space_read_4(bst, bsh, 0); + bus_space_barrier(bst, bsh, 0, 4, BUS_SPACE_BARRIER_READ); + return (tv); +} #define N 2000 static int @@ -117,9 +129,9 @@ min = 10000000; max = 0; - last = TIMER_READ; + last = read_counter(); for (n = 0; n < N; n++) { - this = TIMER_READ; + this = read_counter(); delta = (this - last) & 0xffffff; if (delta > max) max = delta; @@ -167,11 +179,11 @@ acpi_timer_dev = dev; rid = 0; - rlen = 3 + AcpiGbl_FADT->TmrValExt; /* 24 or 32 bit timers. */ + rlen = AcpiGbl_FADT->PmTmLen; rtype = (AcpiGbl_FADT->XPmTmrBlk.AddressSpaceId) ? SYS_RES_IOPORT : SYS_RES_MEMORY; rstart = AcpiGbl_FADT->XPmTmrBlk.Address; - bus_set_resource(dev, rtype, rid, rstart, 4); + bus_set_resource(dev, rtype, rid, rstart, rlen); acpi_timer_reg = bus_alloc_resource(dev, rtype, &rid, 0, ~0, 1, RF_ACTIVE); if (acpi_timer_reg == NULL) { device_printf(dev, "couldn't allocate I/O resource (%s 0x%lx)\n", @@ -194,7 +206,8 @@ } tc_init(&acpi_timer_timecounter); - sprintf(desc, "%d-bit timer at 3.579545MHz", (int)(rlen << 3)); + sprintf(desc, "%d-bit timer at 3.579545MHz", (AcpiGbl_FADT->TmrValExt) + ? 32 : 24); device_set_desc_copy(dev, desc); return_VOID; @@ -220,7 +233,7 @@ static unsigned acpi_timer_get_timecount(struct timecounter *tc) { - return(TIMER_READ); + return (read_counter()); } /* @@ -232,12 +245,12 @@ { unsigned u1, u2, u3; - u2 = TIMER_READ; - u3 = TIMER_READ; + u2 = read_counter(); + u3 = read_counter(); do { u1 = u2; u2 = u3; - u3 = TIMER_READ; + u3 = read_counter(); } while (u1 > u2 || u2 > u3 || (u3 - u1) > 15); return (u2); } @@ -274,9 +287,9 @@ { u_int32_t u1, u2, u3; - u1 = TIMER_READ; - u2 = TIMER_READ; - u3 = TIMER_READ; + u1 = read_counter(); + u2 = read_counter(); + u3 = read_counter(); device_printf(acpi_timer_dev, "timer test in progress, reboot to quit.\n"); for (;;) { @@ -291,7 +304,7 @@ } u1 = u2; u2 = u3; - u3 = TIMER_READ; + u3 = read_counter(); } } From owner-p4-projects@FreeBSD.ORG Sun Apr 27 22:35:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5719537B405; Sun, 27 Apr 2003 22:35:08 -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 094BD37B401 for ; Sun, 27 Apr 2003 22:35:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF9B43F93 for ; Sun, 27 Apr 2003 22:35:07 -0700 (PDT) (envelope-from marcel@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 h3S5Z70U081455 for ; Sun, 27 Apr 2003 22:35:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S5Z6uc081449 for perforce@freebsd.org; Sun, 27 Apr 2003 22:35:06 -0700 (PDT) Date: Sun, 27 Apr 2003 22:35:06 -0700 (PDT) Message-Id: <200304280535.h3S5Z6uc081449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29931 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: Mon, 28 Apr 2003 05:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=29931 Change 29931 by marcel@marcel_nfs on 2003/04/27 22:34:48 We have an annoying race when using EPC syscalls which results in a general exception in cpu_switch(). We obviously get an interrupt when setting up the trapframe, but why and how this result in cloberring is not know yet. So, apply the equivalent of a 9-inch nail and disable interrupts. I need to understand what is happening exactly so that I can create a real fix (or acknowledge that this is in fact the fix). For now it simply makes EPC syscalls reliable enough to make the switch. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#13 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#13 (text+ko) ==== @@ -224,6 +224,8 @@ .section .text.syscall, "ax" ENTRY(epc_syscall, 8) + rsm psr.i + ;; { .mmi mov r16=ar.rsc mov ar.rsc=0 @@ -359,7 +361,7 @@ ;; } { .mlx - ssm psr.dfh|psr.ac + ssm psr.dfh|psr.ac|psr.i movl gp=__gp ;; } From owner-p4-projects@FreeBSD.ORG Mon Apr 28 09:01:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 216F737B405; Mon, 28 Apr 2003 09:01:50 -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 C0F3537B404 for ; Mon, 28 Apr 2003 09:01:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5538D43FAF for ; Mon, 28 Apr 2003 09:01:49 -0700 (PDT) (envelope-from obrien@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 h3SG1n0U055626 for ; Mon, 28 Apr 2003 09:01:49 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SG1m7x055618 for perforce@freebsd.org; Mon, 28 Apr 2003 09:01:48 -0700 (PDT) Date: Mon, 28 Apr 2003 09:01:48 -0700 (PDT) Message-Id: <200304281601.h3SG1m7x055618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 29945 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: Mon, 28 Apr 2003 16:01:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=29945 Change 29945 by obrien@obrien_trang on 2003/04/28 09:00:48 db_expr_t needs to be a 64-bit value on 64-bit machines. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/db_machdep.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/db_machdep.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ #define i386_saved_state trapframe typedef vm_offset_t db_addr_t; /* address - unsigned */ -typedef int db_expr_t; /* expression - signed */ +typedef long db_expr_t; /* expression - signed */ typedef struct i386_saved_state db_regs_t; extern db_regs_t ddb_regs; /* register state */ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 10:16:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEEBC37B404; Mon, 28 Apr 2003 10:16:21 -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 7E42137B401 for ; Mon, 28 Apr 2003 10:16:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 248F843F93 for ; Mon, 28 Apr 2003 10:16:21 -0700 (PDT) (envelope-from jmallett@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 h3SHGK0U011983 for ; Mon, 28 Apr 2003 10:16:20 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SHGKHk011975 for perforce@freebsd.org; Mon, 28 Apr 2003 10:16:20 -0700 (PDT) Date: Mon, 28 Apr 2003 10:16:20 -0700 (PDT) Message-Id: <200304281716.h3SHGKHk011975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29948 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: Mon, 28 Apr 2003 17:16:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=29948 Change 29948 by jmallett@jmallett_dalek on 2003/04/28 10:15:24 Choose ARCBIOS pointer size based on ARCBIOS64 knob in opt_arcbios.h. Affected files ... .. //depot/projects/mips/sys/conf/options.mips#10 edit .. //depot/projects/mips/sys/dev/arcbios/arcbios.h#4 edit .. //depot/projects/mips/sys/mips/conf/GENERIC#12 edit Differences ... ==== //depot/projects/mips/sys/conf/options.mips#10 (text+ko) ==== @@ -12,3 +12,4 @@ SGIMIPS opt_platform.h _BYTE_ORDER opt_endian.h +ARCBIOS64 opt_arcbios.h ==== //depot/projects/mips/sys/dev/arcbios/arcbios.h#4 (text+ko) ==== @@ -36,6 +36,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_arcbios.h" + /* * The ARC BIOS (which is similar, but not 100% compatible with SGI ARCS) * specification can be found at: @@ -78,7 +80,11 @@ #define ARCBIOS_ENOCONNECT 34 /* not connected */ #endif /* sgimips */ -typedef uint32_t ArcPointer_t;/* XXX */ +#ifndef ARCBIOS64 +typedef uint32_t ArcPointer_t; +#else +typedef uint64_t ArcPointer_t; +#endif /* * 4.2.2: System Parameter Block ==== //depot/projects/mips/sys/mips/conf/GENERIC#12 (text+ko) ==== @@ -19,6 +19,8 @@ # Hardware support device arcbios #ARCBIOS +options ARCBIOS64 #ARCBIOS uses 64-bit pointers in + #structures. Disable for IP22. options SCHED_4BSD #A scheduler, if you please From owner-p4-projects@FreeBSD.ORG Mon Apr 28 10:24:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC6EC37B404; Mon, 28 Apr 2003 10:24:32 -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 76A9337B401 for ; Mon, 28 Apr 2003 10:24:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20E5543F75 for ; Mon, 28 Apr 2003 10:24:32 -0700 (PDT) (envelope-from jmallett@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 h3SHOV0U017679 for ; Mon, 28 Apr 2003 10:24:31 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SHOVFI017666 for perforce@freebsd.org; Mon, 28 Apr 2003 10:24:31 -0700 (PDT) Date: Mon, 28 Apr 2003 10:24:31 -0700 (PDT) Message-Id: <200304281724.h3SHOVFI017666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29949 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: Mon, 28 Apr 2003 17:24:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=29949 Change 29949 by jmallett@jmallett_dalek on 2003/04/28 10:23:51 Remove bogus comment. Exception vectors are in mipsX_subr.S... Affected files ... .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#2 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#2 (text+ko) ==== @@ -116,15 +116,6 @@ * for those CPU, define COP0_SYNC as sync.p */ -/* - *============================================================================ - * - * MIPS III ISA support, part 1: locore exception vectors. - * The following code is copied to the vector locations to which - * the CPU jumps in response to an exception or a TLB miss. - * - *============================================================================ - */ .set noreorder .set mips3 From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:10:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37CC937B401; Mon, 28 Apr 2003 11:10:32 -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 D5A1E37B404 for ; Mon, 28 Apr 2003 11:10:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 758FE43FCB for ; Mon, 28 Apr 2003 11:10:31 -0700 (PDT) (envelope-from jmallett@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 h3SIAV0U050548 for ; Mon, 28 Apr 2003 11:10:31 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SIAUCs050541 for perforce@freebsd.org; Mon, 28 Apr 2003 11:10:30 -0700 (PDT) Date: Mon, 28 Apr 2003 11:10:30 -0700 (PDT) Message-Id: <200304281810.h3SIAUCs050541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29954 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: Mon, 28 Apr 2003 18:10:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=29954 Change 29954 by jmallett@jmallett_dalek on 2003/04/28 11:10:23 Add header for register number definitions from NBSD. Affected files ... .. //depot/projects/mips/sys/mips/include/frame.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/frame.h#3 (text+ko) ==== @@ -28,17 +28,55 @@ #ifndef _MACHINE_FRAME_H_ #define _MACHINE_FRAME_H_ -struct frame { - __register_t fr_regs[38]; +#include + +/* + * trapframe argument passed to trap() + */ + +#define TF_AST 0 +#define TF_V0 1 +#define TF_V1 2 +#define TF_A0 3 +#define TF_A1 4 +#define TF_A2 5 +#define TF_A3 6 +#define TF_T0 7 +#define TF_T1 8 +#define TF_T2 9 +#define TF_T3 10 + +#define TF_A4 11 +#define TF_A5 12 +#define TF_A6 13 +#define TF_A7 14 + +#define TF_TA0 11 +#define TF_TA1 12 +#define TF_TA2 13 +#define TF_TA3 14 + +#define TF_T8 15 +#define TF_T9 16 + +#define TF_RA 17 +#define TF_SR 18 +#define TF_MULLO 19 +#define TF_MULHI 20 +#define TF_EPC 21 /* may be changed by trap() call */ + +#define TF_NREGS 22 + +struct trapframe { + __register_t tf_regs[TF_NREGS]; + u_int32_t tf_ppl; /* previous priority level */ + int32_t tf_pad; /* for 8 byte aligned */ }; -struct trapframe { - __register_t tf_regs[17]; /* 17 Saved GP registers. */ - __register_t tf_ra; /* Return address. */ - __register_t tf_sr; - __register_t tf_mullo; /* Low-bits of multiply register. */ - __register_t tf_mulhi; /* High-bits of multiply register. */ - __register_t tf_epc; /* Exception program counter. */ +struct frame { + __register_t f_regs[38]; + u_int32_t f_ppl; /* previous priority level */ + int32_t f_pad; /* for 8 byte aligned */ }; #endif /* !_MACHINE_FRAME_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:13:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F0CB37B404; Mon, 28 Apr 2003 11:13:36 -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 2037137B401 for ; Mon, 28 Apr 2003 11:13:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B854743F3F for ; Mon, 28 Apr 2003 11:13:35 -0700 (PDT) (envelope-from jmallett@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 h3SIDZ0U052997 for ; Mon, 28 Apr 2003 11:13:35 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SIDZFn052991 for perforce@freebsd.org; Mon, 28 Apr 2003 11:13:35 -0700 (PDT) Date: Mon, 28 Apr 2003 11:13:35 -0700 (PDT) Message-Id: <200304281813.h3SIDZFn052991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29955 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: Mon, 28 Apr 2003 18:13:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=29955 Change 29955 by jmallett@jmallett_dalek on 2003/04/28 11:12:43 Useful macros from NetBSD. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#5 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#5 (text+ko) ==== @@ -105,4 +105,52 @@ .section .gnu.warning./**/_sym ; .ascii _msg ; .text #endif /* __STDC__ */ +/* + * standard callframe { + * register_t cf_args[4]; arg0 - arg3 + * register_t cf_sp; frame pointer + * register_t cf_ra; return address + * }; + */ +#define CALLFRAME_SIZ (4 * (4 + 2)) +#define CALLFRAME_SP (4 * 4) +#define CALLFRAME_RA (4 * 5) + +/* + * While it would be nice to be compatible with the SGI + * REG_L and REG_S macros, because they do not take parameters, it + * is impossible to use them with the _MIPS_SIM_ABIX32 model. + * + * These macros hide the use of mips3 instructions from the + * assembler to prevent the assembler from generating 64-bit style + * ABI calls. + */ +#define REG_L ld +#define REG_S sd +#define REG_LI dli +#define SZREG 8 + +/* + * The DYNAMIC_STATUS_MASK option adds an additional masking operation + * when updating the hardware interrupt mask in the status register. + * + * This is useful for platforms that need to at run-time mask + * interrupts based on motherboard configuration or to handle + * slowly clearing interrupts. + * + * XXX this is only currently implemented for mips3. + */ +#ifdef MIPS_DYNAMIC_STATUS_MASK +#define DYNAMIC_STATUS_MASK(sr,scratch) \ + lw scratch, mips_dynamic_status_mask; \ + and sr, sr, scratch + +#define DYNAMIC_STATUS_MASK_TOUSER(sr,scratch1) \ + ori sr, (MIPS_INT_MASK | MIPS_SR_INT_IE); \ + DYNAMIC_STATUS_MASK(sr,scratch1) +#else +#define DYNAMIC_STATUS_MASK(sr,scratch) +#define DYNAMIC_STATUS_MASK_TOUSER(sr,scratch1) +#endif + #endif /* !_MACHINE_ASM_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:16:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AD737B404; Mon, 28 Apr 2003 11:16:40 -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 646A637B401 for ; Mon, 28 Apr 2003 11:16:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC1F743FD7 for ; Mon, 28 Apr 2003 11:16:39 -0700 (PDT) (envelope-from jmallett@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 h3SIGd0U055623 for ; Mon, 28 Apr 2003 11:16:39 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SIGd1i055618 for perforce@freebsd.org; Mon, 28 Apr 2003 11:16:39 -0700 (PDT) Date: Mon, 28 Apr 2003 11:16:39 -0700 (PDT) Message-Id: <200304281816.h3SIGd1i055618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29956 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: Mon, 28 Apr 2003 18:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=29956 Change 29956 by jmallett@jmallett_dalek on 2003/04/28 11:15:44 Chase trapframe layout. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#8 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ #define CLKF_USERMODE(cfp) (0) #define CLKF_PC(cfp) (0) -#define TRAPF_PC(tframe) ((tframe)->tf_epc) +#define TRAPF_PC(tframe) ((tframe)->tf_regs[TF_EPC]) #define cpu_getstack(p) (0) #define cpu_setstack(p, sp) (0) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:30:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07B9C37B405; Mon, 28 Apr 2003 11:30:31 -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 4DC7C37B401 for ; Mon, 28 Apr 2003 11:30:30 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id F380A43FBD for ; Mon, 28 Apr 2003 11:30:28 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 1369 invoked from network); 28 Apr 2003 18:30:34 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 28 Apr 2003 18:30:34 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h3SIUQOv015673; Mon, 28 Apr 2003 14:30:27 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200304252302.h3PN23r2008772@repoman.freebsd.org> Date: Mon, 28 Apr 2003 14:30:32 -0400 (EDT) From: John Baldwin To: Peter Wemm cc: Perforce Change Reviews Subject: RE: PERFORCE change 29745 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: Mon, 28 Apr 2003 18:30:32 -0000 On 25-Apr-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=29745 > > Change 29745 by peter@peter_daintree on 2003/04/25 16:01:39 > > Add a pcb flag to indicate that a full trapframe restore > is required, even from syscall.. eg: a sigreturn(2). > I'm not sure if this is the right place for it. mdthread > perhaps? Anyway, it'll do for now. mdthread sounds right. Alpha uses a flags field on the trapframe to accomplish this: sys/alpha/include/frame.h #define FRAME_FLAGS 27 #define FRAME_FLAGS_SYSCALL 1 /* partial frame for syscalls */ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:38:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4269637B413; Mon, 28 Apr 2003 11:38:08 -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 B206537B488 for ; Mon, 28 Apr 2003 11:38:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 590AC43F93 for ; Mon, 28 Apr 2003 11:38:07 -0700 (PDT) (envelope-from jmallett@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 h3SIc70U071713 for ; Mon, 28 Apr 2003 11:38:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SIc6Rr071707 for perforce@freebsd.org; Mon, 28 Apr 2003 11:38:06 -0700 (PDT) Date: Mon, 28 Apr 2003 11:38:06 -0700 (PDT) Message-Id: <200304281838.h3SIc6Rr071707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29958 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: Mon, 28 Apr 2003 18:38:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=29958 Change 29958 by jmallett@jmallett_dalek on 2003/04/28 11:37:37 Support macros for NetBSD. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#6 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#6 (text+ko) ==== @@ -74,14 +74,24 @@ #define _LEAF(x) \ .globl x; .ent x; x: ; .frame sp, 0, ra; +#define _EXPORT(x) \ + .globl x; x: + #define _END(x) \ .end x +#define _NESTED(x, fsize, retpc) \ + .globl x; .ent x; x:; .frame sp, fsize, retpc; + #define GLOBAL(y) _GLOBAL(CNAME(y)) #define ENTRY(y) _ENTRY(CNAME(y)); _PROF_PROLOGUE -#define XLEAF(y) _XLEAF(CNAME(y)); +#define XLEAF(y) _XLEAF(CNAME(y)) #define LEAF(y) _LEAF(CNAME(y)); _PROF_PROLOGUE +#define LEAF_NOPROFILE(y) _LEAF(CNAME(y)) +#define EXPORT(y) _EXPORT(CNAME(y)) #define END(y) _END(CNAME(y)) +#define NESTED(y,f,r) _NESTED(CNAME(y), f, r); _PROF_PROLOGUE +#define NESTED_NOPROFILE(y,f,r) _NESTED(CNAME(y), f, r) #define ASMSTR .asciz @@ -106,6 +116,26 @@ #endif /* __STDC__ */ /* + * Macros to panic and printf from assembly language. + */ +#define PANIC(msg) \ + la a0, 9f; \ + jal _C_LABEL(panic); \ + nop; \ + MSG(msg) + +#define PRINTF(msg) \ + la a0, 9f; \ + jal _C_LABEL(printf); \ + nop; \ + MSG(msg) + +#define MSG(msg) \ + .rdata; \ +9: .asciiz msg; \ + .text + +/* * standard callframe { * register_t cf_args[4]; arg0 - arg3 * register_t cf_sp; frame pointer From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:39:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFFB937B404; Mon, 28 Apr 2003 11:39:09 -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 9654937B401 for ; Mon, 28 Apr 2003 11:39:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 406D743F3F for ; Mon, 28 Apr 2003 11:39:09 -0700 (PDT) (envelope-from jmallett@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 h3SId90U072123 for ; Mon, 28 Apr 2003 11:39:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SId8hs072118 for perforce@freebsd.org; Mon, 28 Apr 2003 11:39:08 -0700 (PDT) Date: Mon, 28 Apr 2003 11:39:08 -0700 (PDT) Message-Id: <200304281839.h3SId8hs072118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29959 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: Mon, 28 Apr 2003 18:39:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=29959 Change 29959 by jmallett@jmallett_dalek on 2003/04/28 11:38:10 Pull in md_var and remove duplicraption of cpu_id/fpu_id. Affected files ... .. //depot/projects/mips/sys/mips/include/locore.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/locore.h#2 (text+ko) ==== @@ -26,6 +26,7 @@ #include #include +#include struct tlb; @@ -188,7 +189,6 @@ /* * CPU identification, from PRID register. */ -typedef int mips_prid_t; #define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff) #define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff) @@ -214,8 +214,6 @@ * such as cache size, from locore to higher-level code (e.g., pmap). */ -extern mips_prid_t cpu_id; -extern mips_prid_t fpu_id; extern int mips_num_tlb_entries; void mips_pagecopy(caddr_t dst, caddr_t src); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 11:39:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0456837B401; Mon, 28 Apr 2003 11:39:11 -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 4963337B41D for ; Mon, 28 Apr 2003 11:39:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCBD643F75 for ; Mon, 28 Apr 2003 11:39:09 -0700 (PDT) (envelope-from jmallett@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 h3SId90U072133 for ; Mon, 28 Apr 2003 11:39:09 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SId9i0072128 for perforce@freebsd.org; Mon, 28 Apr 2003 11:39:09 -0700 (PDT) Date: Mon, 28 Apr 2003 11:39:09 -0700 (PDT) Message-Id: <200304281839.h3SId9i0072128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29960 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: Mon, 28 Apr 2003 18:39:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=29960 Change 29960 by jmallett@jmallett_dalek on 2003/04/28 11:38:46 Genassym like crazy for our frames, etc. Affected files ... .. //depot/projects/mips/sys/mips/mips/genassym.c#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/genassym.c#4 (text+ko) ==== @@ -38,9 +38,124 @@ #include #include +#include + ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); + +ASSYM(FRAME_SIZ, sizeof(struct frame)); +ASSYM(FRAME_ZERO, offsetof(struct frame, f_regs[ZERO])); +ASSYM(FRAME_AST, offsetof(struct frame, f_regs[AST])); +ASSYM(FRAME_V0, offsetof(struct frame, f_regs[V0])); +ASSYM(FRAME_V1, offsetof(struct frame, f_regs[V1])); +ASSYM(FRAME_A0, offsetof(struct frame, f_regs[A0])); +ASSYM(FRAME_A1, offsetof(struct frame, f_regs[A1])); +ASSYM(FRAME_A2, offsetof(struct frame, f_regs[A2])); +ASSYM(FRAME_A3, offsetof(struct frame, f_regs[A3])); +ASSYM(FRAME_T0, offsetof(struct frame, f_regs[T0])); +ASSYM(FRAME_T1, offsetof(struct frame, f_regs[T1])); +ASSYM(FRAME_T2, offsetof(struct frame, f_regs[T2])); +ASSYM(FRAME_T3, offsetof(struct frame, f_regs[T3])); + +ASSYM(FRAME_TA0, offsetof(struct frame, f_regs[TA0])); +ASSYM(FRAME_TA1, offsetof(struct frame, f_regs[TA1])); +ASSYM(FRAME_TA2, offsetof(struct frame, f_regs[TA2])); +ASSYM(FRAME_TA3, offsetof(struct frame, f_regs[TA3])); + +ASSYM(FRAME_S0, offsetof(struct frame, f_regs[S0])); +ASSYM(FRAME_S1, offsetof(struct frame, f_regs[S1])); +ASSYM(FRAME_S2, offsetof(struct frame, f_regs[S2])); +ASSYM(FRAME_S3, offsetof(struct frame, f_regs[S3])); +ASSYM(FRAME_S4, offsetof(struct frame, f_regs[S4])); +ASSYM(FRAME_S5, offsetof(struct frame, f_regs[S5])); +ASSYM(FRAME_S6, offsetof(struct frame, f_regs[S6])); +ASSYM(FRAME_S7, offsetof(struct frame, f_regs[S7])); +ASSYM(FRAME_T8, offsetof(struct frame, f_regs[T8])); +ASSYM(FRAME_T9, offsetof(struct frame, f_regs[T9])); +ASSYM(FRAME_K0, offsetof(struct frame, f_regs[K0])); +ASSYM(FRAME_K1, offsetof(struct frame, f_regs[K1])); +ASSYM(FRAME_GP, offsetof(struct frame, f_regs[GP])); +ASSYM(FRAME_SP, offsetof(struct frame, f_regs[SP])); +ASSYM(FRAME_S8, offsetof(struct frame, f_regs[S8])); +ASSYM(FRAME_RA, offsetof(struct frame, f_regs[RA])); +ASSYM(FRAME_SR, offsetof(struct frame, f_regs[SR])); +ASSYM(FRAME_MULLO, offsetof(struct frame, f_regs[MULLO])); +ASSYM(FRAME_MULHI, offsetof(struct frame, f_regs[MULHI])); +ASSYM(FRAME_BADVADDR, offsetof(struct frame, f_regs[BADVADDR])); +ASSYM(FRAME_CAUSE, offsetof(struct frame, f_regs[CAUSE])); +ASSYM(FRAME_EPC, offsetof(struct frame, f_regs[PC])); +ASSYM(FRAME_PPL, offsetof(struct frame, f_ppl)); + +#if 0 +ASSYM(FRAME_FSR sizeof(mips_fpreg_t) * 32); +ASSYM(FRAME_FP0 sizeof(mips_fpreg_t) * 0); +ASSYM(FRAME_FP1 sizeof(mips_fpreg_t) * 1); +ASSYM(FRAME_FP2 sizeof(mips_fpreg_t) * 2); +ASSYM(FRAME_FP3 sizeof(mips_fpreg_t) * 3); +ASSYM(FRAME_FP4 sizeof(mips_fpreg_t) * 4); +ASSYM(FRAME_FP5 sizeof(mips_fpreg_t) * 5); +ASSYM(FRAME_FP6 sizeof(mips_fpreg_t) * 6); +ASSYM(FRAME_FP7 sizeof(mips_fpreg_t) * 7); +ASSYM(FRAME_FP8 sizeof(mips_fpreg_t) * 8); +ASSYM(FRAME_FP9 sizeof(mips_fpreg_t) * 9); +ASSYM(FRAME_FP10 sizeof(mips_fpreg_t) * 10); +ASSYM(FRAME_FP11 sizeof(mips_fpreg_t) * 11); +ASSYM(FRAME_FP12 sizeof(mips_fpreg_t) * 12); +ASSYM(FRAME_FP13 sizeof(mips_fpreg_t) * 13); +ASSYM(FRAME_FP14 sizeof(mips_fpreg_t) * 14); +ASSYM(FRAME_FP15 sizeof(mips_fpreg_t) * 15); +ASSYM(FRAME_FP16 sizeof(mips_fpreg_t) * 16); +ASSYM(FRAME_FP17 sizeof(mips_fpreg_t) * 17); +ASSYM(FRAME_FP18 sizeof(mips_fpreg_t) * 18); +ASSYM(FRAME_FP19 sizeof(mips_fpreg_t) * 19); +ASSYM(FRAME_FP20 sizeof(mips_fpreg_t) * 20); +ASSYM(FRAME_FP21 sizeof(mips_fpreg_t) * 21); +ASSYM(FRAME_FP22 sizeof(mips_fpreg_t) * 22); +ASSYM(FRAME_FP23 sizeof(mips_fpreg_t) * 23); +ASSYM(FRAME_FP24 sizeof(mips_fpreg_t) * 24); +ASSYM(FRAME_FP25 sizeof(mips_fpreg_t) * 25); +ASSYM(FRAME_FP26 sizeof(mips_fpreg_t) * 26); +ASSYM(FRAME_FP27 sizeof(mips_fpreg_t) * 27); +ASSYM(FRAME_FP28 sizeof(mips_fpreg_t) * 28); +ASSYM(FRAME_FP29 sizeof(mips_fpreg_t) * 29); +ASSYM(FRAME_FP30 sizeof(mips_fpreg_t) * 30); +ASSYM(FRAME_FP31 sizeof(mips_fpreg_t) * 31); +#endif + +ASSYM(KERNFRAME_SIZ, sizeof(struct kernframe)); +ASSYM(KERNFRAME_ARG5, offsetof(struct kernframe, cf_args[4])); +ASSYM(KERNFRAME_ARG6, offsetof(struct kernframe, cf_args[5])); +ASSYM(KERNFRAME_SP, offsetof(struct kernframe, cf_sp)); +ASSYM(KERNFRAME_RA, offsetof(struct kernframe, cf_ra)); + +ASSYM(TF_BASE, offsetof(struct kernframe, cf_frame)); + +ASSYM(TF_REG_AST, offsetof(struct trapframe, tf_regs[TF_AST])); +ASSYM(TF_REG_V0, offsetof(struct trapframe, tf_regs[TF_V0])); +ASSYM(TF_REG_V1, offsetof(struct trapframe, tf_regs[TF_V1])); +ASSYM(TF_REG_A0, offsetof(struct trapframe, tf_regs[TF_A0])); +ASSYM(TF_REG_A1, offsetof(struct trapframe, tf_regs[TF_A1])); +ASSYM(TF_REG_A2, offsetof(struct trapframe, tf_regs[TF_A2])); +ASSYM(TF_REG_A3, offsetof(struct trapframe, tf_regs[TF_A3])); +ASSYM(TF_REG_T0, offsetof(struct trapframe, tf_regs[TF_T0])); +ASSYM(TF_REG_T1, offsetof(struct trapframe, tf_regs[TF_T1])); +ASSYM(TF_REG_T2, offsetof(struct trapframe, tf_regs[TF_T2])); +ASSYM(TF_REG_T3, offsetof(struct trapframe, tf_regs[TF_T3])); + +ASSYM(TF_REG_TA0, offsetof(struct trapframe, tf_regs[TF_TA0])); +ASSYM(TF_REG_TA1, offsetof(struct trapframe, tf_regs[TF_TA1])); +ASSYM(TF_REG_TA2, offsetof(struct trapframe, tf_regs[TF_TA2])); +ASSYM(TF_REG_TA3, offsetof(struct trapframe, tf_regs[TF_TA3])); + +ASSYM(TF_REG_T8, offsetof(struct trapframe, tf_regs[TF_T8])); +ASSYM(TF_REG_T9, offsetof(struct trapframe, tf_regs[TF_T9])); +ASSYM(TF_REG_RA, offsetof(struct trapframe, tf_regs[TF_RA])); +ASSYM(TF_REG_SR, offsetof(struct trapframe, tf_regs[TF_SR])); +ASSYM(TF_REG_MULLO, offsetof(struct trapframe, tf_regs[TF_MULLO])); +ASSYM(TF_REG_MULHI, offsetof(struct trapframe, tf_regs[TF_MULHI])); +ASSYM(TF_REG_EPC, offsetof(struct trapframe, tf_regs[TF_EPC])); +ASSYM(TF_PPL, offsetof(struct trapframe, tf_ppl)); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 13:20:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80D6837B405; Mon, 28 Apr 2003 13:20:15 -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 2B7B037B401 for ; Mon, 28 Apr 2003 13:20:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EFBC43F3F for ; Mon, 28 Apr 2003 13:20:14 -0700 (PDT) (envelope-from marcel@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 h3SKKE0U051701 for ; Mon, 28 Apr 2003 13:20:14 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SKKEfq051697 for perforce@freebsd.org; Mon, 28 Apr 2003 13:20:14 -0700 (PDT) Date: Mon, 28 Apr 2003 13:20:14 -0700 (PDT) Message-Id: <200304282020.h3SKKEfq051697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29965 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: Mon, 28 Apr 2003 20:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=29965 Change 29965 by marcel@marcel_nfs on 2003/04/28 13:19:44 Print the RSDP revision. It's an important piece of information. Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#10 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#10 (text+ko) ==== @@ -486,8 +486,8 @@ printf(BEGIN_COMMENT); printf("RSD PTR: Checksum=%d, OEMID=", rp->sum); acpi_print_string(rp->oem, 6); - printf(", RsdtAddress=0x%08x, XsdtAddress=0x%016x\n", - rp->rsdt_addr, rp->xsdt_addr); + printf(", Revision=%u,\n\tRsdtAddress=0x%08x, XsdtAddress=0x%016x\n", + rp->revision, rp->rsdt_addr, rp->xsdt_addr); printf(END_COMMENT); } From owner-p4-projects@FreeBSD.ORG Mon Apr 28 13:39:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A11A37B404; Mon, 28 Apr 2003 13:39:40 -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 A8C0537B401 for ; Mon, 28 Apr 2003 13:39:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CFAC43FCB for ; Mon, 28 Apr 2003 13:39:39 -0700 (PDT) (envelope-from jmallett@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 h3SKdd0U065940 for ; Mon, 28 Apr 2003 13:39:39 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SKdc6B065934 for perforce@freebsd.org; Mon, 28 Apr 2003 13:39:38 -0700 (PDT) Date: Mon, 28 Apr 2003 13:39:38 -0700 (PDT) Message-Id: <200304282039.h3SKdc6B065934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29967 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: Mon, 28 Apr 2003 20:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=29967 Change 29967 by jmallett@jmallett_dalek on 2003/04/28 13:39:29 Drag in some cast-tacular constants. Affected files ... .. //depot/projects/mips/sys/mips/mips/genassym.c#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/genassym.c#5 (text+ko) ==== @@ -159,3 +159,10 @@ ASSYM(TF_REG_MULHI, offsetof(struct trapframe, tf_regs[TF_MULHI])); ASSYM(TF_REG_EPC, offsetof(struct trapframe, tf_regs[TF_EPC])); ASSYM(TF_PPL, offsetof(struct trapframe, tf_ppl)); + +ASSYM(VM_MIN_ADDRESS, VM_MIN_ADDRESS); +ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); +ASSYM(VM_MAX_ADDRESS, VM_MAX_ADDRESS); +ASSYM(VM_MIN_KERNEL_ADDRESS, VM_MIN_KERNEL_ADDRESS); +ASSYM(VM_MAX_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS); +ASSYM(KERNBASE, KERNBASE); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 13:40:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3EE437B404; Mon, 28 Apr 2003 13:40:41 -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 9A41437B401 for ; Mon, 28 Apr 2003 13:40:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F3B143F75 for ; Mon, 28 Apr 2003 13:40:41 -0700 (PDT) (envelope-from jmallett@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 h3SKef0U066583 for ; Mon, 28 Apr 2003 13:40:41 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SKee4c066575 for perforce@freebsd.org; Mon, 28 Apr 2003 13:40:40 -0700 (PDT) Date: Mon, 28 Apr 2003 13:40:40 -0700 (PDT) Message-Id: <200304282040.h3SKee4c066575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29968 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: Mon, 28 Apr 2003 20:40:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=29968 Change 29968 by jmallett@jmallett_dalek on 2003/04/28 13:40:25 MFNetBSD, new ABI register definitions. Hmm, I wonder if the compiler is defaulting to the right one though :) Affected files ... .. //depot/projects/mips/sys/mips/include/regdef.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/regdef.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: regdef.h,v 1.7 1999/03/30 14:22:58 soda Exp $ */ +/* $NetBSD: regdef.h,v 1.10 2002/11/04 03:38:32 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -50,14 +50,14 @@ #define a1 $5 #define a2 $6 #define a3 $7 -#define t0 $8 /* temp registers (not saved across subroutine calls) */ -#define t1 $9 -#define t2 $10 -#define t3 $11 -#define t4 $12 -#define t5 $13 -#define t6 $14 -#define t7 $15 +#define a4 $8 +#define a5 $9 +#define a6 $10 +#define a7 $11 +#define t0 $12 /* temp registers (not saved across subroutine calls) */ +#define t1 $13 +#define t2 $14 +#define t3 $15 #define s0 $16 /* saved across subroutine calls (callee saved) */ #define s1 $17 #define s2 $18 @@ -75,4 +75,17 @@ #define s8 $30 /* one more callee saved */ #define ra $31 /* return address */ +/* + * These are temp registers whose names can be used in either the old + * or new ABI, although they map to different physical registers. In + * the old ABI, they map to t4-t7, and in the new ABI, they map to a4-a7. + * + * Because they overlap with the last 4 arg regs in the new ABI, ta0-ta3 + * should be used only when we need more than t0-t3. + */ +#define ta0 $8 +#define ta1 $9 +#define ta2 $10 +#define ta3 $11 + #endif /* _MIPS_REGDEF_H */ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 13:45:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D714E37B404; Mon, 28 Apr 2003 13:45:51 -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 9FD6937B401 for ; Mon, 28 Apr 2003 13:45:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3399143F75 for ; Mon, 28 Apr 2003 13:45:51 -0700 (PDT) (envelope-from jmallett@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 h3SKjp0U071288 for ; Mon, 28 Apr 2003 13:45:51 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SKjowp071280 for perforce@freebsd.org; Mon, 28 Apr 2003 13:45:50 -0700 (PDT) Date: Mon, 28 Apr 2003 13:45:50 -0700 (PDT) Message-Id: <200304282045.h3SKjowp071280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29971 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: Mon, 28 Apr 2003 20:45:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=29971 Change 29971 by jmallett@jmallett_dalek on 2003/04/28 13:45:23 What was I thinking? Gut out NetBSD _C_LABEL crud. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#7 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#7 (text+ko) ==== @@ -120,13 +120,13 @@ */ #define PANIC(msg) \ la a0, 9f; \ - jal _C_LABEL(panic); \ + jal panic; \ nop; \ MSG(msg) #define PRINTF(msg) \ la a0, 9f; \ - jal _C_LABEL(printf); \ + jal printf; \ nop; \ MSG(msg) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 13:46:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C39D37B405; Mon, 28 Apr 2003 13:46:54 -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 B4DA137B401 for ; Mon, 28 Apr 2003 13:46:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E23343FB1 for ; Mon, 28 Apr 2003 13:46:53 -0700 (PDT) (envelope-from jmallett@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 h3SKkq0U072127 for ; Mon, 28 Apr 2003 13:46:52 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SKkqKe072122 for perforce@freebsd.org; Mon, 28 Apr 2003 13:46:52 -0700 (PDT) Date: Mon, 28 Apr 2003 13:46:52 -0700 (PDT) Message-Id: <200304282046.h3SKkqKe072122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29972 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: Mon, 28 Apr 2003 20:46:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=29972 Change 29972 by jmallett@jmallett_dalek on 2003/04/28 13:46:26 Register offsets in arrays of them all. Affected files ... .. //depot/projects/mips/sys/mips/include/regnum.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 14:01:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EE9B37B404; Mon, 28 Apr 2003 14:01:12 -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 1795C37B401 for ; Mon, 28 Apr 2003 14:01:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A140643F85 for ; Mon, 28 Apr 2003 14:01:11 -0700 (PDT) (envelope-from jmallett@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 h3SL1B0U081211 for ; Mon, 28 Apr 2003 14:01:11 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SL1Bqk081205 for perforce@freebsd.org; Mon, 28 Apr 2003 14:01:11 -0700 (PDT) Date: Mon, 28 Apr 2003 14:01:11 -0700 (PDT) Message-Id: <200304282101.h3SL1Bqk081205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29974 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: Mon, 28 Apr 2003 21:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=29974 Change 29974 by jmallett@jmallett_dalek on 2003/04/28 14:01:04 Add, but do not add to build, exception handlers. This assembles but does not link, because of LWP vs. KSE and the fact that cur* are not symbols. Most of it is pretty darn simple at this point. Note that like with most files, I gutted this down to the MIPS64 case. Affected files ... .. //depot/projects/mips/sys/mips/mips/mips_subr.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 14:03:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED64D37B401; Mon, 28 Apr 2003 14:03:15 -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 8A77D37B404 for ; Mon, 28 Apr 2003 14:03:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BACC243F85 for ; Mon, 28 Apr 2003 14:03:14 -0700 (PDT) (envelope-from marcel@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 h3SL3E0U083875 for ; Mon, 28 Apr 2003 14:03:14 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SL3Eep083867 for perforce@freebsd.org; Mon, 28 Apr 2003 14:03:14 -0700 (PDT) Date: Mon, 28 Apr 2003 14:03:14 -0700 (PDT) Message-Id: <200304282103.h3SL3Eep083867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 29975 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: Mon, 28 Apr 2003 21:03:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=29975 Change 29975 by marcel@marcel_nfs on 2003/04/28 14:02:44 Use the endian encoding/decoding functions to get 64-bit values out of the XSDT. They are very likely misaligned and handling of misaligned memory accesses by the kernel must not be depended upon. In other words: we coredump on ia64 because handling of unaligned memory access has a bug (a kernel from HEAD -- No EPC related fodder :-) This makes acpidump usable again on my bigsur. I can't recall having seen coredumps on pluto, which is where I would expect to see them... Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#11 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#11 (text+ko) ==== @@ -28,6 +28,7 @@ * $FreeBSD: src/usr.sbin/acpi/acpidump/acpi.c,v 1.7 2003/04/15 05:15:50 njl Exp $ */ +#include #include #include @@ -474,7 +475,7 @@ { struct ACPIsdt *sp; - sp = acpi_map_physical(pa, sizeof(struct ACPIsdt)); + sp = acpi_map_physical(pa, SIZEOF_SDT_HDR); sp = acpi_map_physical(pa, sp->len); return (sp); } @@ -506,7 +507,7 @@ if (p != (void*)rsdp->body) printf(", "); if (rsdp->signature[0] == 'X') { - printf("0x%016x", *((u_int64_t*)p)); + printf("0x%016x", le64dec(p)); p += sizeof(u_int64_t); } else { printf("0x%08x", *((u_int32_t*)p)); @@ -521,7 +522,7 @@ p = (void*)rsdp->body; while (p < end) { if (rsdp->signature[0] == 'X') { - sdp = acpi_map_sdt(*((u_int64_t*)p)); + sdp = acpi_map_sdt(le64dec(p)); p += sizeof(u_int64_t); } else { sdp = acpi_map_sdt(*((u_int32_t*)p)); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:46:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FB1037B404; Mon, 28 Apr 2003 15:46:25 -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 1483737B401 for ; Mon, 28 Apr 2003 15:46:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9542143FBD for ; Mon, 28 Apr 2003 15:46:24 -0700 (PDT) (envelope-from jmallett@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 h3SMkO0U060219 for ; Mon, 28 Apr 2003 15:46:24 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMkOtm060211 for perforce@freebsd.org; Mon, 28 Apr 2003 15:46:24 -0700 (PDT) Date: Mon, 28 Apr 2003 15:46:24 -0700 (PDT) Message-Id: <200304282246.h3SMkOtm060211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29982 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: Mon, 28 Apr 2003 22:46:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=29982 Change 29982 by jmallett@jmallett_dalek on 2003/04/28 15:46:15 Add mips_idle and mips_wait_idle as variants of mips_maybewait_idle. Some of the code is ifXXX and really needs written to work with FreeBSD. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#3 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#3 (text+ko) ==== @@ -94,6 +94,8 @@ #include #include +#include "assym.s" + /* * XXX We need a cleaner way of handling the instruction hazards of * the various processors. Here are the relevant rules for the QED 52XX: @@ -354,3 +356,94 @@ * saved in trap frames and restores. */ LEAF(mips_cp0_status_write) + +LEAF(mips_wait_idle) + j mips_maybewait_idle + li t1, 1 +END(mips_wait_idle) + +LEAF(mips_idle) + j mips_maybewait_idle + move t1, zero +END(mips_idle) + +/* + * mips_maybewait_idle: + * + * When no processes are on the runq, cpu_switch branches to + * idle to wait for something to come ready. + * + * NOTE: This is really part of cpu_switch(), but defined here + * for kernel profiling. + * + * This version takes advantage of power-saving features on + * the QED RM52xx family of CPUs, and MIPS32 & MIPS64 CPUs, + * if t1 is non-zero. + */ +LEAF(mips_maybewait_idle) + la t0, pcpup + sd zero, PC_CURTHREAD(t0) # set curthread NULL +#if defined(LOCKDEBUG) + jal sched_unlock_idle # release sched_lock + nop +#endif + li t0, (MIPS_INT_MASK | MIPS_SR_INT_IE) + DYNAMIC_STATUS_MASK(t0,t1) # machine dependent masking + mtc0 t0, MIPS_COP_0_STATUS # enable all interrupts + COP0_SYNC + nop + +#if XXX + /* Try to zero some free pages. */ + lw t0, uvm + UVM_PAGE_IDLE_ZERO + nop + beq t0, zero, 1f + nop + jal uvm_pageidlezero + nop +#endif +1: +#ifdef MIPS_DYNAMIC_STATUS_MASK + # Do this again since the mask may have changed. + li t3, (MIPS_INT_MASK | MIPS_SR_INT_IE) + DYNAMIC_STATUS_MASK(t3,t1) # machine dependent masking + mtc0 t3, MIPS_COP_0_STATUS # enable all interrupts + COP0_SYNC + nop +#endif +#if XXX + lw t0, sched_whichqs # look for non-empty queue + bne t0, zero, 1f + nop +#endif + beq t1, zero, 1b + nop + wait + nop + nop + nop + b 1b + nop +1: +#if defined(LOCKDEBUG) + mtc0 zero, MIPS_COP_0_STATUS # disable all interrupts + COP0_SYNC + nop + nop + nop + nop + jal _C_LABEL(sched_lock_idle) # acquire sched_lock + nop + la ra, cpu_switch_queuescan + j ra + nop +#else + mtc0 zero, MIPS_COP_0_STATUS # disable all interrupts + COP0_SYNC + nop + nop + nop + la ra, cpu_switch_queuescan + j ra + nop +END(mips_maybewait_idle) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:47:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D69BD37B405; Mon, 28 Apr 2003 15:47:27 -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 8512C37B401 for ; Mon, 28 Apr 2003 15:47:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78CF043FBD for ; Mon, 28 Apr 2003 15:47:26 -0700 (PDT) (envelope-from jmallett@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 h3SMlQ0U060799 for ; Mon, 28 Apr 2003 15:47:26 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMlPWu060794 for perforce@freebsd.org; Mon, 28 Apr 2003 15:47:25 -0700 (PDT) Date: Mon, 28 Apr 2003 15:47:25 -0700 (PDT) Message-Id: <200304282247.h3SMlPWu060794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29983 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: Mon, 28 Apr 2003 22:47:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=29983 Change 29983 by jmallett@jmallett_dalek on 2003/04/28 15:46:54 Add md fields.. Affected files ... .. //depot/projects/mips/sys/mips/include/proc.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/proc.h#2 (text+ko) ==== @@ -33,6 +33,9 @@ }; struct mdthread { + void *md_regs; /* registers on current frame */ + int md_flags; /* machine-dependent flags */ + int md_upte[UPAGES]; /* ptes for mapping u page */ }; #endif /* !_MACHINE_PROC_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:48:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170F137B404; Mon, 28 Apr 2003 15:48:29 -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 BD21937B401 for ; Mon, 28 Apr 2003 15:48:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D9743F93 for ; Mon, 28 Apr 2003 15:48:28 -0700 (PDT) (envelope-from jmallett@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 h3SMmS0U061261 for ; Mon, 28 Apr 2003 15:48:28 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMmRPA061255 for perforce@freebsd.org; Mon, 28 Apr 2003 15:48:27 -0700 (PDT) Date: Mon, 28 Apr 2003 15:48:27 -0700 (PDT) Message-Id: <200304282248.h3SMmRPA061255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29984 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: Mon, 28 Apr 2003 22:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=29984 Change 29984 by jmallett@jmallett_dalek on 2003/04/28 15:47:32 Use CALLFRAME_SIZ rather than CALLSTACK. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#4 (text+ko) ==== @@ -29,11 +29,6 @@ #include #include -/* - * XXX CALLSTACK size?? - */ -#define CALLSTACK 64 - .data /* * Dummy interrupt table to keep sysctl happy until @@ -69,7 +64,7 @@ # just use it. la t1, start bgt sp, t1, 1f - addu t2, t1, -CALLSTACK + addu t2, t1, -CALLFRAME_SIZ subu t0, t1, sp bgt t0, 4096, 1f nop From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:48:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DC8037B401; Mon, 28 Apr 2003 15:48: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 2CAC537B40B for ; Mon, 28 Apr 2003 15:48:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8D0F43F93 for ; Mon, 28 Apr 2003 15:48:28 -0700 (PDT) (envelope-from jmallett@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 h3SMmS0U061270 for ; Mon, 28 Apr 2003 15:48:28 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMmSBJ061265 for perforce@freebsd.org; Mon, 28 Apr 2003 15:48:28 -0700 (PDT) Date: Mon, 28 Apr 2003 15:48:28 -0700 (PDT) Message-Id: <200304282248.h3SMmSBJ061265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29985 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: Mon, 28 Apr 2003 22:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=29985 Change 29985 by jmallett@jmallett_dalek on 2003/04/28 15:48:15 Useful proc and thread fields. Affected files ... .. //depot/projects/mips/sys/mips/mips/genassym.c#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/genassym.c#6 (text+ko) ==== @@ -47,6 +47,19 @@ ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); +ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); + +ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); +ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); +ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); +ASSYM(TD_PROC, offsetof(struct thread, td_proc)); + +ASSYM(TD_MD_REGS, offsetof(struct thread, td_md.md_regs)); +ASSYM(TD_MD_UPTE_0, offsetof(struct thread, td_md.md_upte[0])); +ASSYM(TD_MD_UPTE_1, offsetof(struct thread, td_md.md_upte[1])); + +ASSYM(P_UAREA, offsetof(struct proc, p_uarea)); + ASSYM(FRAME_SIZ, sizeof(struct frame)); ASSYM(FRAME_ZERO, offsetof(struct frame, f_regs[ZERO])); ASSYM(FRAME_AST, offsetof(struct frame, f_regs[AST])); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:49:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BECB37B404; Mon, 28 Apr 2003 15:49:31 -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 23FF737B401 for ; Mon, 28 Apr 2003 15:49:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADD8443FAF for ; Mon, 28 Apr 2003 15:49:30 -0700 (PDT) (envelope-from jmallett@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 h3SMnU0U062090 for ; Mon, 28 Apr 2003 15:49:30 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMnU99062085 for perforce@freebsd.org; Mon, 28 Apr 2003 15:49:30 -0700 (PDT) Date: Mon, 28 Apr 2003 15:49:30 -0700 (PDT) Message-Id: <200304282249.h3SMnU99062085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29986 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: Mon, 28 Apr 2003 22:49:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=29986 Change 29986 by jmallett@jmallett_dalek on 2003/04/28 15:48:49 Add a panic-stub for cpu_intr. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#12 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#12 (text+ko) ==== @@ -144,3 +144,9 @@ pmap_bootstrap(); mips_init(); } + +void +cpu_intr(u_int32_t status, u_int32_t cause, u_int32_t pc, u_int32_t ipending) +{ + panic("interrupt!"); +} From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:54:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BCEA37B401; Mon, 28 Apr 2003 15:54:44 -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 CD96637B405 for ; Mon, 28 Apr 2003 15:54:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B36743F75 for ; Mon, 28 Apr 2003 15:54:40 -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 h3SMsd0U066098 for ; Mon, 28 Apr 2003 15:54:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMsawE066052 for perforce@freebsd.org; Mon, 28 Apr 2003 15:54:36 -0700 (PDT) Date: Mon, 28 Apr 2003 15:54:36 -0700 (PDT) Message-Id: <200304282254.h3SMsawE066052@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 29987 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: Mon, 28 Apr 2003 22:54:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=29987 Change 29987 by peter@peter_overcee on 2003/04/28 15:54:01 IFC @29986 Affected files ... .. //depot/projects/hammer/MAINTAINERS#7 integrate .. //depot/projects/hammer/UPDATING#8 integrate .. //depot/projects/hammer/bin/ls/ls.c#7 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#8 integrate .. //depot/projects/hammer/etc/etc.i386/rc.i386#2 integrate .. //depot/projects/hammer/etc/ftpusers#2 integrate .. //depot/projects/hammer/etc/group#3 integrate .. //depot/projects/hammer/etc/mail/aliases#4 integrate .. //depot/projects/hammer/etc/master.passwd#2 integrate .. //depot/projects/hammer/etc/rc#9 integrate .. //depot/projects/hammer/etc/rc.d/archdep#3 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#3 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/config.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/hammer/lib/Makefile#5 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/rfork_thread.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#2 integrate .. //depot/projects/hammer/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/vfork.2#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#3 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#4 integrate .. //depot/projects/hammer/lib/libstand/bzlib_private.h.diff#2 integrate .. //depot/projects/hammer/lib/libutil/login_class.3#3 integrate .. //depot/projects/hammer/libexec/Makefile#7 integrate .. //depot/projects/hammer/libexec/xtend/Makefile#2 delete .. //depot/projects/hammer/libexec/xtend/packet.c#2 delete .. //depot/projects/hammer/libexec/xtend/paths.h#2 delete .. //depot/projects/hammer/libexec/xtend/status.c#2 delete .. //depot/projects/hammer/libexec/xtend/user.c#2 delete .. //depot/projects/hammer/libexec/xtend/xten.h#2 delete .. //depot/projects/hammer/libexec/xtend/xtend.8#2 delete .. //depot/projects/hammer/libexec/xtend/xtend.c#2 delete .. //depot/projects/hammer/libexec/xtend/xtend.h#2 delete .. //depot/projects/hammer/release/Makefile#14 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#3 integrate .. //depot/projects/hammer/sbin/devd/devd.h#3 integrate .. //depot/projects/hammer/sbin/devd/devd.hh#1 branch .. //depot/projects/hammer/sbin/fsck/fsck.c#5 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#7 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/hammer/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#5 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#4 integrate .. //depot/projects/hammer/sbin/sysctl/pathconf.c#2 delete .. //depot/projects/hammer/share/examples/pppd/ppp.deny.sample#2 integrate .. //depot/projects/hammer/share/man/man4/asr.4#3 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pae.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/tw.4#2 delete .. //depot/projects/hammer/share/man/man4/md.4#3 integrate .. //depot/projects/hammer/share/man/man4/syscons.4#3 integrate .. //depot/projects/hammer/share/man/man7/firewall.7#4 integrate .. //depot/projects/hammer/share/man/man9/style.9#8 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#4 integrate .. //depot/projects/hammer/share/zoneinfo/antarctica#2 integrate .. //depot/projects/hammer/share/zoneinfo/asia#3 integrate .. //depot/projects/hammer/share/zoneinfo/australasia#3 integrate .. //depot/projects/hammer/share/zoneinfo/europe#2 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#2 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#3 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#10 integrate .. //depot/projects/hammer/sys/alpha/alpha/sys_machdep.c#4 integrate .. //depot/projects/hammer/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#4 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#7 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/hammer/sys/conf/files.i386#12 integrate .. //depot/projects/hammer/sys/conf/files.pc98#12 integrate .. //depot/projects/hammer/sys/conf/options#14 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_context.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_init.h#3 delete .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lists.h#3 delete .. //depot/projects/hammer/sys/dev/drm/drm_lock.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#6 integrate .. //depot/projects/hammer/sys/dev/en/midwayreg.h#2 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/hammer/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/hammer/sys/dev/iir/iir.c#4 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#2 integrate .. //depot/projects/hammer/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#8 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.c#4 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.h#4 integrate .. //depot/projects/hammer/sys/dev/pst/pst-pci.c#3 integrate .. //depot/projects/hammer/sys/dev/pst/pst-raid.c#7 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#6 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#5 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#13 integrate .. //depot/projects/hammer/sys/i386/conf/PAE#3 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/tw.c#4 delete .. //depot/projects/hammer/sys/ia64/ia32/ia32_proto.h#6 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_syscall.h#6 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysent.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#11 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_context.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#20 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/hammer/sys/modules/Makefile#14 integrate .. //depot/projects/hammer/sys/modules/en/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_ieee80211subr.c#2 integrate .. //depot/projects/hammer/sys/net/if_media.c#2 integrate .. //depot/projects/hammer/sys/net/if_media.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#12 integrate .. //depot/projects/hammer/sys/pci/if_en_pci.c#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/sys_machdep.c#3 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/sparc64/include/asm.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/asmacros.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/ktr.h#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/sys_machdep.c#3 integrate .. //depot/projects/hammer/sys/sys/limits.h#3 integrate .. //depot/projects/hammer/sys/sys/soundcard.h#3 integrate .. //depot/projects/hammer/sys/sys/ucontext.h#6 integrate .. //depot/projects/hammer/sys/sys/vnode.h#12 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#9 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#10 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#12 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#8 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#9 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#4 integrate .. //depot/projects/hammer/usr.bin/login/login.c#5 integrate .. //depot/projects/hammer/usr.sbin/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/chown/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/chown/chgrp.1#2 integrate .. //depot/projects/hammer/usr.sbin/chown/chown.8#3 integrate .. //depot/projects/hammer/usr.sbin/chown/chown.c#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcrom.c#3 delete .. //depot/projects/hammer/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#6 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#5 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate .. //depot/projects/hammer/usr.sbin/quot/quot.c#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.umntall/rpc.umntall.c#2 integrate .. //depot/projects/hammer/usr.sbin/xten/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/xten/README#2 delete .. //depot/projects/hammer/usr.sbin/xten/xten.1#2 delete .. //depot/projects/hammer/usr.sbin/xten/xten.c#2 delete Differences ... ==== //depot/projects/hammer/MAINTAINERS#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.59 2003/04/18 21:17:46 nectar Exp $ +$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ subsystem login notes ----------------------------- @@ -71,7 +71,6 @@ natd(8) ru Recommends pre-commit review. share/mk ru Recommends pre-commit review. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -xten imp Looking after it, don't remove, don't break it. drm anholt Just keep me informed of changes, try not to break it. regression jmallett Will help write new tests, etc. libufs jmallett Willing to handle problems, help with work. ==== //depot/projects/hammer/UPDATING#8 (text+ko) ==== @@ -17,6 +17,37 @@ developers choose to disable these features on build machines to maximize performance. +20030427: + The old rc system will soon be going away. If you have specified + rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and + test with the new rc system. Please report any problems to + freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + +20030423: + A bug has been fixed in /dev/devctl which would cause devd + to hang on boot, were it not for a workaround in devd. The + work around in devd will be removed around 20030507. You + have until then to upgrade your kernel before updating + userland. In general, you should have a userland and + kernel that's in sync with each other. However, given the + effects of this bug (hang on boot when starting devd), some + allowances are made. + +20030329: + Alphas with libc from between 20030312 and 20030329 exhibit + floating point exceptions (FPEs), most notably in awk(1) + while upgrading the system through a buildworld. + + So, to successfully upgrade your Alpha, you must either + downgrade your libc.so to a pre-20030312 version, or update + /usr/share/mk/bsd.cpu.mk to revision 1.26 which adds -mieee + to CFLAGS, then forcibly rebuild and install libc: + + cd /usr/src/lib/libc && \ + make cleandir && make obj && \ + make -DNOMAN -DNOPROFILE all && \ + make -DNOMAN -DNOPROFILE install + 20030208: sendmail 8.12.7 has been imported. It has one important change for IPv6 users. The default submit.mc now uses @@ -1234,4 +1265,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.245 2003/04/23 14:28:13 schweikh Exp $ +$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ ==== //depot/projects/hammer/bin/ls/ls.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.72 2002/12/18 21:05:15 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); #include #include @@ -732,7 +732,7 @@ mac_free(label); label_out: if (labelstr == NULL) - labelstr = strdup(""); + labelstr = strdup("-"); labelstrlen = strlen(labelstr); if (labelstrlen > maxlabelstr) maxlabelstr = labelstrlen; ==== //depot/projects/hammer/etc/defaults/rc.conf#8 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.172 2003/04/16 16:29:51 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -162,8 +162,6 @@ rarpd_flags="" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd -xtend_enable="NO" # Run the X-10 power controller daemon. -xtend_flags="" # Flags to xtend (if enabled). pppoed_enable="NO" # Run the PPP over Ethernet daemon. pppoed_provider="*" # Provider and ppp(8) config file entry. pppoed_flags="-P /var/run/pppoed.pid" # Flags to pppoed (if enabled). ==== //depot/projects/hammer/etc/etc.i386/rc.i386#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.58 2001/01/09 22:28:17 jhb Exp $ +# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.59 2003/04/27 05:49:53 imp Exp $ # Do i386 specific processing # @@ -45,10 +45,4 @@ ;; esac -case ${xtend_enable} in -[Yy][Ee][Ss]) - echo -n ' xtend'; /usr/libexec/xtend - ;; -esac - echo '.' ==== //depot/projects/hammer/etc/ftpusers#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.10 2002/06/28 15:46:26 maxim Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.11 2003/04/27 05:49:53 imp Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -15,7 +15,6 @@ sshd bind uucp -xten pop www nobody ==== //depot/projects/hammer/etc/group#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.27 2002/10/14 20:55:49 rwatson Exp $ +# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ # wheel:*:0:root daemon:*:1: @@ -18,7 +18,6 @@ guest:*:31: bind:*:53: uucp:*:66: -xten:*:67: dialer:*:68: network:*:69: www:*:80: ==== //depot/projects/hammer/etc/mail/aliases#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.18 2003/04/27 05:49:53 imp Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -41,7 +41,6 @@ tty: root usenet: news uucp: root -xten: root # Well-known aliases -- these should be filled in! # manager: ==== //depot/projects/hammer/etc/master.passwd#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.33 2002/06/23 20:46:44 des Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -15,7 +15,6 @@ mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin ==== //depot/projects/hammer/etc/rc#9 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.327 2003/04/23 15:38:02 matusita Exp $ +# $FreeBSD: src/etc/rc,v 1.328 2003/04/27 07:08:07 dougb Exp $ # # System startup script run by init on autoboot @@ -83,6 +83,15 @@ rc_ng=YES else rc_ng=NO + echo -n  ; sleep 1 ; echo -n  ; sleep 1 ; echo -n  + echo '' + echo '**** The old versions of the rc scripts are deprecated, and' + echo ' will soon be removed. Make sure to update /etc and' + echo ' check that rc_ng is YES in /etc/defaults/rc.conf.' + echo ' Please report any rc problems to freebsd-rc@yahoogroups.com' + echo ' and/or freebsd-current@freebsd.org.' + echo '' + sleep 3 fi case ${rc_ng} in ==== //depot/projects/hammer/etc/rc.d/archdep#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.3 2003/04/27 05:49:53 imp Exp $ # # PROVIDE: archdep @@ -53,22 +53,11 @@ fi } -# X-10 Daemon -# -x10_daemon() -{ - if checkyesno xtend_enable; then - echo -n ' xtend' - /usr/libexec/xtend - fi -} - _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in i386) ibcs2_compat - x10_daemon ;; alpha) osf1_compat ==== //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.3 2003/02/19 04:28:12 kan Exp $ +// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $ // Predefined symbols and macros -*- C++ -*- @@ -101,7 +101,7 @@ #define _GLIBCPP_USE_LONG_LONG 1 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed. -/* #undef _GLIBCPP_USE_C99 */ +#define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. /* #undef _GLIBCPP_USE_WCHAR_T */ @@ -649,10 +649,10 @@ /* #undef _GLIBCPP_HAVE_SQRTL */ /* Define if you have the strtof function. */ -/* #undef _GLIBCPP_HAVE_STRTOF */ +#define _GLIBCPP_HAVE_STRTOF 1 /* Define if you have the strtold function. */ -/* #undef _GLIBCPP_HAVE_STRTOLD */ +#define _GLIBCPP_HAVE_STRTOLD 1 /* Define if you have the swprintf function. */ #define _GLIBCPP_HAVE_SWPRINTF 1 @@ -748,7 +748,7 @@ #define _GLIBCPP_HAVE_WCSTOD 1 /* Define if you have the wcstof function. */ -/* #undef _GLIBCPP_HAVE_WCSTOF */ +#define _GLIBCPP_HAVE_WCSTOF 1 /* Define if you have the wcstok function. */ #define _GLIBCPP_HAVE_WCSTOK 1 @@ -832,7 +832,7 @@ #define _GLIBCPP_HAVE_SYS_RESOURCE_H 1 /* Define if you have the header file. */ -/* #undef _GLIBCPP_HAVE_SYS_STAT_H */ +#define _GLIBCPP_HAVE_SYS_STAT_H 1 /* Define if you have the header file. */ #define _GLIBCPP_HAVE_SYS_TYPES_H 1 ==== //depot/projects/hammer/gnu/lib/libstdc++/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.4 2003/02/19 04:28:12 kan Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -13,7 +13,7 @@ #define _GLIBCPP_USE_LONG_LONG 1 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed. -/* #undef _GLIBCPP_USE_C99 */ +#define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. /* #undef _GLIBCPP_USE_WCHAR_T */ @@ -561,10 +561,10 @@ /* #undef HAVE_SQRTL */ /* Define if you have the strtof function. */ -/* #undef HAVE_STRTOF */ +#define HAVE_STRTOF 1 /* Define if you have the strtold function. */ -/* #undef HAVE_STRTOLD */ +#define HAVE_STRTOLD 1 /* Define if you have the swprintf function. */ #define HAVE_SWPRINTF 1 @@ -660,7 +660,7 @@ #define HAVE_WCSTOD 1 /* Define if you have the wcstof function. */ -/* #undef HAVE_WCSTOF */ +#define HAVE_WCSTOF 1 /* Define if you have the wcstok function. */ #define HAVE_WCSTOK 1 ==== //depot/projects/hammer/gnu/usr.bin/Makefile#4 (text+ko) ==== @@ -1,13 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.74 2003/02/24 02:40:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.75 2003/04/27 20:14:05 obrien Exp $ -.if ${MACHINE_ARCH} != "powerpc" -_gperf=gperf -.endif - SUBDIR= bc binutils cc cpio dc dialog diff diff3 \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo .if !defined(NO_CXX) +.if ${MACHINE_ARCH} != "powerpc" +_gperf=gperf +.endif SUBDIR+=groff .endif ==== //depot/projects/hammer/lib/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.150 2003/03/08 11:01:31 markm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -27,7 +27,7 @@ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ - libnetgraph libopie libpam libpanel libpcap \ + libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz @@ -60,6 +60,9 @@ _libncp= libncp _libsmb= libsmb _libvgl= libvgl +.if !defined(NOLIBPTHREAD) +_libpthread= libpthread +.endif .endif .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/hammer/lib/libc/gen/getgrent.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.28 2003/04/22 22:19:05 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $"); #include "namespace.h" #include @@ -819,9 +819,31 @@ static int compat_setgrent(void *retval, void *mdata, va_list ap) { + static const ns_src compatsrc[] = { +#ifdef YP + { NSSRC_NIS, NS_SUCCESS }, +#endif + { NULL, 0 } + }; + ns_dtab dtab[] = { +#ifdef HESIOD + { NSSRC_DNS, dns_setgrent, NULL }, +#endif +#ifdef YP + { NSSRC_NIS, nis_setgrent, NULL }, +#endif + { NULL, NULL, NULL } + }; struct compat_state *st; int rv, stayopen; +#define set_setent(x, y) do { \ + int i; \ + \ + for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++) \ + x[i].mdata = (void *)y; \ +} while (0) + rv = compat_getstate(&st); if (rv != 0) return (NS_UNAVAIL); @@ -832,12 +854,18 @@ rewind(st->fp); else if (stayopen) st->fp = fopen(_PATH_GROUP, "r"); + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent", + compatsrc, 0); break; case ENDGRENT: if (st->fp != NULL) { fclose(st->fp); st->fp = NULL; } + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent", + compatsrc, 0); break; default: break; @@ -846,6 +874,7 @@ free(st->name); st->name = NULL; return (NS_UNAVAIL); +#undef set_setent } ==== //depot/projects/hammer/lib/libc/gen/getpwent.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.77 2003/04/21 13:57:58 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.79 2003/04/25 18:25:19 nectar Exp $"); #include "namespace.h" #include @@ -1321,6 +1321,7 @@ for (i = 0; i < sizeof(dtab)/sizeof(dtab[0]) - 1; i++) dtab[i].mdata = (void *)lookup_how; more: + pwd_init(pwd); switch (lookup_how) { case nss_lt_all: rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT, @@ -1391,9 +1392,31 @@ static int compat_setpwent(void *retval, void *mdata, va_list ap) { + static const ns_src compatsrc[] = { +#ifdef YP + { NSSRC_NIS, NS_SUCCESS }, +#endif + { NULL, 0 } + }; + ns_dtab dtab[] = { +#ifdef YP + { NSSRC_NIS, nis_setpwent, NULL }, +#endif +#ifdef HESIOD + { NSSRC_DNS, dns_setpwent, NULL }, +#endif + { NULL, NULL, NULL } + }; struct compat_state *st; int rv, stayopen; +#define set_setent(x, y) do { \ + int i; \ + \ + for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++) \ + x[i].mdata = (void *)y; \ +} while (0) + rv = compat_getstate(&st); if (rv != 0) return (NS_UNAVAIL); @@ -1404,17 +1427,24 @@ if (stayopen) st->db = pwdbopen(&st->version); st->stayopen = stayopen; + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent", + compatsrc, 0); break; case ENDPWENT: if (st->db != NULL) { (void)st->db->close(st->db); st->db = NULL; } + set_setent(dtab, mdata); + (void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent", + compatsrc, 0); break; default: break; } return (NS_UNAVAIL); +#undef set_setent } ==== //depot/projects/hammer/lib/libc/gen/rfork_thread.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.6 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.7 2003/04/27 21:07:27 robert Exp $ .\" .Dd July 29, 2000 .Dt RFORK_THREAD 3 @@ -35,7 +35,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork_thread "int flags" "void *stack" "int (*func)(void *arg)" "void *arg" .Sh DESCRIPTION The ==== //depot/projects/hammer/lib/libc/posix1e/mac.conf.5#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.2 2003/04/20 04:43:56 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac.conf.5,v 1.3 2003/04/26 03:32:18 rwatson Exp $ .\" .Dd April 19, 2003 .Dt MAC.CONF 5 @@ -74,6 +74,7 @@ default_ifnet_labels ?biba,?mls,?sebsd default_process_labels ?biba,?mls,partition,?sebsd .Ed +.Pp In this example, userland applications will attempt to retrieve Biba, MLS, and SEBSD labels for all object classes; for processes, they will additionally attempt to retrieve a Partition identifier. ==== //depot/projects/hammer/lib/libc/sys/rfork.2#3 (text+ko) ==== @@ -3,7 +3,7 @@ .\" describe the actual BSD implementation. Permission for .\" use of this page comes from Rob Pike . .\" -.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.30 2003/02/23 01:47:48 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.31 2003/04/27 21:01:34 robert Exp $ .\" .Dd January 31, 2003 .Dt RFORK 2 @@ -15,7 +15,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork "int flags" .Sh DESCRIPTION Forking, vforking or rforking are the only ways new processes are created. ==== //depot/projects/hammer/lib/libc/sys/vfork.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.21 2002/12/27 12:15:29 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.22 2003/04/27 21:01:34 robert Exp $ .\" .Dd June 4, 1993 .Dt VFORK 2 @@ -42,7 +42,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn vfork void .Sh DESCRIPTION The ==== //depot/projects/hammer/lib/libkvm/kvm_getprocs.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kvm_getprocs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.13 2003/03/24 15:58:53 charnier Exp $ +.\" $FreeBSD: src/lib/libkvm/kvm_getprocs.3,v 1.14 2003/04/26 15:00:57 trhodes Exp $ .\" .Dd June 4, 1993 .Dt KVM_GETPROCS 3 @@ -50,6 +50,7 @@ .In kvm.h .In sys/param.h .In sys/sysctl.h +.In sys/user.h .\" .Fa kvm_t *kd .Ft struct kinfo_proc * .Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt" ==== //depot/projects/hammer/lib/libpthread/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.40 2003/04/23 21:48:29 deischen Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.41 2003/04/25 01:31:56 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -7,7 +7,7 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -LIB=pthread +LIB=kse SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ @@ -20,17 +20,12 @@ CFLAGS+=-D_LOCK_DEBUG #CFLAGS+= -g -#.if ${MACHINE_ARCH} == "i386" -#CFLAGS+=-DGS_HACK -#.endif - # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -Wall AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes -#.include "${.CURDIR}/man/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.46 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.47 2003/04/28 21:35:06 deischen Exp $ */ #include #include @@ -258,7 +258,7 @@ thr_sig_find(struct kse *curkse, int sig, siginfo_t *info) { int handler_installed; - struct pthread *pthread, *pthread_next; + struct pthread *pthread; struct pthread *suspended_thread, *signaled_thread; DBG_MSG("Looking for thread to handle signal %d\n", sig); @@ -285,14 +285,7 @@ signaled_thread = NULL; KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); - for (pthread = TAILQ_FIRST(&_thread_list); - pthread != NULL; pthread = pthread_next) { - /* - * Grab the next thread before possibly destroying - * the link entry. - */ - pthread_next = TAILQ_NEXT(pthread, pqe); - + TAILQ_FOREACH(pthread, &_thread_list, tle) { if ((pthread->state == PS_SIGWAIT) && sigismember(pthread->data.sigwait, sig)) { /* Take the scheduling lock. */ ==== //depot/projects/hammer/lib/libstand/bzlib_private.h.diff#2 (text+ko) ==== @@ -1,7 +1,16 @@ -$FreeBSD: src/lib/libstand/bzlib_private.h.diff,v 1.1 2002/02/01 16:33:40 sobomax Exp $ +$FreeBSD: src/lib/libstand/bzlib_private.h.diff,v 1.2 2003/04/25 06:44:56 ru Exp $ ---- bzlib_private.h 2002/02/01 15:41:26 1.1 -+++ bzlib_private.h 2002/02/01 15:41:46 +--- bzlib_private.h 1 Feb 2002 16:26:19 -0000 1.1.1.2 ++++ bzlib_private.h 25 Apr 2003 03:55:07 -0000 +@@ -62,7 +62,7 @@ + #ifndef _BZLIB_PRIVATE_H + #define _BZLIB_PRIVATE_H + +-#include ++#include "stand.h" + + #ifndef BZ_NO_STDIO + #include @@ -70,7 +70,7 @@ #include #endif ==== //depot/projects/hammer/lib/libutil/login_class.3#3 (text+ko) ==== @@ -17,7 +17,7 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.14 2003/03/24 15:55:03 charnier Exp $ +.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.16 2003/04/26 15:18:27 trhodes Exp $ .\" .Dd December 28, 1996 .Os @@ -112,6 +112,7 @@ maxproc RLIMIT_NPROC >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 28 15:59:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A19B837B404; Mon, 28 Apr 2003 15:59:47 -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 532B637B401 for ; Mon, 28 Apr 2003 15:59:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F207743FB1 for ; Mon, 28 Apr 2003 15:59:46 -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 h3SMxk0U069328 for ; Mon, 28 Apr 2003 15:59:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SMxk9t069322 for perforce@freebsd.org; Mon, 28 Apr 2003 15:59:46 -0700 (PDT) Date: Mon, 28 Apr 2003 15:59:46 -0700 (PDT) Message-Id: <200304282259.h3SMxk9t069322@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 29988 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: Mon, 28 Apr 2003 22:59:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=29988 Change 29988 by peter@peter_daintree on 2003/04/28 15:59:08 keep these in sync Affected files ... .. //depot/projects/hammer/lib/libc/amd64/sys/Ovfork.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#2 integrate Differences ... ==== //depot/projects/hammer/lib/libc/amd64/sys/Ovfork.S#2 (text+ko) ==== @@ -47,11 +47,11 @@ .weak vfork .set vfork,__sys_vfork ENTRY(__sys_vfork) - popq %rcx /* my rta into ecx */ + popq %rsi /* fetch return address (%rsi preserved) */ mov $SYS_vfork,%rax KERNCALL jb 1f - jmp *%rcx + jmp *%rsi 1: pushq %rcx jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#2 (text+ko) ==== @@ -42,9 +42,20 @@ #include "SYS.h" -SYSCALL(pipe) - movq 8(%rsp),%rcx /* XXX wrong!! %rdi!! */ - movq %rax,(%rcx) - movq %rdx,8(%rcx) + .weak _pipe + .set _pipe,__sys_pipe + .weak pipe + .set pipe,__sys_pipe +ENTRY(__sys_pipe) + pushq %rdi + mov $SYS_pipe,%rax + KERNCALL + jb 1f + popq %rcx + movl %eax,(%rcx) + movl %edx,4(%rcx) movq $0,%rax ret +1: + popq %rdi + jmp PIC_PLT(HIDENAME(cerror)) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:02:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32AD037B404; Mon, 28 Apr 2003 16:02:52 -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 C357B37B401 for ; Mon, 28 Apr 2003 16:02:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B03343F75 for ; Mon, 28 Apr 2003 16:02:51 -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 h3SN2p0U071537 for ; Mon, 28 Apr 2003 16:02:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN2o2b071528 for perforce@freebsd.org; Mon, 28 Apr 2003 16:02:50 -0700 (PDT) Date: Mon, 28 Apr 2003 16:02:50 -0700 (PDT) Message-Id: <200304282302.h3SN2o2b071528@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 29989 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: Mon, 28 Apr 2003 23:02:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=29989 Change 29989 by peter@peter_daintree on 2003/04/28 16:02:46 add prototype files for make distribution Affected files ... .. //depot/projects/hammer/etc/etc.amd64/rc.amd64#1 add .. //depot/projects/hammer/etc/etc.amd64/ttys#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:03:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0826837B404; Mon, 28 Apr 2003 16:03:54 -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 9595B37B401 for ; Mon, 28 Apr 2003 16:03:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C77A43FAF for ; Mon, 28 Apr 2003 16:03:53 -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 h3SN3r0U073371 for ; Mon, 28 Apr 2003 16:03:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN3qCP073363 for perforce@freebsd.org; Mon, 28 Apr 2003 16:03:52 -0700 (PDT) Date: Mon, 28 Apr 2003 16:03:52 -0700 (PDT) Message-Id: <200304282303.h3SN3qCP073363@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 29990 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: Mon, 28 Apr 2003 23:03:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=29990 Change 29990 by peter@peter_daintree on 2003/04/28 16:03:37 Use the one-true-name Affected files ... .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:04:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC12D37B404; Mon, 28 Apr 2003 16:04:55 -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 7DF8637B401 for ; Mon, 28 Apr 2003 16:04:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1441E43F3F for ; Mon, 28 Apr 2003 16:04:55 -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 h3SN4s0U074264 for ; Mon, 28 Apr 2003 16:04:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN4stJ074259 for perforce@freebsd.org; Mon, 28 Apr 2003 16:04:54 -0700 (PDT) Date: Mon, 28 Apr 2003 16:04:54 -0700 (PDT) Message-Id: <200304282304.h3SN4stJ074259@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 29991 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: Mon, 28 Apr 2003 23:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=29991 Change 29991 by peter@peter_daintree on 2003/04/28 16:04:19 Use the one-true-name Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/amd64/Makefile.inc#1 branch .. //depot/projects/hammer/libexec/rtld-elf/amd64/elf_rtld.x#1 branch .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#1 branch .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#1 branch .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#1 branch .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:04:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79CD637B404; Mon, 28 Apr 2003 16:04:57 -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 024F237B411 for ; Mon, 28 Apr 2003 16:04:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B87943F3F for ; Mon, 28 Apr 2003 16:04:55 -0700 (PDT) (envelope-from jmallett@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 h3SN4t0U074272 for ; Mon, 28 Apr 2003 16:04:55 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN4tUN074267 for perforce@freebsd.org; Mon, 28 Apr 2003 16:04:55 -0700 (PDT) Date: Mon, 28 Apr 2003 16:04:55 -0700 (PDT) Message-Id: <200304282304.h3SN4tUN074267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29992 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: Mon, 28 Apr 2003 23:04:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=29992 Change 29992 by jmallett@jmallett_dalek on 2003/04/28 16:04:31 Add endif. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#4 (text+ko) ==== @@ -446,4 +446,5 @@ la ra, cpu_switch_queuescan j ra nop +#endif END(mips_maybewait_idle) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:07:00 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C2FB37B404; Mon, 28 Apr 2003 16:06:59 -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 1F66F37B401 for ; Mon, 28 Apr 2003 16:06:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA88143F93 for ; Mon, 28 Apr 2003 16:06:58 -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 h3SN6w0U076004 for ; Mon, 28 Apr 2003 16:06:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN6wLD075996 for perforce@freebsd.org; Mon, 28 Apr 2003 16:06:58 -0700 (PDT) Date: Mon, 28 Apr 2003 16:06:58 -0700 (PDT) Message-Id: <200304282306.h3SN6wLD075996@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 29993 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: Mon, 28 Apr 2003 23:07:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=29993 Change 29993 by peter@peter_daintree on 2003/04/28 16:06:27 add symlinks for amd64 name Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.amd64#1 add .. //depot/projects/hammer/sys/conf/files.amd64#1 add .. //depot/projects/hammer/sys/conf/ldscript.amd64#1 add .. //depot/projects/hammer/sys/conf/options.amd64#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:08:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FEF437B405; Mon, 28 Apr 2003 16:08:01 -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 5386437B401 for ; Mon, 28 Apr 2003 16:08:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92E7E43FA3 for ; Mon, 28 Apr 2003 16:08:00 -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 h3SN800U076662 for ; Mon, 28 Apr 2003 16:08:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN80Rt076658 for perforce@freebsd.org; Mon, 28 Apr 2003 16:08:00 -0700 (PDT) Date: Mon, 28 Apr 2003 16:08:00 -0700 (PDT) Message-Id: <200304282308.h3SN80Rt076658@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 29994 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: Mon, 28 Apr 2003 23:08:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=29994 Change 29994 by peter@peter_daintree on 2003/04/28 16:07:05 add symlink for sys/amd64/... Affected files ... .. //depot/projects/hammer/sys/amd64#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:08:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03EC437B405; Mon, 28 Apr 2003 16:08:03 -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 E43F937B408 for ; Mon, 28 Apr 2003 16:08:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B50343FD7 for ; Mon, 28 Apr 2003 16:08:01 -0700 (PDT) (envelope-from jmallett@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 h3SN800U076671 for ; Mon, 28 Apr 2003 16:08:00 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN80mE076667 for perforce@freebsd.org; Mon, 28 Apr 2003 16:08:00 -0700 (PDT) Date: Mon, 28 Apr 2003 16:08:00 -0700 (PDT) Message-Id: <200304282308.h3SN80mE076667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29995 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: Mon, 28 Apr 2003 23:08:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=29995 Change 29995 by jmallett@jmallett_dalek on 2003/04/28 16:07:25 Missed some ifXXX that we need. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#5 (text+ko) ==== @@ -434,17 +434,21 @@ nop jal _C_LABEL(sched_lock_idle) # acquire sched_lock nop +#if XXX la ra, cpu_switch_queuescan j ra nop +#endif #else mtc0 zero, MIPS_COP_0_STATUS # disable all interrupts COP0_SYNC nop nop nop +#if XXX la ra, cpu_switch_queuescan j ra nop #endif +#endif END(mips_maybewait_idle) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:08:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EBC037B409; Mon, 28 Apr 2003 16:08:03 -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 0FE0937B41D for ; Mon, 28 Apr 2003 16:08:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7140043FA3 for ; Mon, 28 Apr 2003 16:08:01 -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 h3SN810U076680 for ; Mon, 28 Apr 2003 16:08:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SN817E076675 for perforce@freebsd.org; Mon, 28 Apr 2003 16:08:01 -0700 (PDT) Date: Mon, 28 Apr 2003 16:08:01 -0700 (PDT) Message-Id: <200304282308.h3SN817E076675@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 29996 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: Mon, 28 Apr 2003 23:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=29996 Change 29996 by peter@peter_daintree on 2003/04/28 16:07:31 add symlink so sys/amd64/amd64/* works Affected files ... .. //depot/projects/hammer/sys/x86_64/amd64#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:11:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF24837B405; Mon, 28 Apr 2003 16:11:07 -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 9317D37B401 for ; Mon, 28 Apr 2003 16:11:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3D5143FEC for ; Mon, 28 Apr 2003 16:11:06 -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 h3SNB50U078244 for ; Mon, 28 Apr 2003 16:11:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNB5Z1078237 for perforce@freebsd.org; Mon, 28 Apr 2003 16:11:05 -0700 (PDT) Date: Mon, 28 Apr 2003 16:11:05 -0700 (PDT) Message-Id: <200304282311.h3SNB5Z1078237@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 29997 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: Mon, 28 Apr 2003 23:11:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=29997 Change 29997 by peter@peter_daintree on 2003/04/28 16:10:31 s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/conf/files.x86_64#18 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.x86_64#18 (text+ko) ==== @@ -31,38 +31,38 @@ dev/syscons/sysmouse.c optional sc isa/atkbd_isa.c optional atkbd -x86_64/x86_64/autoconf.c standard -x86_64/x86_64/busdma_machdep.c standard -x86_64/x86_64/critical.c standard -x86_64/x86_64/dump_machdep.c standard -x86_64/x86_64/elf_machdep.c standard -x86_64/x86_64/exception.s standard -x86_64/x86_64/identcpu.c standard -x86_64/x86_64/initcpu.c standard -x86_64/x86_64/legacy.c standard -x86_64/x86_64/locore.s standard no-obj -x86_64/x86_64/machdep.c standard -x86_64/x86_64/mem.c standard -x86_64/x86_64/nexus.c standard -x86_64/x86_64/pmap.c standard -x86_64/x86_64/sigtramp.s standard -x86_64/x86_64/support.s standard -x86_64/x86_64/swtch.s standard -x86_64/x86_64/sys_machdep.c standard -x86_64/x86_64/trap.c standard -x86_64/x86_64/tsc.c standard -x86_64/x86_64/vm_machdep.c standard -x86_64/x86_64/in_cksum.c optional inet +amd64/amd64/autoconf.c standard +amd64/amd64/busdma_machdep.c standard +amd64/amd64/critical.c standard +amd64/amd64/dump_machdep.c standard +amd64/amd64/elf_machdep.c standard +amd64/amd64/exception.s standard +amd64/amd64/identcpu.c standard +amd64/amd64/initcpu.c standard +amd64/amd64/legacy.c standard +amd64/amd64/locore.s standard no-obj +amd64/amd64/machdep.c standard +amd64/amd64/mem.c standard +amd64/amd64/nexus.c standard +amd64/amd64/pmap.c standard +amd64/amd64/sigtramp.s standard +amd64/amd64/support.s standard +amd64/amd64/swtch.s standard +amd64/amd64/sys_machdep.c standard +amd64/amd64/trap.c standard +amd64/amd64/tsc.c standard +amd64/amd64/vm_machdep.c standard +amd64/amd64/in_cksum.c optional inet -x86_64/isa/clock.c standard -x86_64/isa/intr_machdep.c standard -x86_64/isa/isa.c standard -x86_64/isa/isa_dma.c standard -x86_64/isa/ithread.c standard -x86_64/isa/npx.c standard +amd64/isa/clock.c standard +amd64/isa/intr_machdep.c standard +amd64/isa/isa.c standard +amd64/isa/isa_dma.c standard +amd64/isa/ithread.c standard +amd64/isa/npx.c standard -x86_64/pci/pci_cfgreg.c optional pci -x86_64/pci/pci_bus.c optional pci +amd64/pci/pci_cfgreg.c optional pci +amd64/pci/pci_bus.c optional pci From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:12:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C68137B404; Mon, 28 Apr 2003 16:12:08 -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 2F9EC37B401 for ; Mon, 28 Apr 2003 16:12:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB55C43FB1 for ; Mon, 28 Apr 2003 16:12:07 -0700 (PDT) (envelope-from jmallett@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 h3SNC70U079122 for ; Mon, 28 Apr 2003 16:12:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNC7qD079116 for perforce@freebsd.org; Mon, 28 Apr 2003 16:12:07 -0700 (PDT) Date: Mon, 28 Apr 2003 16:12:07 -0700 (PDT) Message-Id: <200304282312.h3SNC7qD079116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29998 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: Mon, 28 Apr 2003 23:12:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=29998 Change 29998 by jmallett@jmallett_dalek on 2003/04/28 16:11:32 Stub syscall and trap handlers. Affected files ... .. //depot/projects/mips/sys/mips/mips/syscall.c#1 add .. //depot/projects/mips/sys/mips/mips/trap.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:12:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CB6D37B401; Mon, 28 Apr 2003 16:12:09 -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 B05B437B412 for ; Mon, 28 Apr 2003 16:12:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AC4643FB1 for ; Mon, 28 Apr 2003 16:12:08 -0700 (PDT) (envelope-from jmallett@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 h3SNC80U079135 for ; Mon, 28 Apr 2003 16:12:08 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNC7Jr079126 for perforce@freebsd.org; Mon, 28 Apr 2003 16:12:07 -0700 (PDT) Date: Mon, 28 Apr 2003 16:12:07 -0700 (PDT) Message-Id: <200304282312.h3SNC7Jr079126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 29999 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: Mon, 28 Apr 2003 23:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=29999 Change 29999 by jmallett@jmallett_dalek on 2003/04/28 16:11:47 Add segment base. Affected files ... .. //depot/projects/mips/sys/mips/include/pmap.h#7 edit Differences ... ==== //depot/projects/mips/sys/mips/include/pmap.h#7 (text+ko) ==== @@ -29,9 +29,17 @@ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ +#include + struct md_page { }; +#define PMAP_SEGTABSIZE 512 + +struct segtab { + union pt_entry *seg_tab[PMAP_SEGTABSIZE]; +}; + struct pmap { struct pmap_statistics pm_stats; int pm_asid; @@ -46,6 +54,7 @@ extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; +extern struct segtab *segbase; void pmap_bootstrap(void); vm_offset_t pmap_kextract(vm_offset_t); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:13:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA1FC37B405; Mon, 28 Apr 2003 16:13:11 -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 4F85037B401 for ; Mon, 28 Apr 2003 16:13:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE33643F93 for ; Mon, 28 Apr 2003 16:13:10 -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 h3SNDA0U079918 for ; Mon, 28 Apr 2003 16:13:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNDApM079911 for perforce@freebsd.org; Mon, 28 Apr 2003 16:13:10 -0700 (PDT) Date: Mon, 28 Apr 2003 16:13:10 -0700 (PDT) Message-Id: <200304282313.h3SNDApM079911@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 30001 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: Mon, 28 Apr 2003 23:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=30001 Change 30001 by peter@peter_daintree on 2003/04/28 16:12:16 add -D__amd64__ Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#11 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#11 (text+ko) ==== @@ -21,7 +21,7 @@ CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -ffreestanding -Wno-format -Wno-sign-compare -CC= x86_64-unknown-freebsd5.0-gcc +CC= x86_64-unknown-freebsd5.0-gcc -D__amd64__ LD= x86_64-unknown-freebsd5.0-ld NM= x86_64-unknown-freebsd5.0-nm SIZE= x86_64-unknown-freebsd5.0-size From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:13:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E9737B407; Mon, 28 Apr 2003 16:13:12 -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 6947037B404 for ; Mon, 28 Apr 2003 16:13:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64A6D43FAF for ; Mon, 28 Apr 2003 16:13:10 -0700 (PDT) (envelope-from jmallett@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 h3SNDA0U079905 for ; Mon, 28 Apr 2003 16:13:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SND9x8079897 for perforce@freebsd.org; Mon, 28 Apr 2003 16:13:09 -0700 (PDT) Date: Mon, 28 Apr 2003 16:13:09 -0700 (PDT) Message-Id: <200304282313.h3SND9x8079897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30000 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: Mon, 28 Apr 2003 23:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=30000 Change 30000 by jmallett@jmallett_dalek on 2003/04/28 16:12:08 Add mips_subr and requirements to link. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#15 edit .. //depot/projects/mips/sys/mips/include/pcpu.h#3 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#16 edit .. //depot/projects/mips/sys/mips/mips/mips_subr.S#2 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#8 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#15 (text+ko) ==== @@ -15,10 +15,13 @@ mips/mips/locore.S standard no-obj mips/mips/locore_mips3.S standard mips/mips/machdep.c standard +mips/mips/mips_subr.S standard mips/mips/pmap.c standard mips/mips/sig_machdep.c standard mips/mips/support.S standard mips/mips/sys_machdep.c standard +mips/mips/syscall.c standard +mips/mips/trap.c standard mips/mips/vm_machdep.c standard # XXX cache code needs to be split up per CPU type, but yuck. mips/mips/cache.c standard ==== //depot/projects/mips/sys/mips/include/pcpu.h#3 (text+ko) ==== @@ -37,13 +37,13 @@ #define PCPU_MD_FIELDS \ /* XXX Nothing to see here. */ -#define PCPUP ((struct pcpu *) &pcpu0) +#define PCPUP (pcpup) #define PCPU_GET(member) (PCPUP->pc_ ## member) #define PCPU_PTR(member) (&PCPUP->pc_ ## member) #define PCPU_SET(member,value) (PCPUP->pc_ ## member = (value)) -extern struct pcpu pcpu0; +extern struct pcpu *pcpup; #endif /* _KERNEL */ ==== //depot/projects/mips/sys/mips/mips/machdep.c#16 (text+ko) ==== @@ -150,6 +150,7 @@ #include #include #include +#include #include #include @@ -173,7 +174,8 @@ int cold = 1; int cpu_id, fpu_id; -struct pcpu pcpu0; +static struct pcpu pcpu0; +struct pcpu *pcpup = &pcpu0; vm_offset_t kstack0; vm_paddr_t kstack0_phys; @@ -181,14 +183,11 @@ void mips_init(void) { - struct pcpu *pc; - mips_vector_init(); cpu_identify(); proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); thread0.td_kstack = kstack0; - pc = &pcpu0; - pc->pc_curthread = &thread0; + pcpup->pc_curthread = &thread0; } void @@ -297,11 +296,12 @@ return (-1); } -#if 0 +static void mips64_vector_init(void); +extern long *mips64_locoresw[]; + mips_locore_jumpvec_t mips_locore_jumpvec; long *mips_locoresw[3]; -#endif struct pridtab { int cpu_cid; @@ -520,7 +520,6 @@ }; #define ncidnames (sizeof(cidnames) / sizeof(cidnames[0])) -#ifdef notyet /* * MIPS64 locore function vector */ @@ -595,7 +594,6 @@ /* Clear BEV in SR so we start handling our own exceptions */ mips_cp0_status_write(mips_cp0_status_read() & ~MIPS_SR_BEV); } -#endif /* notyet */ /* * Do all the stuff that locore normally does before calling main(), @@ -712,7 +710,6 @@ */ mips_config_cache(); -#if notyet /* * Now initialize our ISA-dependent function vector. */ @@ -726,7 +723,7 @@ break; default: printf("cpu_arch 0x%x: not supported\n", cpu_arch); - cpu_reboot(RB_HALT, NULL); + cpu_halt(); } /* XXX simonb: ugg, another ugly #ifdef check... */ @@ -736,10 +733,8 @@ if ((mips_cpu_flags & CPU_MIPS_USE_WAIT) && !(mips_cpu_flags & CPU_MIPS_NO_WAIT)) CPU_IDLE = (long *)mips_wait_idle; -#endif /* notyet */ } -#if notyet void mips_set_wbflush(flush_fn) void (*flush_fn)(void); @@ -748,7 +743,6 @@ mips_locore_jumpvec.wbflush = flush_fn; (*flush_fn)(); } -#endif /* * Identify product revision IDs of cpu and fpu. ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#2 (text+ko) ==== @@ -586,7 +586,8 @@ /* * Save all of the registers except for the kernel temporaries in u_pcb. */ - lw k1, curpcb + la k1, pcpup + ld k1, PC_CURPCB(k1) #nop # -slip- addu k1, k1, USPACE - FRAME_SIZ REG_S AT, FRAME_AST(k1) @@ -654,11 +655,10 @@ /* * Check pending asynchronous traps. */ - lw t0, curlwp # t0 = curlwp - nop - lw t0, L_PROC(t0) # t0 = curlwp->l_proc - nop - lw t0, P_MD_ASTPENDING(t0) + la t0, pcpup + ld t0, PC_CURTHREAD(t0) + lw t0, TD_FLAGS(t0) + and t0, TDF_ASTPENDING beq t0, zero, 1f nop /* @@ -750,7 +750,8 @@ NESTED_NOPROFILE(MIPSX(SystemCall), CALLFRAME_SIZ, ra) .set noat .mask 0x80000000, -4 - lw k1, curpcb + la k1, pcpup + ld k1, PC_CURPCB(k1) #nop # -slip- addu k1, k1, USPACE - FRAME_SIZ #REG_S AT, FRAME_AST(k1) @@ -761,7 +762,8 @@ REG_S a1, FRAME_A1(k1) REG_S a2, FRAME_A2(k1) REG_S a3, FRAME_A3(k1) - lw a0, curlwp # 1st arg is curlwp + la a0, pcpup + ld a0, PC_CURTHREAD(a0) mfhi v1 #REG_S t0, FRAME_T0(k1) # no need to save temp regs #REG_S t1, FRAME_T1(k1) @@ -798,7 +800,7 @@ sw t0, FRAME_PPL(k1) .set noat #endif - lw t0, L_PROC(a0) # curlwp->l_proc (used below) + ld t0, TD_PROC(a0) addu sp, k1, -CALLFRAME_SIZ #ifdef __GP_SUPPORT__ la gp, _gp # switch to kernel GP @@ -807,7 +809,6 @@ * Turn off fpu and enter kernel mode */ .set at - lw t1, P_MD_SYSCALL(t0) # t1 = syscall and t0, a1, ~(MIPS_SR_COP_1_BIT | MIPS_SR_EXL | MIPS_SR_KSU_MASK) .set noat #if defined(DDB) || defined(DEBUG) || defined(KGDB) @@ -819,14 +820,15 @@ */ mtc0 t0, MIPS_COP_0_STATUS # re-enable interrupts COP0_SYNC - jal t1 + jal syscall_enter nop /* * Check pending asynchronous traps. */ - lw t0, curlwp - lw t0, L_PROC(t0) - lw t0, P_MD_ASTPENDING(t0) # curlwp->l_proc->p_md.md_astpending + la t0, pcpup + ld t0, PC_CURTHREAD(t0) + lw t0, TD_FLAGS(t0) + and t0, TDF_ASTPENDING beq t0, zero, 1f nop /* @@ -1088,7 +1090,8 @@ * Save the relevant user registers into the u_pcb. * We don't need to save s0 - s8 because the compiler does it for us. */ - lw k1, curpcb + la k1, pcpup + ld k1, PC_CURPCB(k1) #nop # -slip- addu k1, k1, USPACE - FRAME_SIZ REG_S AT, FRAME_AST(k1) @@ -1162,11 +1165,12 @@ nop # 3 nop hazard nop nop - lw v0, curlwp + la v0, pcpup + ld v0, PC_CURTHREAD(v0) addu a1, sp, CALLFRAME_SIZ - lw v0, L_PROC(v0) + lw v0, TD_FLAGS # REG_L a0, FRAME_SR(a1) - lw v0, P_MD_ASTPENDING(v0) # any pending ast? + and v0, TDF_ASTPENDING # any pending ast? # mtc0 a0, MIPS_COP_0_STATUS # restore the SR, disable intrs /* * Check pending asynchronous traps. @@ -1314,11 +1318,11 @@ li k1, VM_MIN_KERNEL_ADDRESS # compute index bgez k0, MIPSX(KernGenException) # full trap processing subu k0, k0, k1 - lw k1, Sysmapsize # index within range? + lw k1, kptemapsize # index within range? srl k0, k0, PGSHIFT sltu k1, k0, k1 beq k1, zero, outofworld # No. Failing beyond. . . - lw k1, Sysmap + ld k1, kptemap sll k0, k0, 2 # compute offset from index addu k1, k1, k0 @@ -1414,7 +1418,7 @@ _MFC0 k0, MIPS_COP_0_BAD_VADDR # get the fault address li k1, VM_MIN_KERNEL_ADDRESS # compute index subu k0, k0, k1 - lw k1, Sysmapsize # index within range? + lw k1, kptemapsize # index within range? srl k0, k0, PGSHIFT sltu k1, k0, k1 #ifdef newsmips @@ -1426,7 +1430,7 @@ #else beq k1, zero, outofworld # No. Failing beyond. . . #endif - lw k1, Sysmap + ld k1, kptemap srl k0, k0, 1 sll k0, k0, 3 # compute offset from index addu k1, k1, k0 @@ -1781,9 +1785,10 @@ * sure TBIS(it) in the case. */ LEAF_NOPROFILE(MIPSX(cpu_switch_resume)) - lw a1, L_MD_UPTE_0(a0) # a1 = upte[0] - lw a2, L_MD_UPTE_1(a0) # a2 = upte[1] - lw v0, L_ADDR(a0) # va = l->l_addr + lw a1, TD_MD_UPTE_0(a0) # a1 = upte[0] + lw a2, TD_MD_UPTE_1(a0) # a2 = upte[1] + ld v0, TD_PROC(a0) # v0 = td->proc + ld v0, P_UAREA(v0) # va = v0->p_uarea li s0, MIPS_KSEG2_START blt v0, s0, resume nop ==== //depot/projects/mips/sys/mips/mips/pmap.c#8 (text+ko) ==== @@ -61,6 +61,8 @@ pt_entry_t *kptemap; vm_size_t kptemapsize; +struct segtab *segbase; + struct msgbuf *msgbufp; int pmap_pagedaemon_waken; From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:17:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 551C837B401; Mon, 28 Apr 2003 16:17:18 -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 F359F37B407 for ; Mon, 28 Apr 2003 16:17:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB65C43FCB for ; Mon, 28 Apr 2003 16:17:16 -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 h3SNHG0U083460 for ; Mon, 28 Apr 2003 16:17:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNHGiD083452 for perforce@freebsd.org; Mon, 28 Apr 2003 16:17:16 -0700 (PDT) Date: Mon, 28 Apr 2003 16:17:16 -0700 (PDT) Message-Id: <200304282317.h3SNHGiD083452@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 30002 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: Mon, 28 Apr 2003 23:17:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=30002 Change 30002 by peter@peter_overcee on 2003/04/28 16:17:04 s/__x86_64__/__amd64__/g Affected files ... .. //depot/projects/hammer/sys/dev/fb/fbreg.h#5 edit .. //depot/projects/hammer/sys/dev/fb/vga.c#8 edit .. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#4 edit .. //depot/projects/hammer/sys/isa/isa_common.c#7 edit .. //depot/projects/hammer/sys/kern/kern_synch.c#12 edit .. //depot/projects/hammer/sys/kern/kern_thr.c#5 edit .. //depot/projects/hammer/sys/kern/kern_thread.c#21 edit .. //depot/projects/hammer/sys/sys/proc.h#18 edit .. //depot/projects/hammer/sys/sys/user.h#5 edit Differences ... ==== //depot/projects/hammer/sys/dev/fb/fbreg.h#5 (text+ko) ==== @@ -44,7 +44,7 @@ void generic_bcopy(const void *s, void *d, size_t c); void generic_bzero(void *d, size_t c); #else /* !__i386__ */ -#ifdef __x86_64__ +#ifdef __amd64__ #define bcopy_io(s, d, c) bcopy((void *)(s), (void *)(d), (c)) #define bcopy_toio(s, d, c) bcopy((void *)(s), (void *)(d), (c)) #define bcopy_fromio(s, d, c) bcopy((void *)(s), (void *)(d), (c)) ==== //depot/projects/hammer/sys/dev/fb/vga.c#8 (text+ko) ==== @@ -1320,7 +1320,7 @@ return 0; } -#if defined(__i386__) || defined(__x86_64__) /* XXX */ +#if defined(__i386__) || defined(__amd64__) /* XXX */ static void fill(int val, void *d, size_t size) { ==== //depot/projects/hammer/sys/dev/kbd/atkbdc.c#4 (text+ko) ==== @@ -154,7 +154,7 @@ #endif /* XXX: tag should be passed from the caller */ -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__amd64__) tag = I386_BUS_SPACE_IO; #elif defined(__alpha__) tag = busspace_isa_io; ==== //depot/projects/hammer/sys/isa/isa_common.c#7 (text+ko) ==== @@ -1112,7 +1112,7 @@ */ DRIVER_MODULE(isa, isab, isa_driver, isa_devclass, 0, 0); DRIVER_MODULE(isa, eisab, isa_driver, isa_devclass, 0, 0); -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__amd64__) DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0); #endif MODULE_VERSION(isa, 1); ==== //depot/projects/hammer/sys/kern/kern_synch.c#12 (text+ko) ==== @@ -457,7 +457,7 @@ { struct bintime new_switchtime; struct thread *td; -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) struct thread *newtd; #endif struct proc *p; @@ -517,7 +517,7 @@ thread_switchout(td); sched_switchout(td); -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) newtd = choosethread(); if (td != newtd) cpu_switch(td, newtd); /* SHAZAM!! */ ==== //depot/projects/hammer/sys/kern/kern_thr.c#5 (text+ko) ==== @@ -111,7 +111,7 @@ sched_exit_thread(TAILQ_NEXT(td, td_kglist), td); thread_stash(td); -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) cpu_throw(td, choosethread()); #else cpu_throw(); ==== //depot/projects/hammer/sys/kern/kern_thread.c#21 (text+ko) ==== @@ -1221,7 +1221,7 @@ } /* XXX Shouldn't cpu_throw() here. */ mtx_assert(&sched_lock, MA_OWNED); -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) cpu_throw(td, choosethread()); #else cpu_throw(); ==== //depot/projects/hammer/sys/sys/proc.h#18 (text+ko) ==== @@ -875,7 +875,7 @@ void sleepinit(void); void stopevent(struct proc *, u_int, u_int); void cpu_idle(void); -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) void cpu_switch(struct thread *old, struct thread *new); void cpu_throw(struct thread *old, struct thread *new) __dead2; #else ==== //depot/projects/hammer/sys/sys/user.h#5 (text+ko) ==== @@ -74,7 +74,7 @@ * 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(__x86_64__) +#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) #define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */ #endif #ifdef __i386__ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:18:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4434337B404; Mon, 28 Apr 2003 16:18:19 -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 F024B37B401 for ; Mon, 28 Apr 2003 16:18:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 882EE43FBD for ; Mon, 28 Apr 2003 16:18:18 -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 h3SNII0U084034 for ; Mon, 28 Apr 2003 16:18:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNIIMx084030 for perforce@freebsd.org; Mon, 28 Apr 2003 16:18:18 -0700 (PDT) Date: Mon, 28 Apr 2003 16:18:18 -0700 (PDT) Message-Id: <200304282318.h3SNIIMx084030@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 30003 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: Mon, 28 Apr 2003 23:18:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30003 Change 30003 by peter@peter_overcee on 2003/04/28 16:17:56 s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#13 (text+ko) ==== @@ -18,7 +18,7 @@ # # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ -machine x86_64 +machine amd64 cpu HAMMER ident GENERIC maxusers 0 From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:22:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 336CB37B405; Mon, 28 Apr 2003 16:22:25 -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 CA4E637B401 for ; Mon, 28 Apr 2003 16:22:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BA0743FB1 for ; Mon, 28 Apr 2003 16:22:24 -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 h3SNMN0U086628 for ; Mon, 28 Apr 2003 16:22:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNMN5G086621 for perforce@freebsd.org; Mon, 28 Apr 2003 16:22:23 -0700 (PDT) Date: Mon, 28 Apr 2003 16:22:23 -0700 (PDT) Message-Id: <200304282322.h3SNMN5G086621@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 30004 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: Mon, 28 Apr 2003 23:22:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=30004 Change 30004 by peter@peter_overcee on 2003/04/28 16:22:11 s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#11 edit .. //depot/projects/hammer/sys/x86_64/include/pmap.h#18 edit .. //depot/projects/hammer/sys/x86_64/include/tss.h#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#11 (text+ko) ==== @@ -65,10 +65,10 @@ #endif #ifndef _MACHINE -#define _MACHINE x86_64 +#define _MACHINE amd64 #endif #ifndef _MACHINE_ARCH -#define _MACHINE_ARCH x86_64 +#define _MACHINE_ARCH amd64 #endif #ifndef _NO_NAMESPACE_POLLUTION @@ -77,10 +77,10 @@ #define _MACHINE_PARAM_H_ #ifndef MACHINE -#define MACHINE "x86_64" +#define MACHINE "amd64" #endif #ifndef MACHINE_ARCH -#define MACHINE_ARCH "x86_64" +#define MACHINE_ARCH "amd64" #endif #define MID_MACHINE MID_X86_64 ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#18 (text+ko) ==== @@ -165,7 +165,7 @@ * Note: these work recursively, thus vtopte of a pte will give * the corresponding pde that in turn maps it. */ -#define vtopte(va) (PTmap + x86_64_btop(va)) +#define vtopte(va) (PTmap + amd64_btop(va)) /* * Routine: pmap_kextract ==== //depot/projects/hammer/sys/x86_64/include/tss.h#9 (text+ko) ==== @@ -41,13 +41,13 @@ #define _MACHINE_TSS_H_ 1 /* - * x86-64 Context Data Type + * amd64 Context Data Type * * The alignment is pretty messed up here due to reuse of the original 32 bit * fields. It might be worth trying to set the tss on a +4 byte offset to * make the 64 bit fields aligned in practice. */ -struct x86_64tss { +struct amd64tss { u_int32_t tss_rsvd0; u_int64_t tss_rsp0 __packed; /* kernel stack pointer ring 0 */ u_int64_t tss_rsp1 __packed; /* kernel stack pointer ring 1 */ @@ -69,7 +69,7 @@ }; #ifdef _KERNEL -extern struct x86_64tss common_tss; +extern struct amd64tss common_tss; #endif #endif /* _MACHINE_TSS_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:24:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C59637B404; Mon, 28 Apr 2003 16:24:28 -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 BE22937B401 for ; Mon, 28 Apr 2003 16:24:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C9D43FA3 for ; Mon, 28 Apr 2003 16:24:27 -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 h3SNOR0U088480 for ; Mon, 28 Apr 2003 16:24:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNOQNN088471 for perforce@freebsd.org; Mon, 28 Apr 2003 16:24:26 -0700 (PDT) Date: Mon, 28 Apr 2003 16:24:26 -0700 (PDT) Message-Id: <200304282324.h3SNOQNN088471@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 30005 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: Mon, 28 Apr 2003 23:24:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30005 Change 30005 by peter@peter_overcee on 2003/04/28 16:23:51 s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#11 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#14 edit .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#5 edit .. //depot/projects/hammer/sys/x86_64/isa/ithread.c#5 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#20 edit .. //depot/projects/hammer/sys/x86_64/isa/vector.s#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#11 (text+ko) ==== @@ -71,15 +71,15 @@ #include #include -#include -#include +#include +#include #include #ifdef DEV_ISA #include #endif -#include +#include -#include +#include /* * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#14 (text+ko) ==== @@ -57,13 +57,13 @@ #include #include -#include -#include +#include +#include #ifdef DEV_ISA #include #endif -#include +#include #include /* ==== //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/hammer/sys/x86_64/isa/ithread.c#5 (text+ko) ==== @@ -37,9 +37,9 @@ #include #include -#include -#include -#include +#include +#include +#include struct int_entropy { struct proc *p; ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#20 (text+ko) ==== @@ -67,7 +67,7 @@ #include #include -#include +#include #ifdef DEV_ISA #include #endif ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#9 (text+ko) ==== @@ -3,9 +3,9 @@ * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ */ -#include -#include -#include +#include +#include +#include .data ALIGN_DATA @@ -73,4 +73,4 @@ * loading segregs. */ -#include "x86_64/isa/icu_vector.s" +#include "amd64/isa/icu_vector.s" From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:25:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8A1D37B404; Mon, 28 Apr 2003 16:25:29 -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 7F04337B401 for ; Mon, 28 Apr 2003 16:25:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B04743F75 for ; Mon, 28 Apr 2003 16:25:29 -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 h3SNPT0U089383 for ; Mon, 28 Apr 2003 16:25:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNPSfn089374 for perforce@freebsd.org; Mon, 28 Apr 2003 16:25:28 -0700 (PDT) Date: Mon, 28 Apr 2003 16:25:28 -0700 (PDT) Message-Id: <200304282325.h3SNPSfn089374@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 30006 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: Mon, 28 Apr 2003 23:25:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30006 Change 30006 by peter@peter_overcee on 2003/04/28 16:25:00 s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#12 (text+ko) ==== @@ -40,7 +40,7 @@ */ /* - * Machine dependent constants for the AMD x86-64. + * Machine dependent constants for AMD64. */ /* @@ -153,8 +153,8 @@ #define atop(x) ((unsigned long)(x) >> PAGE_SHIFT) #define ptoa(x) ((unsigned long)(x) << PAGE_SHIFT) -#define x86_64_btop(x) ((unsigned long)(x) >> PAGE_SHIFT) -#define x86_64_ptob(x) ((unsigned long)(x) << PAGE_SHIFT) +#define amd64_btop(x) ((unsigned long)(x) >> PAGE_SHIFT) +#define amd64_ptob(x) ((unsigned long)(x) << PAGE_SHIFT) #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:28:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4B1E37B404; Mon, 28 Apr 2003 16:28:35 -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 5067C37B401 for ; Mon, 28 Apr 2003 16:28:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 223F643F3F for ; Mon, 28 Apr 2003 16:28:34 -0700 (PDT) (envelope-from marcel@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 h3SNSX0U092035 for ; Mon, 28 Apr 2003 16:28:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNSXCL091999 for perforce@freebsd.org; Mon, 28 Apr 2003 16:28:33 -0700 (PDT) Date: Mon, 28 Apr 2003 16:28:33 -0700 (PDT) Message-Id: <200304282328.h3SNSXCL091999@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30007 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: Mon, 28 Apr 2003 23:28:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30007 Change 30007 by marcel@marcel_pluto2 on 2003/04/28 16:27:40 IFC @29981 Affected files ... .. //depot/projects/ia64/MAINTAINERS#25 integrate .. //depot/projects/ia64/UPDATING#38 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#29 integrate .. //depot/projects/ia64/etc/etc.i386/rc.i386#2 integrate .. //depot/projects/ia64/etc/ftpusers#5 integrate .. //depot/projects/ia64/etc/group#6 integrate .. //depot/projects/ia64/etc/mail/aliases#7 integrate .. //depot/projects/ia64/etc/master.passwd#5 integrate .. //depot/projects/ia64/etc/rc#25 integrate .. //depot/projects/ia64/etc/rc.d/archdep#3 integrate .. //depot/projects/ia64/gnu/usr.bin/Makefile#21 integrate .. //depot/projects/ia64/lib/libc/gen/rfork_thread.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/rfork.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/vfork.2#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#5 integrate .. //depot/projects/ia64/libexec/Makefile#10 integrate .. //depot/projects/ia64/libexec/xtend/Makefile#2 delete .. //depot/projects/ia64/libexec/xtend/packet.c#3 delete .. //depot/projects/ia64/libexec/xtend/paths.h#2 delete .. //depot/projects/ia64/libexec/xtend/status.c#3 delete .. //depot/projects/ia64/libexec/xtend/user.c#4 delete .. //depot/projects/ia64/libexec/xtend/xten.h#2 delete .. //depot/projects/ia64/libexec/xtend/xtend.8#3 delete .. //depot/projects/ia64/libexec/xtend/xtend.c#5 delete .. //depot/projects/ia64/libexec/xtend/xtend.h#3 delete .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#22 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#15 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.h#3 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#4 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#6 integrate .. //depot/projects/ia64/sbin/mdmfs/Makefile#3 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#7 integrate .. //depot/projects/ia64/sbin/sunlabel/Makefile#5 integrate .. //depot/projects/ia64/sbin/sysctl/pathconf.c#3 delete .. //depot/projects/ia64/share/examples/pppd/ppp.deny.sample#4 integrate .. //depot/projects/ia64/share/man/man4/asr.4#4 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/Makefile#11 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/tw.4#2 delete .. //depot/projects/ia64/share/man/man4/md.4#3 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#18 integrate .. //depot/projects/ia64/share/zoneinfo/antarctica#3 integrate .. //depot/projects/ia64/share/zoneinfo/asia#6 integrate .. //depot/projects/ia64/share/zoneinfo/australasia#6 integrate .. //depot/projects/ia64/share/zoneinfo/europe#5 integrate .. //depot/projects/ia64/share/zoneinfo/northamerica#5 integrate .. //depot/projects/ia64/share/zoneinfo/southamerica#6 integrate .. //depot/projects/ia64/share/zoneinfo/zone.tab#7 integrate .. //depot/projects/ia64/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#40 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#11 integrate .. //depot/projects/ia64/sys/conf/files.i386#36 integrate .. //depot/projects/ia64/sys/conf/files.pc98#29 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#23 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#24 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#24 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#23 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.c#4 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.h#4 integrate .. //depot/projects/ia64/sys/dev/pst/pst-pci.c#3 integrate .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#8 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#15 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#37 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#19 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#11 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#9 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#39 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#41 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#13 integrate .. //depot/projects/ia64/sys/i386/isa/tw.c#7 delete .. //depot/projects/ia64/sys/kern/kern_jail.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#42 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#51 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#43 integrate .. //depot/projects/ia64/sys/net/if_ieee80211subr.c#5 integrate .. //depot/projects/ia64/sys/net/if_media.c#4 integrate .. //depot/projects/ia64/sys/net/if_media.h#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_ksocket.c#9 integrate .. //depot/projects/ia64/sys/netinet6/ipcomp_output.c#6 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#34 integrate .. //depot/projects/ia64/sys/sys/limits.h#2 integrate .. //depot/projects/ia64/sys/sys/soundcard.h#4 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#24 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#40 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#48 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#20 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/ia64/usr.bin/killall/killall.c#8 integrate .. //depot/projects/ia64/usr.sbin/Makefile#36 integrate .. //depot/projects/ia64/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.8#9 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#17 integrate .. //depot/projects/ia64/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 integrate .. //depot/projects/ia64/usr.sbin/rpc.umntall/rpc.umntall.c#3 integrate .. //depot/projects/ia64/usr.sbin/xten/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/xten/README#2 delete .. //depot/projects/ia64/usr.sbin/xten/xten.1#3 delete .. //depot/projects/ia64/usr.sbin/xten/xten.c#3 delete Differences ... ==== //depot/projects/ia64/MAINTAINERS#25 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.59 2003/04/18 21:17:46 nectar Exp $ +$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ subsystem login notes ----------------------------- @@ -71,7 +71,6 @@ natd(8) ru Recommends pre-commit review. share/mk ru Recommends pre-commit review. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -xten imp Looking after it, don't remove, don't break it. drm anholt Just keep me informed of changes, try not to break it. regression jmallett Will help write new tests, etc. libufs jmallett Willing to handle problems, help with work. ==== //depot/projects/ia64/UPDATING#38 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030427: + The old rc system will soon be going away. If you have specified + rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and + test with the new rc system. Please report any problems to + freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1259,4 +1265,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.247 2003/04/25 20:11:17 ru Exp $ +$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ ==== //depot/projects/ia64/etc/defaults/rc.conf#29 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.172 2003/04/16 16:29:51 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -162,8 +162,6 @@ rarpd_flags="" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd -xtend_enable="NO" # Run the X-10 power controller daemon. -xtend_flags="" # Flags to xtend (if enabled). pppoed_enable="NO" # Run the PPP over Ethernet daemon. pppoed_provider="*" # Provider and ppp(8) config file entry. pppoed_flags="-P /var/run/pppoed.pid" # Flags to pppoed (if enabled). ==== //depot/projects/ia64/etc/etc.i386/rc.i386#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.58 2001/01/09 22:28:17 jhb Exp $ +# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.59 2003/04/27 05:49:53 imp Exp $ # Do i386 specific processing # @@ -45,10 +45,4 @@ ;; esac -case ${xtend_enable} in -[Yy][Ee][Ss]) - echo -n ' xtend'; /usr/libexec/xtend - ;; -esac - echo '.' ==== //depot/projects/ia64/etc/ftpusers#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.10 2002/06/28 15:46:26 maxim Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.11 2003/04/27 05:49:53 imp Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -15,7 +15,6 @@ sshd bind uucp -xten pop www nobody ==== //depot/projects/ia64/etc/group#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.27 2002/10/14 20:55:49 rwatson Exp $ +# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ # wheel:*:0:root daemon:*:1: @@ -18,7 +18,6 @@ guest:*:31: bind:*:53: uucp:*:66: -xten:*:67: dialer:*:68: network:*:69: www:*:80: ==== //depot/projects/ia64/etc/mail/aliases#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.18 2003/04/27 05:49:53 imp Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -41,7 +41,6 @@ tty: root usenet: news uucp: root -xten: root # Well-known aliases -- these should be filled in! # manager: ==== //depot/projects/ia64/etc/master.passwd#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.33 2002/06/23 20:46:44 des Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -15,7 +15,6 @@ mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin ==== //depot/projects/ia64/etc/rc#25 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.327 2003/04/23 15:38:02 matusita Exp $ +# $FreeBSD: src/etc/rc,v 1.328 2003/04/27 07:08:07 dougb Exp $ # # System startup script run by init on autoboot @@ -83,6 +83,15 @@ rc_ng=YES else rc_ng=NO + echo -n  ; sleep 1 ; echo -n  ; sleep 1 ; echo -n  + echo '' + echo '**** The old versions of the rc scripts are deprecated, and' + echo ' will soon be removed. Make sure to update /etc and' + echo ' check that rc_ng is YES in /etc/defaults/rc.conf.' + echo ' Please report any rc problems to freebsd-rc@yahoogroups.com' + echo ' and/or freebsd-current@freebsd.org.' + echo '' + sleep 3 fi case ${rc_ng} in ==== //depot/projects/ia64/etc/rc.d/archdep#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.3 2003/04/27 05:49:53 imp Exp $ # # PROVIDE: archdep @@ -53,22 +53,11 @@ fi } -# X-10 Daemon -# -x10_daemon() -{ - if checkyesno xtend_enable; then - echo -n ' xtend' - /usr/libexec/xtend - fi -} - _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in i386) ibcs2_compat - x10_daemon ;; alpha) osf1_compat ==== //depot/projects/ia64/gnu/usr.bin/Makefile#21 (text+ko) ==== @@ -1,13 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.74 2003/02/24 02:40:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.75 2003/04/27 20:14:05 obrien Exp $ -.if ${MACHINE_ARCH} != "powerpc" -_gperf=gperf -.endif - SUBDIR= bc binutils cc cpio dc dialog diff diff3 \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo .if !defined(NO_CXX) +.if ${MACHINE_ARCH} != "powerpc" +_gperf=gperf +.endif SUBDIR+=groff .endif ==== //depot/projects/ia64/lib/libc/gen/rfork_thread.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.6 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.7 2003/04/27 21:07:27 robert Exp $ .\" .Dd July 29, 2000 .Dt RFORK_THREAD 3 @@ -35,7 +35,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork_thread "int flags" "void *stack" "int (*func)(void *arg)" "void *arg" .Sh DESCRIPTION The ==== //depot/projects/ia64/lib/libc/sys/rfork.2#8 (text+ko) ==== @@ -3,7 +3,7 @@ .\" describe the actual BSD implementation. Permission for .\" use of this page comes from Rob Pike . .\" -.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.30 2003/02/23 01:47:48 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.31 2003/04/27 21:01:34 robert Exp $ .\" .Dd January 31, 2003 .Dt RFORK 2 @@ -15,7 +15,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork "int flags" .Sh DESCRIPTION Forking, vforking or rforking are the only ways new processes are created. ==== //depot/projects/ia64/lib/libc/sys/vfork.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.21 2002/12/27 12:15:29 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.22 2003/04/27 21:01:34 robert Exp $ .\" .Dd June 4, 1993 .Dt VFORK 2 @@ -42,7 +42,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn vfork void .Sh DESCRIPTION The ==== //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.46 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.47 2003/04/28 21:35:06 deischen Exp $ */ #include #include @@ -258,7 +258,7 @@ thr_sig_find(struct kse *curkse, int sig, siginfo_t *info) { int handler_installed; - struct pthread *pthread, *pthread_next; + struct pthread *pthread; struct pthread *suspended_thread, *signaled_thread; DBG_MSG("Looking for thread to handle signal %d\n", sig); @@ -285,14 +285,7 @@ signaled_thread = NULL; KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); - for (pthread = TAILQ_FIRST(&_thread_list); - pthread != NULL; pthread = pthread_next) { - /* - * Grab the next thread before possibly destroying - * the link entry. - */ - pthread_next = TAILQ_NEXT(pthread, pqe); - + TAILQ_FOREACH(pthread, &_thread_list, tle) { if ((pthread->state == PS_SIGWAIT) && sigismember(pthread->data.sigwait, sig)) { /* Take the scheduling lock. */ ==== //depot/projects/ia64/libexec/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.53 2003/01/02 20:44:41 jmallett Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.55 2003/04/27 06:16:52 imp Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -28,7 +28,6 @@ talkd \ tcpd \ tftpd \ - xtend \ ypxfr .if !defined(NO_BIND) ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#22 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -2195,9 +2195,8 @@ The AlphaServer 4x00 machines are intended as small enterprise servers. Expect a 30" high pedestal cabinet or alternatively - the same system box in a 19" rack. This is medium iron, not - a typical hobbyist system. Rawhides are multi-CPU machines, up to - 4 CPUs can be in a single machine. Basic disk storage is housed in + the same system box in a 19" rack. Rawhides are multi-CPU machines, + up to 4 CPUs can be in a single machine. Basic disk storage is housed in one or two StorageWorks shelves at the bottom of the pedestal. The Rawhides intended for the NT market are designated DIGITAL Server 7300 (5/400 CPU), DIGITAL Server 7305 (5/533 CPU). A @@ -2211,7 +2210,7 @@ cache: 4 Mbytes per CPU. EV5 300 MHz was also - available cache-less. 8 Mbytes for EV5 600Mhz + available cache-less. 8 Mbytes for EV56 600Mhz memory bus: 128 bit with ECC @@ -2232,18 +2231,19 @@ Rawhide uses a maximum of 8 RAM modules. These modules are used in pairs and supply 72 bits to the bus (this includes ECC bits). - Memory can be EDO RAM or synchronous DRAM. A fully populated Rawhide - has 4 pairs of memory modules. Given the choice use SDRAM for + Memory can be EDO RAM or synchronous DRAM. A fully populated AS4100 + has 4 pairs of memory modules. The AS4000 model is limited to 2 pairs + of memory modules. Given the choice use SDRAM for best performance. The highest capacity memory board must be in memory slot 0. A mix of memory board sizes is allowed. A mix - of EDO and SDRAM is also reported as working (assuming you don't + of EDO and SDRAM works as well (assuming you don't try to mix EDO and SDRAM in one module pair). A mix of EDO and SDRAM results in the entire memory subsystem running at the slower EDO timing Rawhide has an embedded Symbios 810 chip that gives you a narrow fast-SCSI bus. Generally only the SCSI CDROM is driven by - this interface. + this interface. Rawhides are available with a 8 64-bit PCI / 3 EISA slot expansion backplanes (called Saddle modules). There @@ -2262,12 +2262,21 @@ EISA slots are currently unsupported, but the Compaq Qvision EISA VGA adapter is treated as an ISA device. It therefore works - OK as a console. + OK as a console. In case you use EISA options in your machine you + must run the EISA Configuration Utility (ECU) from floppy. Do yourself + a favor and use the Tru64/OpenVMS ECU, and not the WindowsNT ECU. + Rawhide employs an I2C based power controller system. If you want to be sure all power is removed from the system remove the mains cables from the system. + Rawhide comes with RCM functionality, which means you can + power it on/off remotely, reset it etc. See also the description for + RMC in the DS10 section of this document. RCM versus RMC is not a typo, + the various documentation I consulted used both acronyms + interchangably. + The kernel config file must contain: options DEC_KN300 cpu EV5 ==== //depot/projects/ia64/sbin/ifconfig/ifconfig.8#19 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.68 2003/03/08 13:42:42 tjr Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.69 2003/04/28 16:47:40 sam Exp $ .\" -.Dd July 2, 2001 +.Dd April 28, 2003 .Dt IFCONFIG 8 .Os .Sh NAME @@ -302,6 +302,18 @@ .It Fl mediaopt Ar opts If the driver supports the media selection system, disable the specified media options on the interface. +.It Cm mode Ar mode +If the driver supports the media selection system, set the specified +operating mode on the interface to +.Ar mode . +For IEEE 802.11 wireless interfaces that support multiple operating modes +this directive is used to select between 802.11a (\c +.Dq 11a ), +802.11b (\c +.Dq 11b ), +and 802.11g (\c +.Dq 11g ) +operating modes. .It Cm rxcsum , txcsum If the driver supports user-configurable checksum offloading, enable receive (or transmit) checksum offloading on the interface. @@ -454,7 +466,7 @@ See the .Ar address option above for more information. -.\" see +3\" see .\" Xr eon 5 . .\" .It Cm nsellength Ar n .\" .Pf ( Tn ISO ==== //depot/projects/ia64/sbin/ifconfig/ifconfig.c#15 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.89 2003/04/15 06:25:58 mdodd Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.90 2003/04/28 16:37:38 sam Exp $"; #endif /* not lint */ #include @@ -236,6 +236,7 @@ { "-monitor", -IFF_MONITOR, setifflags }, #ifdef USE_IF_MEDIA { "media", NEXTARG, setmedia }, + { "mode", NEXTARG, setmediamode }, { "mediaopt", NEXTARG, setmediaopt }, { "-mediaopt", NEXTARG, unsetmediaopt }, #endif ==== //depot/projects/ia64/sbin/ifconfig/ifconfig.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.9 2002/10/23 22:50:04 rwatson Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.10 2003/04/28 16:37:38 sam Exp $ */ extern struct ifreq ifr; @@ -42,6 +42,7 @@ struct afswtch; extern void setmedia(const char *, int, int, const struct afswtch *rafp); +extern void setmediamode(const char *, int, int, const struct afswtch *rafp); extern void setmediaopt(const char *, int, int, const struct afswtch *rafp); extern void unsetmediaopt(const char *, int, int, const struct afswtch *rafp); extern void media_status(int s, struct rt_addrinfo *); ==== //depot/projects/ia64/sbin/ifconfig/ifmedia.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ -/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.12 2002/04/18 17:14:09 imp Exp $ */ +/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.13 2003/04/28 16:37:38 sam Exp $ */ /* * Copyright (c) 1997 Jason R. Thorpe. @@ -91,6 +91,7 @@ static void domediaopt(const char *, int, int); static int get_media_subtype(int, const char *); +static int get_media_mode(int, const char *); static int get_media_options(int, const char *); static int lookup_media_word(struct ifmedia_description *, const char *); static void print_media_word(int, int); @@ -220,7 +221,7 @@ IFM_TYPE(first_type) | subtype; if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) - err(1, "SIOCSIFMEDIA"); + err(1, "SIOCSIFMEDIA (media)"); } void @@ -278,7 +279,49 @@ ifr.ifr_media |= options; if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) - err(1, "SIOCSIFMEDIA"); + err(1, "SIOCSIFMEDIA (mediaopt)"); +} + + +void +setmediamode(const char *val, int d, int s, const struct afswtch *afp) +{ + struct ifmediareq ifmr; + int *mwords, mode; + + (void) memset(&ifmr, 0, sizeof(ifmr)); + (void) strncpy(ifmr.ifm_name, name, sizeof(ifmr.ifm_name)); + + /* + * We must go through the motions of reading all + * supported media because we need to know both + * the current media type and the top-level type. + */ + + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) + err(1, "SIOCGIFMEDIA"); + + if (ifmr.ifm_count == 0) + errx(1, "%s: no media types?", name); + + mwords = (int *)malloc(ifmr.ifm_count * sizeof(int)); + if (mwords == NULL) + err(1, "malloc"); + + ifmr.ifm_ulist = mwords; + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) + err(1, "SIOCGIFMEDIA"); + + mode = get_media_mode(IFM_TYPE(mwords[0]), val); + + free(mwords); + + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + ifr.ifr_media = ifmr.ifm_current; + ifr.ifr_media = (ifmr.ifm_current & ~IFM_MMASK) | IFM_MAKEMODE(mode); + + if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) + err(1, "SIOCSIFMEDIA (mode)"); } /********************************************************************** @@ -324,6 +367,9 @@ static struct ifmedia_description ifm_subtype_ieee80211_option_descriptions[] = IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS; +struct ifmedia_description ifm_subtype_ieee80211_mode_descriptions[] = + IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS; + static struct ifmedia_description ifm_subtype_shared_descriptions[] = IFM_SUBTYPE_SHARED_DESCRIPTIONS; @@ -342,6 +388,10 @@ struct ifmedia_description *desc; int alias; } options[3]; + struct { + struct ifmedia_description *desc; + int alias; + } modes[2]; }; /* must be in the same order as IFM_TYPE_DESCRIPTIONS */ @@ -359,6 +409,9 @@ { &ifm_subtype_ethernet_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { NULL, 0 }, + }, }, { { @@ -373,6 +426,9 @@ { &ifm_subtype_tokenring_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { NULL, 0 }, + }, }, { { @@ -387,6 +443,9 @@ { &ifm_subtype_fddi_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { NULL, 0 }, + }, }, { { @@ -401,6 +460,10 @@ { &ifm_subtype_ieee80211_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { &ifm_subtype_ieee80211_mode_descriptions[0], 0 }, + { NULL, 0 }, + }, }, }; @@ -425,7 +488,30 @@ return (rval); } errx(1, "unknown media subtype: %s", val); - /* NOTREACHED */ + /*NOTREACHED*/ +} + +static int +get_media_mode(int type, const char *val) +{ + struct ifmedia_description *desc; + struct ifmedia_type_to_subtype *ttos; + int rval, i; + + /* Find the top-level interface type. */ + for (desc = ifm_type_descriptions, ttos = ifmedia_types_to_subtypes; + desc->ifmt_string != NULL; desc++, ttos++) + if (type == desc->ifmt_word) + break; + if (desc->ifmt_string == NULL) + errx(1, "unknown media mode 0x%x", type); + + for (i = 0; ttos->modes[i].desc != NULL; i++) { + rval = lookup_media_word(ttos->modes[i].desc, val); + if (rval != -1) + return (rval); + } + return -1; } static int @@ -523,6 +609,25 @@ return NULL; } +static struct ifmedia_description *get_mode_desc(int ifmw, + struct ifmedia_type_to_subtype *ttos) +{ + int i; + struct ifmedia_description *desc; + + for (i = 0; ttos->modes[i].desc != NULL; i++) { + if (ttos->modes[i].alias) + continue; + for (desc = ttos->modes[i].desc; + desc->ifmt_string != NULL; desc++) { + if (IFM_MODE(ifmw) == desc->ifmt_word) + return desc; + } + } + + return NULL; +} + static void print_media_word(int ifmw, int print_toptype) { @@ -560,6 +665,12 @@ printf("%s", desc->ifmt_string); + if (print_toptype) { + desc = get_mode_desc(ifmw, ttos); + if (desc != NULL) + printf(" mode %s", desc->ifmt_string); + } + /* Find options. */ for (i = 0; ttos->options[i].desc != NULL; i++) { if (ttos->options[i].alias) @@ -609,6 +720,10 @@ got_subtype: printf("media %s", desc->ifmt_string); + desc = get_mode_desc(ifmw, ttos); + if (desc != NULL) + printf(" mode %s", desc->ifmt_string); + /* Find options. */ for (i = 0; ttos->options[i].desc != NULL; i++) { if (ttos->options[i].alias) ==== //depot/projects/ia64/sbin/mdconfig/mdconfig.8#6 (text+ko) ==== @@ -39,7 +39,7 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.18 2003/03/03 13:05:00 phk Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.19 2003/04/27 01:46:56 dougb Exp $ .\" .Dd December 31, 2000 .Dt MDCONFIG 8 @@ -168,6 +168,7 @@ .Xr md 4 , .Xr disklabel 8 , .Xr fdisk 8 , +.Xr mdmfs 8 , .Xr malloc 9 .Sh HISTORY The ==== //depot/projects/ia64/sbin/mdmfs/Makefile#3 (text+ko) ==== @@ -1,6 +1,8 @@ -# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.2 2001/12/04 02:19:50 obrien Exp $ +# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.5 2003/04/27 01:40:45 dougb Exp $ PROG= mdmfs +LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs MAN= mdmfs.8 +MLINKS+= mdmfs.8 mount_mfs.8 .include ==== //depot/projects/ia64/sbin/mdmfs/mdmfs.8#7 (text+ko) ==== @@ -23,13 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.14 2002/12/27 12:15:32 schweikh Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.15 2003/04/27 01:40:45 dougb Exp $ .\" .Dd August 5, 2001 .Dt MDMFS 8 .Os .Sh NAME -.Nm mdmfs +.Nm mdmfs , +.Nm mount_mfs .Nd configure and mount an in-memory file system using the .Xr md 4 driver @@ -306,7 +307,7 @@ can be useful by itself. Since .Xr mount_mfs 8 -has some silly defaults, a +had some silly defaults, a .Dq full compatibility mode is provided for the case where bug-to-bug compatibility is desired. .Pp ==== //depot/projects/ia64/sbin/sunlabel/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.5 2003/04/23 08:25:20 phk Exp $ +# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.6 2003/04/27 21:24:05 jake Exp $ PROG=sunlabel SRCS=sunlabel.c geom_sunlabel_enc.c @@ -6,7 +6,7 @@ WARNS=5 DDADD= ${LIBGEOM} -LDADD= -lgeom +LDADD= -lgeom -lbsdxml -lsbuf .PATH: ${.CURDIR}/../../sys/geom ==== //depot/projects/ia64/share/examples/pppd/ppp.deny.sample#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.9 2002/06/28 15:46:29 maxim Exp $ +# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.10 2003/04/28 08:36:45 maxim Exp $ # # list of users disallowed any pppd access via 'system # password login'. @@ -19,7 +19,6 @@ bind ftp uucp -xten pop www nobody ==== //depot/projects/ia64/share/man/man4/asr.4#4 (text+ko) ==== @@ -4,7 +4,7 @@ .\" .\" Manpage cleanup by: Jeroen Ruigrok van der Werven .\" -.\" $FreeBSD: src/share/man/man4/asr.4,v 1.15 2003/04/22 09:39:10 ru Exp $ +.\" $FreeBSD: src/share/man/man4/asr.4,v 1.16 2003/04/27 18:45:07 ru Exp $ .\" .Dd October 27, 2000 .Dt ASR 4 @@ -52,12 +52,9 @@ .It Adaptec SmartRAID PM3757 .It -DEC KZPCC-AC (LVD 1-ch, 4MB or 16MB cache) -.It -DEC KZPCC-CE (LVD 3-ch, 64MB cache) -.It -DEC KZPCC-XC (LVD 1-ch, 16MB cache) -.It +DEC KZPCC-AC (LVD 1-ch, 4MB or 16MB cache), +DEC KZPCC-CE (LVD 3-ch, 64MB cache), +DEC KZPCC-XC (LVD 1-ch, 16MB cache), DEC KZPCC-XE (LVD 3-ch, 64MB cache) -- rebadged SmartRAID V Millennium .El .Pp ==== //depot/projects/ia64/share/man/man4/man4.i386/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.146 2003/04/20 22:01:37 obrien Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.147 2003/04/27 05:39:10 imp Exp $ MAN= aic.4 alpm.4 amdpm.4 apm.4 ar.4 asc.4 \ cs.4 cx.4 cy.4 \ @@ -7,7 +7,7 @@ meteor.4 mse.4 npx.4 \ pae.4 pcf.4 perfmon.4 pnp.4 pnpbios.4 \ ray.4 rdp.4 sbni.4 smapi.4 scd.4 \ - spkr.4 sr.4 streams.4 svr4.4 tw.4 \ + spkr.4 sr.4 streams.4 svr4.4 \ tx.4 viapm.4 vpd.4 vx.4 \ wd.4 wl.4 wt.4 ==== //depot/projects/ia64/share/man/man4/md.4#3 (text+ko) ==== @@ -5,7 +5,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/share/man/man4/md.4,v 1.10 2002/12/12 17:25:56 ru Exp $ +.\" $FreeBSD: src/share/man/man4/md.4,v 1.11 2003/04/27 01:46:56 dougb Exp $ .\" .Dd March 9, 2001 .Dt MD 4 @@ -61,6 +61,7 @@ .Xr fdisk 8 , >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:29:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E31F337B404; Mon, 28 Apr 2003 16:29:37 -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 A879C37B401 for ; Mon, 28 Apr 2003 16:29:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74D9D43FBD for ; Mon, 28 Apr 2003 16:29:36 -0700 (PDT) (envelope-from marcel@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 h3SNTa0U092999 for ; Mon, 28 Apr 2003 16:29:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNTZLL092990 for perforce@freebsd.org; Mon, 28 Apr 2003 16:29:35 -0700 (PDT) Date: Mon, 28 Apr 2003 16:29:35 -0700 (PDT) Message-Id: <200304282329.h3SNTZLL092990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30008 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: Mon, 28 Apr 2003 23:29:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30008 Change 30008 by marcel@marcel_pluto2 on 2003/04/28 16:29:00 IFia64 Affected files ... .. //depot/projects/ia64_epc/MAINTAINERS#4 integrate .. //depot/projects/ia64_epc/UPDATING#6 integrate .. //depot/projects/ia64_epc/etc/defaults/rc.conf#5 integrate .. //depot/projects/ia64_epc/etc/etc.i386/rc.i386#2 integrate .. //depot/projects/ia64_epc/etc/ftpusers#2 integrate .. //depot/projects/ia64_epc/etc/group#2 integrate .. //depot/projects/ia64_epc/etc/mail/aliases#3 integrate .. //depot/projects/ia64_epc/etc/master.passwd#2 integrate .. //depot/projects/ia64_epc/etc/rc#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/archdep#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/ia64_epc/lib/libc/gen/rfork_thread.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/ia64_epc/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_sig.c#4 integrate .. //depot/projects/ia64_epc/libexec/Makefile#2 integrate .. //depot/projects/ia64_epc/libexec/xtend/Makefile#2 delete .. //depot/projects/ia64_epc/libexec/xtend/packet.c#2 delete .. //depot/projects/ia64_epc/libexec/xtend/paths.h#2 delete .. //depot/projects/ia64_epc/libexec/xtend/status.c#2 delete .. //depot/projects/ia64_epc/libexec/xtend/user.c#2 delete .. //depot/projects/ia64_epc/libexec/xtend/xten.h#2 delete .. //depot/projects/ia64_epc/libexec/xtend/xtend.8#2 delete .. //depot/projects/ia64_epc/libexec/xtend/xtend.c#2 delete .. //depot/projects/ia64_epc/libexec/xtend/xtend.h#2 delete .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.c#4 integrate .. //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/ia64_epc/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/ia64_epc/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/ia64_epc/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/ia64_epc/sbin/sunlabel/Makefile#5 integrate .. //depot/projects/ia64_epc/sbin/sysctl/pathconf.c#2 delete .. //depot/projects/ia64_epc/share/examples/pppd/ppp.deny.sample#2 integrate .. //depot/projects/ia64_epc/share/man/man4/asr.4#4 integrate .. //depot/projects/ia64_epc/share/man/man4/man4.i386/Makefile#7 integrate .. //depot/projects/ia64_epc/share/man/man4/man4.i386/tw.4#2 delete .. //depot/projects/ia64_epc/share/man/man4/md.4#2 integrate .. //depot/projects/ia64_epc/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/antarctica#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/asia#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/australasia#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/europe#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/northamerica#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/southamerica#2 integrate .. //depot/projects/ia64_epc/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/ia64_epc/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/ia64_epc/sys/conf/files.i386#8 integrate .. //depot/projects/ia64_epc/sys/conf/files.pc98#7 integrate .. //depot/projects/ia64_epc/sys/dev/aac/aac.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/ia64_epc/sys/dev/pccard/pccarddevs.h#6 integrate .. //depot/projects/ia64_epc/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/pst/pst-raid.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/ubsec/ubsecreg.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/ia64_epc/sys/i386/conf/NOTES#10 integrate .. //depot/projects/ia64_epc/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/ia64_epc/sys/i386/include/pmap.h#6 integrate .. //depot/projects/ia64_epc/sys/i386/isa/tw.c#3 delete .. //depot/projects/ia64_epc/sys/kern/kern_jail.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_thread.c#15 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/ia64_epc/sys/net/if_ieee80211subr.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_media.c#2 integrate .. //depot/projects/ia64_epc/sys/net/if_media.h#2 integrate .. //depot/projects/ia64_epc/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/ia64_epc/sys/netinet6/ipcomp_output.c#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/ia64_epc/sys/sys/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/soundcard.h#2 integrate .. //depot/projects/ia64_epc/sys/vm/swap_pager.c#6 integrate .. //depot/projects/ia64_epc/sys/vm/uma_core.c#8 integrate .. //depot/projects/ia64_epc/sys/vm/vm_glue.c#5 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.c#12 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.h#8 integrate .. //depot/projects/ia64_epc/usr.bin/calendar/calendars/calendar.computer#2 integrate .. //depot/projects/ia64_epc/usr.bin/killall/killall.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/Makefile#5 integrate .. //depot/projects/ia64_epc/usr.sbin/acpi/acpidump/acpi.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/gstat/Makefile#2 integrate .. //depot/projects/ia64_epc/usr.sbin/newsyslog/newsyslog.8#3 integrate .. //depot/projects/ia64_epc/usr.sbin/newsyslog/newsyslog.c#5 integrate .. //depot/projects/ia64_epc/usr.sbin/pwd_mkdb/pwd_mkdb.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.umntall/rpc.umntall.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/xten/Makefile#2 delete .. //depot/projects/ia64_epc/usr.sbin/xten/README#2 delete .. //depot/projects/ia64_epc/usr.sbin/xten/xten.1#2 delete .. //depot/projects/ia64_epc/usr.sbin/xten/xten.c#2 delete Differences ... ==== //depot/projects/ia64_epc/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.59 2003/04/18 21:17:46 nectar Exp $ +$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ subsystem login notes ----------------------------- @@ -71,7 +71,6 @@ natd(8) ru Recommends pre-commit review. share/mk ru Recommends pre-commit review. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org -xten imp Looking after it, don't remove, don't break it. drm anholt Just keep me informed of changes, try not to break it. regression jmallett Will help write new tests, etc. libufs jmallett Willing to handle problems, help with work. ==== //depot/projects/ia64_epc/UPDATING#6 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030427: + The old rc system will soon be going away. If you have specified + rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and + test with the new rc system. Please report any problems to + freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1259,4 +1265,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.247 2003/04/25 20:11:17 ru Exp $ +$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ ==== //depot/projects/ia64_epc/etc/defaults/rc.conf#5 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.172 2003/04/16 16:29:51 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -162,8 +162,6 @@ rarpd_flags="" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd -xtend_enable="NO" # Run the X-10 power controller daemon. -xtend_flags="" # Flags to xtend (if enabled). pppoed_enable="NO" # Run the PPP over Ethernet daemon. pppoed_provider="*" # Provider and ppp(8) config file entry. pppoed_flags="-P /var/run/pppoed.pid" # Flags to pppoed (if enabled). ==== //depot/projects/ia64_epc/etc/etc.i386/rc.i386#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.58 2001/01/09 22:28:17 jhb Exp $ +# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.59 2003/04/27 05:49:53 imp Exp $ # Do i386 specific processing # @@ -45,10 +45,4 @@ ;; esac -case ${xtend_enable} in -[Yy][Ee][Ss]) - echo -n ' xtend'; /usr/libexec/xtend - ;; -esac - echo '.' ==== //depot/projects/ia64_epc/etc/ftpusers#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/ftpusers,v 1.10 2002/06/28 15:46:26 maxim Exp $ +# $FreeBSD: src/etc/ftpusers,v 1.11 2003/04/27 05:49:53 imp Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -15,7 +15,6 @@ sshd bind uucp -xten pop www nobody ==== //depot/projects/ia64_epc/etc/group#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/group,v 1.27 2002/10/14 20:55:49 rwatson Exp $ +# $FreeBSD: src/etc/group,v 1.28 2003/04/27 05:49:53 imp Exp $ # wheel:*:0:root daemon:*:1: @@ -18,7 +18,6 @@ guest:*:31: bind:*:53: uucp:*:66: -xten:*:67: dialer:*:68: network:*:69: www:*:80: ==== //depot/projects/ia64_epc/etc/mail/aliases#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $ +# $FreeBSD: src/etc/mail/aliases,v 1.18 2003/04/27 05:49:53 imp Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -41,7 +41,6 @@ tty: root usenet: news uucp: root -xten: root # Well-known aliases -- these should be filled in! # manager: ==== //depot/projects/ia64_epc/etc/master.passwd#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/master.passwd,v 1.33 2002/06/23 20:46:44 des Exp $ +# $FreeBSD: src/etc/master.passwd,v 1.34 2003/04/27 05:45:29 imp Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -15,7 +15,6 @@ mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin ==== //depot/projects/ia64_epc/etc/rc#3 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.327 2003/04/23 15:38:02 matusita Exp $ +# $FreeBSD: src/etc/rc,v 1.328 2003/04/27 07:08:07 dougb Exp $ # # System startup script run by init on autoboot @@ -83,6 +83,15 @@ rc_ng=YES else rc_ng=NO + echo -n  ; sleep 1 ; echo -n  ; sleep 1 ; echo -n  + echo '' + echo '**** The old versions of the rc scripts are deprecated, and' + echo ' will soon be removed. Make sure to update /etc and' + echo ' check that rc_ng is YES in /etc/defaults/rc.conf.' + echo ' Please report any rc problems to freebsd-rc@yahoogroups.com' + echo ' and/or freebsd-current@freebsd.org.' + echo '' + sleep 3 fi case ${rc_ng} in ==== //depot/projects/ia64_epc/etc/rc.d/archdep#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.2 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.3 2003/04/27 05:49:53 imp Exp $ # # PROVIDE: archdep @@ -53,22 +53,11 @@ fi } -# X-10 Daemon -# -x10_daemon() -{ - if checkyesno xtend_enable; then - echo -n ' xtend' - /usr/libexec/xtend - fi -} - _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in i386) ibcs2_compat - x10_daemon ;; alpha) osf1_compat ==== //depot/projects/ia64_epc/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,13 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.74 2003/02/24 02:40:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.75 2003/04/27 20:14:05 obrien Exp $ -.if ${MACHINE_ARCH} != "powerpc" -_gperf=gperf -.endif - SUBDIR= bc binutils cc cpio dc dialog diff diff3 \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo .if !defined(NO_CXX) +.if ${MACHINE_ARCH} != "powerpc" +_gperf=gperf +.endif SUBDIR+=groff .endif ==== //depot/projects/ia64_epc/lib/libc/gen/rfork_thread.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.6 2002/12/18 10:13:54 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/rfork_thread.3,v 1.7 2003/04/27 21:07:27 robert Exp $ .\" .Dd July 29, 2000 .Dt RFORK_THREAD 3 @@ -35,7 +35,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork_thread "int flags" "void *stack" "int (*func)(void *arg)" "void *arg" .Sh DESCRIPTION The ==== //depot/projects/ia64_epc/lib/libc/sys/rfork.2#3 (text+ko) ==== @@ -3,7 +3,7 @@ .\" describe the actual BSD implementation. Permission for .\" use of this page comes from Rob Pike . .\" -.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.30 2003/02/23 01:47:48 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rfork.2,v 1.31 2003/04/27 21:01:34 robert Exp $ .\" .Dd January 31, 2003 .Dt RFORK 2 @@ -15,7 +15,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn rfork "int flags" .Sh DESCRIPTION Forking, vforking or rforking are the only ways new processes are created. ==== //depot/projects/ia64_epc/lib/libc/sys/vfork.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.21 2002/12/27 12:15:29 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.22 2003/04/27 21:01:34 robert Exp $ .\" .Dd June 4, 1993 .Dt VFORK 2 @@ -42,7 +42,7 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft int +.Ft pid_t .Fn vfork void .Sh DESCRIPTION The ==== //depot/projects/ia64_epc/lib/libpthread/thread/thr_sig.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.46 2003/04/18 05:04:16 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.47 2003/04/28 21:35:06 deischen Exp $ */ #include #include @@ -258,7 +258,7 @@ thr_sig_find(struct kse *curkse, int sig, siginfo_t *info) { int handler_installed; - struct pthread *pthread, *pthread_next; + struct pthread *pthread; struct pthread *suspended_thread, *signaled_thread; DBG_MSG("Looking for thread to handle signal %d\n", sig); @@ -285,14 +285,7 @@ signaled_thread = NULL; KSE_LOCK_ACQUIRE(curkse, &_thread_list_lock); - for (pthread = TAILQ_FIRST(&_thread_list); - pthread != NULL; pthread = pthread_next) { - /* - * Grab the next thread before possibly destroying - * the link entry. - */ - pthread_next = TAILQ_NEXT(pthread, pqe); - + TAILQ_FOREACH(pthread, &_thread_list, tle) { if ((pthread->state == PS_SIGWAIT) && sigismember(pthread->data.sigwait, sig)) { /* Take the scheduling lock. */ ==== //depot/projects/ia64_epc/libexec/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.53 2003/01/02 20:44:41 jmallett Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.55 2003/04/27 06:16:52 imp Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -28,7 +28,6 @@ talkd \ tcpd \ tftpd \ - xtend \ ypxfr .if !defined(NO_BIND) ==== //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -2195,9 +2195,8 @@ The AlphaServer 4x00 machines are intended as small enterprise servers. Expect a 30" high pedestal cabinet or alternatively - the same system box in a 19" rack. This is medium iron, not - a typical hobbyist system. Rawhides are multi-CPU machines, up to - 4 CPUs can be in a single machine. Basic disk storage is housed in + the same system box in a 19" rack. Rawhides are multi-CPU machines, + up to 4 CPUs can be in a single machine. Basic disk storage is housed in one or two StorageWorks shelves at the bottom of the pedestal. The Rawhides intended for the NT market are designated DIGITAL Server 7300 (5/400 CPU), DIGITAL Server 7305 (5/533 CPU). A @@ -2211,7 +2210,7 @@ cache: 4 Mbytes per CPU. EV5 300 MHz was also - available cache-less. 8 Mbytes for EV5 600Mhz + available cache-less. 8 Mbytes for EV56 600Mhz memory bus: 128 bit with ECC @@ -2232,18 +2231,19 @@ Rawhide uses a maximum of 8 RAM modules. These modules are used in pairs and supply 72 bits to the bus (this includes ECC bits). - Memory can be EDO RAM or synchronous DRAM. A fully populated Rawhide - has 4 pairs of memory modules. Given the choice use SDRAM for + Memory can be EDO RAM or synchronous DRAM. A fully populated AS4100 + has 4 pairs of memory modules. The AS4000 model is limited to 2 pairs + of memory modules. Given the choice use SDRAM for best performance. The highest capacity memory board must be in memory slot 0. A mix of memory board sizes is allowed. A mix - of EDO and SDRAM is also reported as working (assuming you don't + of EDO and SDRAM works as well (assuming you don't try to mix EDO and SDRAM in one module pair). A mix of EDO and SDRAM results in the entire memory subsystem running at the slower EDO timing Rawhide has an embedded Symbios 810 chip that gives you a narrow fast-SCSI bus. Generally only the SCSI CDROM is driven by - this interface. + this interface. Rawhides are available with a 8 64-bit PCI / 3 EISA slot expansion backplanes (called Saddle modules). There @@ -2262,12 +2262,21 @@ EISA slots are currently unsupported, but the Compaq Qvision EISA VGA adapter is treated as an ISA device. It therefore works - OK as a console. + OK as a console. In case you use EISA options in your machine you + must run the EISA Configuration Utility (ECU) from floppy. Do yourself + a favor and use the Tru64/OpenVMS ECU, and not the WindowsNT ECU. + Rawhide employs an I2C based power controller system. If you want to be sure all power is removed from the system remove the mains cables from the system. + Rawhide comes with RCM functionality, which means you can + power it on/off remotely, reset it etc. See also the description for + RMC in the DS10 section of this document. RCM versus RMC is not a typo, + the various documentation I consulted used both acronyms + interchangably. + The kernel config file must contain: options DEC_KN300 cpu EV5 ==== //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.8#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.68 2003/03/08 13:42:42 tjr Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.69 2003/04/28 16:47:40 sam Exp $ .\" -.Dd July 2, 2001 +.Dd April 28, 2003 .Dt IFCONFIG 8 .Os .Sh NAME @@ -302,6 +302,18 @@ .It Fl mediaopt Ar opts If the driver supports the media selection system, disable the specified media options on the interface. +.It Cm mode Ar mode +If the driver supports the media selection system, set the specified +operating mode on the interface to +.Ar mode . +For IEEE 802.11 wireless interfaces that support multiple operating modes +this directive is used to select between 802.11a (\c +.Dq 11a ), +802.11b (\c +.Dq 11b ), +and 802.11g (\c +.Dq 11g ) +operating modes. .It Cm rxcsum , txcsum If the driver supports user-configurable checksum offloading, enable receive (or transmit) checksum offloading on the interface. @@ -454,7 +466,7 @@ See the .Ar address option above for more information. -.\" see +3\" see .\" Xr eon 5 . .\" .It Cm nsellength Ar n .\" .Pf ( Tn ISO ==== //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.89 2003/04/15 06:25:58 mdodd Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.90 2003/04/28 16:37:38 sam Exp $"; #endif /* not lint */ #include @@ -236,6 +236,7 @@ { "-monitor", -IFF_MONITOR, setifflags }, #ifdef USE_IF_MEDIA { "media", NEXTARG, setmedia }, + { "mode", NEXTARG, setmediamode }, { "mediaopt", NEXTARG, setmediaopt }, { "-mediaopt", NEXTARG, unsetmediaopt }, #endif ==== //depot/projects/ia64_epc/sbin/ifconfig/ifconfig.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.9 2002/10/23 22:50:04 rwatson Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.10 2003/04/28 16:37:38 sam Exp $ */ extern struct ifreq ifr; @@ -42,6 +42,7 @@ struct afswtch; extern void setmedia(const char *, int, int, const struct afswtch *rafp); +extern void setmediamode(const char *, int, int, const struct afswtch *rafp); extern void setmediaopt(const char *, int, int, const struct afswtch *rafp); extern void unsetmediaopt(const char *, int, int, const struct afswtch *rafp); extern void media_status(int s, struct rt_addrinfo *); ==== //depot/projects/ia64_epc/sbin/ifconfig/ifmedia.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $ */ -/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.12 2002/04/18 17:14:09 imp Exp $ */ +/* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.13 2003/04/28 16:37:38 sam Exp $ */ /* * Copyright (c) 1997 Jason R. Thorpe. @@ -91,6 +91,7 @@ static void domediaopt(const char *, int, int); static int get_media_subtype(int, const char *); +static int get_media_mode(int, const char *); static int get_media_options(int, const char *); static int lookup_media_word(struct ifmedia_description *, const char *); static void print_media_word(int, int); @@ -220,7 +221,7 @@ IFM_TYPE(first_type) | subtype; if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) - err(1, "SIOCSIFMEDIA"); + err(1, "SIOCSIFMEDIA (media)"); } void @@ -278,7 +279,49 @@ ifr.ifr_media |= options; if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) - err(1, "SIOCSIFMEDIA"); + err(1, "SIOCSIFMEDIA (mediaopt)"); +} + + +void +setmediamode(const char *val, int d, int s, const struct afswtch *afp) +{ + struct ifmediareq ifmr; + int *mwords, mode; + + (void) memset(&ifmr, 0, sizeof(ifmr)); + (void) strncpy(ifmr.ifm_name, name, sizeof(ifmr.ifm_name)); + + /* + * We must go through the motions of reading all + * supported media because we need to know both + * the current media type and the top-level type. + */ + + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) + err(1, "SIOCGIFMEDIA"); + + if (ifmr.ifm_count == 0) + errx(1, "%s: no media types?", name); + + mwords = (int *)malloc(ifmr.ifm_count * sizeof(int)); + if (mwords == NULL) + err(1, "malloc"); + + ifmr.ifm_ulist = mwords; + if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) + err(1, "SIOCGIFMEDIA"); + + mode = get_media_mode(IFM_TYPE(mwords[0]), val); + + free(mwords); + + strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + ifr.ifr_media = ifmr.ifm_current; + ifr.ifr_media = (ifmr.ifm_current & ~IFM_MMASK) | IFM_MAKEMODE(mode); + + if (ioctl(s, SIOCSIFMEDIA, (caddr_t)&ifr) < 0) + err(1, "SIOCSIFMEDIA (mode)"); } /********************************************************************** @@ -324,6 +367,9 @@ static struct ifmedia_description ifm_subtype_ieee80211_option_descriptions[] = IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS; +struct ifmedia_description ifm_subtype_ieee80211_mode_descriptions[] = + IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS; + static struct ifmedia_description ifm_subtype_shared_descriptions[] = IFM_SUBTYPE_SHARED_DESCRIPTIONS; @@ -342,6 +388,10 @@ struct ifmedia_description *desc; int alias; } options[3]; + struct { + struct ifmedia_description *desc; + int alias; + } modes[2]; }; /* must be in the same order as IFM_TYPE_DESCRIPTIONS */ @@ -359,6 +409,9 @@ { &ifm_subtype_ethernet_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { NULL, 0 }, + }, }, { { @@ -373,6 +426,9 @@ { &ifm_subtype_tokenring_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { NULL, 0 }, + }, }, { { @@ -387,6 +443,9 @@ { &ifm_subtype_fddi_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { NULL, 0 }, + }, }, { { @@ -401,6 +460,10 @@ { &ifm_subtype_ieee80211_option_descriptions[0], 0 }, { NULL, 0 }, }, + { + { &ifm_subtype_ieee80211_mode_descriptions[0], 0 }, + { NULL, 0 }, + }, }, }; @@ -425,7 +488,30 @@ return (rval); } errx(1, "unknown media subtype: %s", val); - /* NOTREACHED */ + /*NOTREACHED*/ +} + +static int +get_media_mode(int type, const char *val) +{ + struct ifmedia_description *desc; + struct ifmedia_type_to_subtype *ttos; + int rval, i; + + /* Find the top-level interface type. */ + for (desc = ifm_type_descriptions, ttos = ifmedia_types_to_subtypes; + desc->ifmt_string != NULL; desc++, ttos++) + if (type == desc->ifmt_word) + break; + if (desc->ifmt_string == NULL) + errx(1, "unknown media mode 0x%x", type); + + for (i = 0; ttos->modes[i].desc != NULL; i++) { + rval = lookup_media_word(ttos->modes[i].desc, val); + if (rval != -1) + return (rval); + } + return -1; } static int @@ -523,6 +609,25 @@ return NULL; } +static struct ifmedia_description *get_mode_desc(int ifmw, + struct ifmedia_type_to_subtype *ttos) +{ + int i; + struct ifmedia_description *desc; + + for (i = 0; ttos->modes[i].desc != NULL; i++) { + if (ttos->modes[i].alias) + continue; + for (desc = ttos->modes[i].desc; + desc->ifmt_string != NULL; desc++) { + if (IFM_MODE(ifmw) == desc->ifmt_word) + return desc; + } + } + + return NULL; +} + static void print_media_word(int ifmw, int print_toptype) { @@ -560,6 +665,12 @@ printf("%s", desc->ifmt_string); + if (print_toptype) { + desc = get_mode_desc(ifmw, ttos); + if (desc != NULL) + printf(" mode %s", desc->ifmt_string); + } + /* Find options. */ for (i = 0; ttos->options[i].desc != NULL; i++) { if (ttos->options[i].alias) @@ -609,6 +720,10 @@ got_subtype: printf("media %s", desc->ifmt_string); + desc = get_mode_desc(ifmw, ttos); + if (desc != NULL) + printf(" mode %s", desc->ifmt_string); + /* Find options. */ for (i = 0; ttos->options[i].desc != NULL; i++) { if (ttos->options[i].alias) ==== //depot/projects/ia64_epc/sbin/mdconfig/mdconfig.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.18 2003/03/03 13:05:00 phk Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.19 2003/04/27 01:46:56 dougb Exp $ .\" .Dd December 31, 2000 .Dt MDCONFIG 8 @@ -168,6 +168,7 @@ .Xr md 4 , .Xr disklabel 8 , .Xr fdisk 8 , +.Xr mdmfs 8 , .Xr malloc 9 .Sh HISTORY The ==== //depot/projects/ia64_epc/sbin/mdmfs/Makefile#2 (text+ko) ==== @@ -1,6 +1,8 @@ -# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.2 2001/12/04 02:19:50 obrien Exp $ +# $FreeBSD: src/sbin/mdmfs/Makefile,v 1.5 2003/04/27 01:40:45 dougb Exp $ PROG= mdmfs +LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs MAN= mdmfs.8 +MLINKS+= mdmfs.8 mount_mfs.8 .include ==== //depot/projects/ia64_epc/sbin/mdmfs/mdmfs.8#2 (text+ko) ==== @@ -23,13 +23,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.14 2002/12/27 12:15:32 schweikh Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.15 2003/04/27 01:40:45 dougb Exp $ .\" .Dd August 5, 2001 .Dt MDMFS 8 .Os .Sh NAME -.Nm mdmfs +.Nm mdmfs , +.Nm mount_mfs .Nd configure and mount an in-memory file system using the .Xr md 4 driver @@ -306,7 +307,7 @@ can be useful by itself. Since .Xr mount_mfs 8 -has some silly defaults, a +had some silly defaults, a .Dq full compatibility mode is provided for the case where bug-to-bug compatibility is desired. .Pp ==== //depot/projects/ia64_epc/sbin/sunlabel/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.5 2003/04/23 08:25:20 phk Exp $ +# $FreeBSD: src/sbin/sunlabel/Makefile,v 1.6 2003/04/27 21:24:05 jake Exp $ PROG=sunlabel SRCS=sunlabel.c geom_sunlabel_enc.c @@ -6,7 +6,7 @@ WARNS=5 DDADD= ${LIBGEOM} -LDADD= -lgeom +LDADD= -lgeom -lbsdxml -lsbuf .PATH: ${.CURDIR}/../../sys/geom ==== //depot/projects/ia64_epc/share/examples/pppd/ppp.deny.sample#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.9 2002/06/28 15:46:29 maxim Exp $ +# $FreeBSD: src/share/examples/pppd/ppp.deny.sample,v 1.10 2003/04/28 08:36:45 maxim Exp $ # # list of users disallowed any pppd access via 'system # password login'. @@ -19,7 +19,6 @@ bind ftp uucp -xten pop www nobody ==== //depot/projects/ia64_epc/share/man/man4/asr.4#4 (text+ko) ==== @@ -4,7 +4,7 @@ .\" .\" Manpage cleanup by: Jeroen Ruigrok van der Werven .\" -.\" $FreeBSD: src/share/man/man4/asr.4,v 1.15 2003/04/22 09:39:10 ru Exp $ +.\" $FreeBSD: src/share/man/man4/asr.4,v 1.16 2003/04/27 18:45:07 ru Exp $ .\" .Dd October 27, 2000 .Dt ASR 4 @@ -52,12 +52,9 @@ .It Adaptec SmartRAID PM3757 .It -DEC KZPCC-AC (LVD 1-ch, 4MB or 16MB cache) -.It -DEC KZPCC-CE (LVD 3-ch, 64MB cache) -.It -DEC KZPCC-XC (LVD 1-ch, 16MB cache) -.It +DEC KZPCC-AC (LVD 1-ch, 4MB or 16MB cache), +DEC KZPCC-CE (LVD 3-ch, 64MB cache), +DEC KZPCC-XC (LVD 1-ch, 16MB cache), DEC KZPCC-XE (LVD 3-ch, 64MB cache) -- rebadged SmartRAID V Millennium .El .Pp ==== //depot/projects/ia64_epc/share/man/man4/man4.i386/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.146 2003/04/20 22:01:37 obrien Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.147 2003/04/27 05:39:10 imp Exp $ MAN= aic.4 alpm.4 amdpm.4 apm.4 ar.4 asc.4 \ cs.4 cx.4 cy.4 \ @@ -7,7 +7,7 @@ meteor.4 mse.4 npx.4 \ pae.4 pcf.4 perfmon.4 pnp.4 pnpbios.4 \ ray.4 rdp.4 sbni.4 smapi.4 scd.4 \ - spkr.4 sr.4 streams.4 svr4.4 tw.4 \ + spkr.4 sr.4 streams.4 svr4.4 \ tx.4 viapm.4 vpd.4 vx.4 \ wd.4 wl.4 wt.4 ==== //depot/projects/ia64_epc/share/man/man4/md.4#2 (text+ko) ==== @@ -5,7 +5,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/share/man/man4/md.4,v 1.10 2002/12/12 17:25:56 ru Exp $ +.\" $FreeBSD: src/share/man/man4/md.4,v 1.11 2003/04/27 01:46:56 dougb Exp $ .\" .Dd March 9, 2001 .Dt MD 4 @@ -61,6 +61,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:33:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E763A37B405; Mon, 28 Apr 2003 16:33:42 -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 979C737B404 for ; Mon, 28 Apr 2003 16:33:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F3E843FA3 for ; Mon, 28 Apr 2003 16:33:42 -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 h3SNXf0U096303 for ; Mon, 28 Apr 2003 16:33:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNXf4b096295 for perforce@freebsd.org; Mon, 28 Apr 2003 16:33:41 -0700 (PDT) Date: Mon, 28 Apr 2003 16:33:41 -0700 (PDT) Message-Id: <200304282333.h3SNXf4b096295@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 30009 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: Mon, 28 Apr 2003 23:33:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=30009 Change 30009 by peter@peter_daintree on 2003/04/28 16:32:50 s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/conf/kern.mk#6 edit Differences ... ==== //depot/projects/hammer/sys/conf/kern.mk#6 (text+ko) ==== @@ -53,10 +53,10 @@ .endif # -# For AMD x86-64, use a medium model for now. We'll switch to "kernel" +# For AMD64, use a medium model for now. We'll switch to "kernel" # once pmap is ready. # -.if ${MACHINE_ARCH} == "x86_64" +.if ${MACHINE_ARCH} == "amd64" CFLAGS+= -mcmodel=medium -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float .endif From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:39:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9F3237B404; Mon, 28 Apr 2003 16:39:50 -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 8331437B401 for ; Mon, 28 Apr 2003 16:39:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18C3D43F85 for ; Mon, 28 Apr 2003 16:39:50 -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 h3SNdn0U000366 for ; Mon, 28 Apr 2003 16:39:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNdnCe000361 for perforce@freebsd.org; Mon, 28 Apr 2003 16:39:49 -0700 (PDT) Date: Mon, 28 Apr 2003 16:39:49 -0700 (PDT) Message-Id: <200304282339.h3SNdnCe000361@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 30010 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: Mon, 28 Apr 2003 23:39:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=30010 Change 30010 by peter@peter_overcee on 2003/04/28 16:38:56 argh. missed a submit. s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#31 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#31 (text+ko) ==== @@ -81,8 +81,8 @@ #include #include -#include -#include +#include +#include #include From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:40:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40BC737B404; Mon, 28 Apr 2003 16:40:53 -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 E5FB137B401 for ; Mon, 28 Apr 2003 16:40:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8033B43FBF for ; Mon, 28 Apr 2003 16:40:52 -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 h3SNeq0U001071 for ; Mon, 28 Apr 2003 16:40:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNepPZ001058 for perforce@freebsd.org; Mon, 28 Apr 2003 16:40:51 -0700 (PDT) Date: Mon, 28 Apr 2003 16:40:51 -0700 (PDT) Message-Id: <200304282340.h3SNepPZ001058@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 30011 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: Mon, 28 Apr 2003 23:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30011 Change 30011 by peter@peter_overcee on 2003/04/28 16:40:25 argh. forgot to submit. s/x86_64/amd64/ Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#33 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#25 edit .. //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#23 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#9 (text+ko) ==== @@ -74,7 +74,7 @@ #include #include -#include +#include #ifdef DEV_ISA #include ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#33 (text+ko) ==== @@ -283,7 +283,7 @@ * XXX it should be in a stand-alone file. It's still icu-dependent and * belongs in i386/isa. */ -#include "x86_64/isa/vector.s" +#include "amd64/isa/vector.s" .data ALIGN_DATA @@ -379,4 +379,4 @@ movq $0,TF_ERR(%rsp) /* XXX should be the error code */ jmp alltraps_with_regs_pushed -#include "x86_64/isa/icu_ipl.s" +#include "amd64/isa/icu_ipl.s" ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#25 (text+ko) ==== @@ -129,7 +129,7 @@ ASSYM(PCB_SIZE, sizeof(struct pcb)); -ASSYM(COMMON_TSS_RSP0, offsetof(struct x86_64tss, tss_rsp0)); +ASSYM(COMMON_TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); ASSYM(TF_R15, offsetof(struct trapframe, tf_r15)); ASSYM(TF_R14, offsetof(struct trapframe, tf_r14)); ==== //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#9 (text+ko) ==== @@ -57,8 +57,8 @@ #include #include -#include -#include +#include +#include /* XXX - should be in header file: */ void printcpuinfo(void); @@ -72,7 +72,7 @@ int cpu_class; u_int cpu_exthigh; /* Highest arg to extended CPUID */ -char machine[] = "x86_64"; +char machine[] = "amd64"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); @@ -86,7 +86,7 @@ static char cpu_brand[48]; -static struct cpu_nameclass x86_64_cpus[] = { +static struct cpu_nameclass amd64_cpus[] = { { "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; @@ -97,9 +97,9 @@ u_int regs[4], i; char *brand; - cpu_class = x86_64_cpus[cpu].cpu_class; + cpu_class = amd64_cpus[cpu].cpu_class; printf("CPU: "); - strncpy(cpu_model, x86_64_cpus[cpu].cpu_name, sizeof (cpu_model)); + strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ if (cpu_high > 0 && ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#9 (text+ko) ==== @@ -61,10 +61,10 @@ #ifdef DEV_ISA #include -#include +#include #endif -#include -#include +#include +#include #include static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#23 (text+ko) ==== @@ -73,7 +73,7 @@ #include -#include +#include static void cpu_reset_real(void); extern int _ucodesel, _udatasel; From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:40:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6016237B40C; Mon, 28 Apr 2003 16:40:54 -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 AA37637B422 for ; Mon, 28 Apr 2003 16:40:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB5643FBF for ; Mon, 28 Apr 2003 16:40:53 -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 h3SNeq0U001089 for ; Mon, 28 Apr 2003 16:40:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNeq6M001079 for perforce@freebsd.org; Mon, 28 Apr 2003 16:40:52 -0700 (PDT) Date: Mon, 28 Apr 2003 16:40:52 -0700 (PDT) Message-Id: <200304282340.h3SNeq6M001079@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 30012 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: Mon, 28 Apr 2003 23:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=30012 Change 30012 by peter@peter_overcee on 2003/04/28 16:40:47 integrate i386_hammer branch. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#19 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#87 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#25 edit .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#11 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#19 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.98 2003/04/08 18:22:41 jake Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.99 2003/04/28 20:35:36 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -190,9 +190,33 @@ #define vtophys(va) pmap_kextract(((vm_offset_t) (va))) +static __inline pt_entry_t +pte_load(pt_entry_t *ptep) +{ + pt_entry_t r; + + r = *ptep; + return (r); +} + +static __inline pt_entry_t +pte_load_store(pt_entry_t *ptep, pt_entry_t pte) +{ + pt_entry_t r; + + r = *ptep; + *ptep = pte; + return (r); +} + #define pte_load_clear(pte) atomic_readandclear_long(pte) -#endif +#define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) +#define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) + +#define pde_store(pdep, pde) pte_store((pdep), (pde)) + +#endif /* _KERNEL */ /* * Pmap stuff ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#87 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.562 2003/04/18 20:09:03 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.563 2003/04/25 01:50:28 deischen Exp $ */ #include "opt_atalk.h" @@ -105,8 +105,8 @@ #endif #include -#include -#include +#include +#include #include #include #include @@ -546,7 +546,7 @@ static char dblfault_stack[PAGE_SIZE] __aligned(16); -struct x86_64tss common_tss; +struct amd64tss common_tss; /* software prototypes -- in more palatable form */ struct soft_segment_descriptor gdt_segs[] = { @@ -607,7 +607,7 @@ /* GPROC0_SEL 6 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct x86_64tss)-1,/* length - all address space */ + sizeof(struct amd64tss)-1,/* length - all address space */ SDT_SYSTSS, /* segment type */ SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ @@ -1454,7 +1454,7 @@ * Get machine context. */ int -get_mcontext(struct thread *td, mcontext_t *mcp) +get_mcontext(struct thread *td, mcontext_t *mcp, int clear_ret) { struct trapframe *tp; @@ -1475,9 +1475,14 @@ mcp->mc_rsi = tp->tf_rsi; mcp->mc_rbp = tp->tf_rbp; mcp->mc_rbx = tp->tf_rbx; - mcp->mc_rdx = tp->tf_rdx; mcp->mc_rcx = tp->tf_rcx; - mcp->mc_rax = tp->tf_rax; + if (clear_ret != 0) { + mcp->mc_rax = 0; + mcp->mc_rdx = 0; + } else { + mcp->mc_rax = tp->tf_rax; + mcp->mc_rdx = tp->tf_rdx; + } mcp->mc_rip = tp->tf_rip; mcp->mc_cs = tp->tf_cs; mcp->mc_rflags = tp->tf_rflags; ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#25 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.403 2003/04/03 23:44:35 jake Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.405 2003/04/28 20:35:36 jake Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -532,7 +532,7 @@ *PMAP1 = newpf | PG_RW | PG_V; pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR1); } - return PADDR1 + (x86_64_btop(va) & (NPTEPG - 1)); + return PADDR1 + (amd64_btop(va) & (NPTEPG - 1)); } return (0); } @@ -582,7 +582,7 @@ pt_entry_t *pte; pte = vtopte(va); - *pte = pa | PG_RW | PG_V | PG_G; + pte_store(pte, pa | PG_RW | PG_V | PG_G); } /* @@ -595,7 +595,7 @@ pt_entry_t *pte; pte = vtopte(va); - *pte = 0; + pte_clear(pte); } /* @@ -917,7 +917,7 @@ * Do an invltlb to make the invalidated mapping * take effect immediately. */ - pteva = VM_MAXUSER_ADDRESS + x86_64_ptob(m->pindex); + pteva = VM_MAXUSER_ADDRESS + amd64_ptob(m->pindex); pmap_invalidate_page(pmap, pteva); } @@ -1143,7 +1143,7 @@ */ if ((m->flags & PG_ZERO) == 0) { if (pmap_is_current(pmap)) { - pteva = VM_MAXUSER_ADDRESS + x86_64_ptob(ptepindex); + pteva = VM_MAXUSER_ADDRESS + amd64_ptob(ptepindex); bzero((caddr_t) pteva, PAGE_SIZE); } else { pmap_zero_page(m); @@ -1173,7 +1173,7 @@ /* * Get the page directory entry */ - ptepa = (vm_offset_t) pmap->pm_pdir[ptepindex]; + ptepa = pmap->pm_pdir[ptepindex]; /* * This supports switching from a 2MB page to a @@ -1298,6 +1298,7 @@ vm_paddr_t ptppaddr; vm_page_t nkpg; pd_entry_t newpdir; + pt_entry_t *pde; s = splhigh(); mtx_assert(&kernel_map->system_mtx, MA_OWNED); @@ -1333,7 +1334,8 @@ mtx_lock_spin(&allpmaps_lock); LIST_FOREACH(pmap, &allpmaps, pm_list) { - *pmap_pde(pmap, kernel_vm_end) = newpdir; + pde = pmap_pde(pmap, kernel_vm_end); + pde_store(pde, newpdir); } mtx_unlock_spin(&allpmaps_lock); kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); @@ -1728,7 +1730,7 @@ pbits &= ~PG_RW; if (pbits != *pte) { - *pte = pbits; + pte_store(pte, pbits); anychanged = 1; } } @@ -1837,7 +1839,7 @@ if ((prot & VM_PROT_WRITE) && (origpte & PG_V)) { if ((origpte & PG_RW) == 0) { - *pte |= PG_RW; + pte_store(pte, origpte | PG_RW); pmap_invalidate_page(pmap, va); } return; @@ -1906,7 +1908,7 @@ * to update the pte. */ if ((origpte & ~(PG_M|PG_A)) != newpte) { - *pte = newpte | PG_A; + pte_store(pte, newpte | PG_A); /*if (origpte)*/ { pmap_invalidate_page(pmap, va); } @@ -2010,9 +2012,9 @@ * Now validate mapping with RO protection */ if (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) - *pte = pa | PG_V | PG_U; + pte_store(pte, pa | PG_V | PG_U); else - *pte = pa | PG_V | PG_U | PG_MANAGED; + pte_store(pte, pa | PG_V | PG_U | PG_MANAGED); return mpte; } @@ -2101,8 +2103,8 @@ pmap->pm_stats.resident_count += size >> PAGE_SHIFT; npdes = size >> PDRSHIFT; for(i = 0; i < npdes; i++) { - pmap->pm_pdir[ptepindex] = - ptepa | PG_U | PG_RW | PG_V | PG_PS; + pde_store(&pmap->pm_pdir[ptepindex], + ptepa | PG_U | PG_RW | PG_V | PG_PS); ptepa += NBPDR; ptepindex += 1; } @@ -2110,7 +2112,7 @@ return; } - psize = x86_64_btop(size); + psize = amd64_btop(size); if ((object->type != OBJT_VNODE) || ((limit & MAP_PREFAULT_PARTIAL) && (psize > MAX_INIT_PT) && @@ -2158,7 +2160,7 @@ vm_page_busy(p); vm_page_unlock_queues(); mpte = pmap_enter_quick(pmap, - addr + x86_64_ptob(tmpidx), p, mpte); + addr + amd64_ptob(tmpidx), p, mpte); vm_page_lock_queues(); vm_page_wakeup(p); } @@ -2584,7 +2586,7 @@ pv->pv_pmap->pm_stats.resident_count--; - *pte = 0; + pte_clear(pte); /* * Update the vm_page_t clean and reference bits. @@ -2699,9 +2701,9 @@ if (pbits & PG_M) { vm_page_dirty(m); } - *pte = pbits & ~(PG_M|PG_RW); + pte_store(pte, pbits & ~(PG_M|PG_RW)); } else { - *pte = pbits & ~bit; + pte_store(pte, pbits & ~bit); } pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } @@ -2746,6 +2748,7 @@ { register pv_entry_t pv, pvf, pvn; pt_entry_t *pte; + pt_entry_t v; int s; int rtval = 0; @@ -2770,9 +2773,8 @@ pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); - if (pte && (*pte & PG_A)) { - *pte &= ~PG_A; - + if (pte && ((v = pte_load(pte)) & PG_A) != 0) { + pte_store(pte, v & ~PG_A); pmap_invalidate_page(pv->pv_pmap, pv->pv_va); rtval++; @@ -2885,7 +2887,7 @@ size = roundup(offset + size, PAGE_SIZE); for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) { pte = vtopte(tmpva); - *pte = 0; + pte_clear(pte); } pmap_invalidate_range(kernel_pmap, va, tmpva); kmem_free(kernel_map, base, size); ==== //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.80 2003/04/11 14:45:07 davidxu Exp $ + * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.81 2003/04/25 20:04:02 jhb Exp $ * */ @@ -53,12 +53,14 @@ struct thread *td; register struct sysarch_args *uap; { - int error = 0; + int error; + mtx_lock(&Giant); switch(uap->op) { default: - error = EOPNOTSUPP; + error = EINVAL; break; } + mtx_unlock(&Giant); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Apr 28 16:47:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF3BC37B404; Mon, 28 Apr 2003 16:47:01 -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 958C137B401 for ; Mon, 28 Apr 2003 16:47:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A64C43F93 for ; Mon, 28 Apr 2003 16:47:01 -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 h3SNl00U006729 for ; Mon, 28 Apr 2003 16:47:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3SNl0XO006588 for perforce@freebsd.org; Mon, 28 Apr 2003 16:47:00 -0700 (PDT) Date: Mon, 28 Apr 2003 16:47:00 -0700 (PDT) Message-Id: <200304282347.h3SNl0XO006588@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 30013 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: Mon, 28 Apr 2003 23:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=30013 Change 30013 by peter@peter_daintree on 2003/04/28 16:46:22 this function is 100% mpsafe even without mtx_lock(&Giant); Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#12 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#12 (text+ko) ==== @@ -55,12 +55,10 @@ { int error; - mtx_lock(&Giant); switch(uap->op) { default: error = EINVAL; break; } - mtx_unlock(&Giant); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Apr 28 17:10:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC2E37B404; Mon, 28 Apr 2003 17:10: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 45AD337B401 for ; Mon, 28 Apr 2003 17:10:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E341F43FAF for ; Mon, 28 Apr 2003 17:10:29 -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 h3T0AT0U028067 for ; Mon, 28 Apr 2003 17:10:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T0ATm4028061 for perforce@freebsd.org; Mon, 28 Apr 2003 17:10:29 -0700 (PDT) Date: Mon, 28 Apr 2003 17:10:29 -0700 (PDT) Message-Id: <200304290010.h3T0ATm4028061@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 30014 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, 29 Apr 2003 00:10:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30014 Change 30014 by peter@peter_daintree on 2003/04/28 17:10:07 Skillfully avoid a panic when doing sysctl -a. For reasons I do not yet understand, g_conftxt and friends all explode in strlen() via the sbuf_printf call paths. I suspect a varargs bug in gcc. Affected files ... .. //depot/projects/hammer/sys/geom/geom_kern.c#10 edit Differences ... ==== //depot/projects/hammer/sys/geom/geom_kern.c#10 (text+ko) ==== @@ -164,6 +164,7 @@ SHUTDOWN_PRI_FIRST); } +#ifndef __amd64__ /* provokes compiler bug in geom_dump.c */ static int sysctl_kern_geom_conftxt(SYSCTL_HANDLER_ARGS) { @@ -205,9 +206,11 @@ sbuf_delete(sb); return error; } +#endif SYSCTL_NODE(_kern, OID_AUTO, geom, CTLFLAG_RW, 0, "GEOMetry management"); +#ifndef __amd64__ /* provokes compiler bug in geom_dump.c */ SYSCTL_PROC(_kern_geom, OID_AUTO, confxml, CTLTYPE_STRING|CTLFLAG_RD, 0, 0, sysctl_kern_geom_confxml, "", "Dump the GEOM config in XML"); @@ -219,6 +222,7 @@ SYSCTL_PROC(_kern_geom, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RD, 0, 0, sysctl_kern_geom_conftxt, "", "Dump the GEOM config in txt"); +#endif SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLFLAG_RW, &g_debugflags, 0, ""); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:08:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DDB237B404; Mon, 28 Apr 2003 18:08:41 -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 3792D37B401 for ; Mon, 28 Apr 2003 18:08:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D856A43F75 for ; Mon, 28 Apr 2003 18:08:40 -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 h3T18e0U070712 for ; Mon, 28 Apr 2003 18:08:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T18ei4070705 for perforce@freebsd.org; Mon, 28 Apr 2003 18:08:40 -0700 (PDT) Date: Mon, 28 Apr 2003 18:08:40 -0700 (PDT) Message-Id: <200304290108.h3T18ei4070705@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 30015 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, 29 Apr 2003 01:08:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30015 Change 30015 by peter@peter_daintree on 2003/04/28 18:08:39 set MACHINE_ARCH etc to amd64 here too Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.x86_64#12 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.x86_64#12 (text+ko) ==== @@ -27,7 +27,7 @@ SIZE= x86_64-unknown-freebsd5.0-size OBJCOPY= x86_64-unknown-freebsd5.0-objcopy OBJDUMP= x86_64-unknown-freebsd5.0-objdump -MACHINE_ARCH= x86_64 +MACHINE_ARCH= amd64 #COPTFLAGS= # none, -O crashes the 3.2 cross compiler I have NO_CPU_COPTFLAGS= true @@ -46,7 +46,7 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=x86_64 +MKMODULESENV+= MACHINE=amd64 %BEFORE_DEPEND From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:12:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1255337B404; Mon, 28 Apr 2003 18:12:47 -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 BE0E837B401 for ; Mon, 28 Apr 2003 18:12:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 690CC43F85 for ; Mon, 28 Apr 2003 18:12:46 -0700 (PDT) (envelope-from jmallett@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 h3T1Ck0U073240 for ; Mon, 28 Apr 2003 18:12:46 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1CjTa073232 for perforce@freebsd.org; Mon, 28 Apr 2003 18:12:45 -0700 (PDT) Date: Mon, 28 Apr 2003 18:12:45 -0700 (PDT) Message-Id: <200304290112.h3T1CjTa073232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30016 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, 29 Apr 2003 01:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=30016 Change 30016 by jmallett@jmallett_dalek on 2003/04/28 18:12:09 Real clockframe. Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#9 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#9 (text+ko) ==== @@ -31,8 +31,26 @@ #include -#define CLKF_USERMODE(cfp) (0) -#define CLKF_PC(cfp) (0) +/* + * Arguments to hardclock and gatherstats encapsulate the previous + * machine state in an opaque clockframe. + */ +struct clockframe { + int pc; /* program counter at time of interrupt */ + int sr; /* status register at time of interrupt */ + int ppl; /* previous priority level at time of interrupt */ +}; + +#define CLKF_USERMODE(framep) ((framep)->sr & MIPS_SR_KSU_USER) +#define CLKF_BASEPRI(framep) \ + ((~(framep)->sr & (MIPS_INT_MASK | MIPS_SR_INT_IE)) == 0) + +#ifdef IPL_ICU_MASK +#define ICU_CLKF_BASEPRI(framep) ((framep)->ppl == 0) +#endif + +#define CLKF_PC(framep) ((framep)->pc) +#define CLKF_INTR(framep) (0) #define TRAPF_PC(tframe) ((tframe)->tf_regs[TF_EPC]) From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:13:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6925137B404; Mon, 28 Apr 2003 18:13:49 -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 1C5D237B401 for ; Mon, 28 Apr 2003 18:13:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E75743FB1 for ; Mon, 28 Apr 2003 18:13:48 -0700 (PDT) (envelope-from jmallett@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 h3T1Dm0U074241 for ; Mon, 28 Apr 2003 18:13:48 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1Dllf074233 for perforce@freebsd.org; Mon, 28 Apr 2003 18:13:47 -0700 (PDT) Date: Mon, 28 Apr 2003 18:13:47 -0700 (PDT) Message-Id: <200304290113.h3T1Dllf074233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30017 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, 29 Apr 2003 01:13:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30017 Change 30017 by jmallett@jmallett_dalek on 2003/04/28 18:12:49 Add NetBSD IP22 code. Extend the exception vectors for 64-bit addrs. Hide the BEV switchoff, it b0rks things good for now. Hide some unused code. Treat mips3 as mips64 for our purposes... Call vector_init manually. Call init_param stuff as early as it makes sense to. Have ARCS flush all caches on startup. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#16 edit .. //depot/projects/mips/sys/mips/include/cpuregs.h#5 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#17 edit .. //depot/projects/mips/sys/mips/sgimips/intr.h#3 edit .. //depot/projects/mips/sys/mips/sgimips/ip22.c#2 edit .. //depot/projects/mips/sys/mips/sgimips/ip22_cache.S#1 add .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#13 edit .. //depot/projects/mips/sys/mips/sgimips/sysconf.h#1 add Differences ... ==== //depot/projects/mips/sys/conf/files.mips#16 (text+ko) ==== @@ -37,6 +37,7 @@ # This stanza is model files, per platform then per model. mips/sgimips/ip22.c optional sgimips ip22 +mips/sgimips/ip22_cache.S optional sgimips ip22 # This stanza is device files. dev/arcbios/arcbios.c optional arcbios ==== //depot/projects/mips/sys/mips/include/cpuregs.h#5 (text+ko) ==== @@ -366,20 +366,20 @@ * * Common vectors: reset and UTLB miss. */ -#define MIPS_RESET_EXC_VEC 0xBFC00000 -#define MIPS_UTLB_MISS_EXC_VEC 0x80000000 +#define MIPS_RESET_EXC_VEC 0xFFFFFFFFBFC00000 +#define MIPS_UTLB_MISS_EXC_VEC 0xFFFFFFFF80000000 /* * MIPS-1 general exception vector (everything else) */ -#define MIPS1_GEN_EXC_VEC 0x80000080 +#define MIPS1_GEN_EXC_VEC 0xFFFFFFFF80000080 /* * MIPS-III exception vectors */ -#define MIPS3_XTLB_MISS_EXC_VEC 0x80000080 -#define MIPS3_CACHE_ERR_EXC_VEC 0x80000100 -#define MIPS3_GEN_EXC_VEC 0x80000180 +#define MIPS3_XTLB_MISS_EXC_VEC 0xFFFFFFFF80000080 +#define MIPS3_CACHE_ERR_EXC_VEC 0xFFFFFFFF80000100 +#define MIPS3_GEN_EXC_VEC 0xFFFFFFFF80000180 /* * TX79 (R5900) exception vectors @@ -390,7 +390,7 @@ /* * MIPS32/MIPS64 (and some MIPS3) dedicated interrupt vector. */ -#define MIPS3_INTR_EXC_VEC 0x80000200 +#define MIPS3_INTR_EXC_VEC 0xFFFFFFFF80000200 /* * Coprocessor 0 registers: ==== //depot/projects/mips/sys/mips/mips/machdep.c#17 (text+ko) ==== @@ -156,6 +156,7 @@ #include #include #include +#include #include #include #include @@ -177,13 +178,14 @@ static struct pcpu pcpu0; struct pcpu *pcpup = &pcpu0; +struct cpu_info cpu_info_store; + vm_offset_t kstack0; vm_paddr_t kstack0_phys; void mips_init(void) { - mips_vector_init(); cpu_identify(); proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); thread0.td_kstack = kstack0; @@ -572,9 +574,9 @@ memcpy((void *)MIPS3_GEN_EXC_VEC, mips64_exception, mips64_exceptionEnd - mips64_exception); +#if 0 /* XXX - why doesn't mipsNN_intr() work? */ if (mips64_intrEnd - mips64_intr > 0x80) panic("startup: interrupt exception vector code too large"); -#if 0 /* XXX - why doesn't mipsNN_intr() work? */ memcpy((void *)MIPS3_INTR_EXC_VEC, mips64_intr, mips64_intrEnd - mips64_intr); #else @@ -592,7 +594,8 @@ mips_dcache_wbinv_all(); /* Clear BEV in SR so we start handling our own exceptions */ - mips_cp0_status_write(mips_cp0_status_read() & ~MIPS_SR_BEV); + if (0) + mips_cp0_status_write(mips_cp0_status_read() & ~MIPS_SR_BEV); } /* @@ -714,6 +717,7 @@ * Now initialize our ISA-dependent function vector. */ switch (cpu_arch) { + case CPU_ARCH_MIPS3: case CPU_ARCH_MIPS64: mips3_cp0_wired_write(0); mips64_TBIA(mips_num_tlb_entries); @@ -726,7 +730,6 @@ cpu_halt(); } -/* XXX simonb: ugg, another ugly #ifdef check... */ /* * Install power-saving idle routines. */ ==== //depot/projects/mips/sys/mips/sgimips/intr.h#3 (text+ko) ==== @@ -68,11 +68,34 @@ #ifdef _KERNEL #ifndef LOCORE -/* - * XXX Fill in C code functionlets. - */ +#include +#include +#include + +#define NINTR 32 + +struct sgimips_intrhand { + LIST_ENTRY(sgimips_intrhand) + ih_q; + int (*ih_fun) __P((void *)); + void *ih_arg; + struct sgimips_intr *ih_intrhead; + int ih_pending; +}; + +struct sgimips_intr { + LIST_HEAD(,sgimips_intrhand) + intr_q; +#if notyet + struct evcnt ih_evcnt; +#endif + unsigned long intr_ipl; +}; + +extern struct sgimips_intrhand intrtab[]; #endif /* LOCORE */ #endif /* !_KERNEL */ #endif /* !_SGIMIPS_INTR_H_ */ + ==== //depot/projects/mips/sys/mips/sgimips/ip22.c#2 (text+ko) ==== @@ -1,5 +1,8 @@ -/*- - * Copyright (c) 2003 Juli Mallett. All rights reserved. +/* $NetBSD: ip22.c,v 1.14 2002/11/09 19:21:12 thorpej Exp $ */ + +/* + * Copyright (c) 2001, 2002 Rafal K. Boni + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,20 +12,19 @@ * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * - * 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$ + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. */ #include @@ -30,15 +32,57 @@ #include #include +#include +#include #include -#include +#include +#include #include +#include + +u_int32_t next_clk_intr; +u_int32_t missed_clk_intrs; +static unsigned long last_clk_intr; + +#if notyet +static struct evcnt mips_int5_evcnt = + EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "mips", "int 5 (clock)"); +static struct evcnt mips_spurint_evcnt = + EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, "mips", "spurious interrupts"); +#endif + +static u_int32_t iocwrite; /* IOC write register: read-only */ +static u_int32_t iocreset; /* IOC reset register: read-only */ + +void ip22_bus_reset(void); +int ip22_local0_intr(void); +int ip22_local1_intr(void); +int ip22_mappable_intr(void *); +void ip22_intr(u_int, u_int, u_int, u_int); +void ip22_intr_establish(int, int, int (*)(void *), void *); + +unsigned long ip22_clkread(void); +unsigned long ip22_cal_timer(u_int32_t, u_int32_t); + +/* ip22_cache.S */ +extern void ip22_sdcache_do_wbinv(vaddr_t, vaddr_t); +extern void ip22_sdcache_enable(void); +extern void ip22_sdcache_disable(void); + void ip22_init(void) { + u_int i; u_int32_t sysid; + u_int32_t int23addr; + unsigned long cps; + unsigned long ctrdiff[3]; + + /* enable watchdog timer, clear it */ + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00004) |= 0x100; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00014) = 0; sysid = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9858); @@ -48,4 +92,418 @@ mach_subtype = MACH_SGI_IP22_GUINESS; mach_boardrev = (sysid >> 1) & 0x0f; + + printf("IOC rev %d, machine %s, board rev %d\n", (sysid >> 5) & 0x07, + (sysid & 1) ? "Indigo2 (Fullhouse)" : "Indy (Guiness)", + (sysid >> 1) & 0x0f); + + if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) + int23addr = 0x1fbd9000; + else + int23addr = 0x1fbd9880; + + /* Reset timer interrupts */ + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x20) = 3; + + /* + * Reset Parallel port, Keyboard/mouse and EISA. Turn LED off. + * For Fullhouse, toggle magic GIO reset bit. + */ + iocreset = 0x17; + if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) + iocreset |= 0x08; + + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9870) = iocreset; + + /* + * Set the 10BaseT port to use UTP cable, set autoselect mode for + * the ethernet interface (AUI vs. TP), set the two serial ports + * to PC mode. + */ + iocwrite = 0x3a; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9878) = iocwrite; + + /* Clean out interrupt masks */ + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x04) = 0x00; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x0c) = 0x00; + + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14) = 0x00; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x18) = 0x00; + + /* Set the general control registers for Guiness */ + if (mach_subtype == MACH_SGI_IP22_GUINESS) { + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd9848) = 0xff; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fbd984c) = 0xff; + } + + platform.iointr = ip22_intr; + platform.bus_reset = ip22_bus_reset; + platform.intr_establish = ip22_intr_establish; + +#if maybenever + biomask = 0x0700; + netmask = 0x0700; + ttymask = 0x0f00; + clockmask = 0xbf00; +#endif + + /* Hardcode interrupts 7, 11 to mappable interrupt 0,1 handlers */ + intrtab[7].ih_fun = ip22_mappable_intr; + intrtab[7].ih_arg = (void*) 0; + + intrtab[11].ih_fun = ip22_mappable_intr; + intrtab[11].ih_arg = (void*) 1; + + /* Prime cache */ + ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38); + + cps = 0; + for(i = 0; i < sizeof(ctrdiff) / sizeof(ctrdiff[0]); i++) { + do { + ctrdiff[i] = ip22_cal_timer(int23addr + 0x3c, + int23addr + 0x38); + } while (ctrdiff[i] == 0); + + cps += ctrdiff[i]; + } + + cps = cps / (sizeof(ctrdiff) / sizeof(ctrdiff[0])); + + printf("Timer calibration, got %lu cycles (%lu, %lu, %lu)\n", cps, + ctrdiff[0], ctrdiff[1], ctrdiff[2]); + + platform.clkread = ip22_clkread; + + /* Counter on R4k/R4400/R4600/R5k counts at half the CPU frequency */ + curcpu()->ci_cpu_freq = 2 * cps * hz; + curcpu()->ci_cycles_per_hz = curcpu()->ci_cpu_freq / (2 * hz); + curcpu()->ci_divisor_delay = curcpu()->ci_cpu_freq / (2 * 1000000); + MIPS_SET_CI_RECIPRICAL(curcpu()); + +#if notyet + evcnt_attach_static(&mips_int5_evcnt); + evcnt_attach_static(&mips_spurint_evcnt); +#endif + + printf("CPU clock speed = %lu.%02luMhz\n", + curcpu()->ci_cpu_freq / 1000000, + (curcpu()->ci_cpu_freq / 10000) % 100); +} + +void +ip22_bus_reset(void) +{ + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000ec) = 0; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000fc) = 0; +} + +/* + * NB: Do not re-enable interrupts here -- reentrancy here can cause all + * sorts of Bad Things(tm) to happen, including kernel stack overflows. + */ +void +ip22_intr(status, cause, pc, ipending) + u_int32_t status; + u_int32_t cause; + u_int32_t pc; + u_int32_t ipending; +{ + u_int32_t newcnt; + struct clockframe cf; + + /* Tickle Indy/I2 MC watchdog timer */ + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00014) = 0; + + if (ipending & MIPS_INT_MASK_5) { + last_clk_intr = mips3_cp0_count_read(); + + next_clk_intr += curcpu()->ci_cycles_per_hz; + mips3_cp0_compare_write(next_clk_intr); + newcnt = mips3_cp0_count_read(); + + /* + * Missed one or more clock interrupts, so let's start + * counting again from the current value. + */ + if ((next_clk_intr - newcnt) & 0x80000000) { + missed_clk_intrs++; + + next_clk_intr = newcnt + curcpu()->ci_cycles_per_hz; + mips3_cp0_compare_write(next_clk_intr); + } + + cf.pc = pc; + cf.sr = status; + + hardclock(&cf); +#if notyet + mips_int5_evcnt.ev_count++; +#endif + + cause &= ~MIPS_INT_MASK_5; + } + + if (ipending & MIPS_INT_MASK_0) { + if (ip22_local0_intr()) + cause &= ~MIPS_INT_MASK_0; + } + + if (ipending & MIPS_INT_MASK_1) { + if (ip22_local1_intr()) + cause &= ~MIPS_INT_MASK_1; + } + + if (ipending & MIPS_INT_MASK_4) { + printf("IP22 bus error: cpu_stat %08x addr %08x, " + "gio_stat %08x addr %08x\n", + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000ec), + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000e4), + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000fc), + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa000f4)); + ip22_bus_reset(); + cause &= ~MIPS_INT_MASK_4; + } + +#if notyet + if (cause & status & MIPS_HARD_INT_MASK) + mips_spurint_evcnt.ev_count++; +#endif +} + +int +ip22_mappable_intr(void* arg) +{ + int i; + int ret; + int intnum; + u_int32_t mstat; + u_int32_t mmask; + u_int32_t int23addr; + int which = (int)arg; + + if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) + int23addr = 0x1fbd9000; + else + int23addr = 0x1fbd9880; + + ret = 0; + mstat = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x10); + mmask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14 + + (which * 4)); + + mstat &= mmask; + + for (i = 0; i < 8; i++) { + intnum = i + 16 + (which * 8); + if (mstat & (1 << i)) { + if (intrtab[intnum].ih_fun != NULL) + ret |= (intrtab[intnum].ih_fun) + (intrtab[intnum].ih_arg); + else + printf("Unexpected mappable interrupt %d\n", + intnum); + } + } + + return ret; +} + +int +ip22_local0_intr() +{ + int i; + int ret; + u_int32_t l0stat; + u_int32_t l0mask; + u_int32_t int23addr; + + if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) + int23addr = 0x1fbd9000; + else + int23addr = 0x1fbd9880; + + ret = 0; + l0stat = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x00); + l0mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x04); + + l0stat &= l0mask; + + for (i = 0; i < 8; i++) { + if (l0stat & (1 << i)) { + if (intrtab[i].ih_fun != NULL) + ret |= (intrtab[i].ih_fun)(intrtab[i].ih_arg); + else + printf("Unexpected local0 interrupt %d\n", i); + } + } + + return ret; +} + +int +ip22_local1_intr() +{ + int i; + int ret; + u_int32_t l1stat; + u_int32_t l1mask; + u_int32_t int23addr; + + if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) + int23addr = 0x1fbd9000; + else + int23addr = 0x1fbd9880; + + l1stat = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x08); + l1mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x0c); + + l1stat &= l1mask; + + ret = 0; + for (i = 0; i < 8; i++) { + if (l1stat & (1 << i)) { + if (intrtab[8 + i].ih_fun != NULL) + ret |= (intrtab[8 + i].ih_fun) + (intrtab[8 + i].ih_arg); + else + printf("Unexpected local1 interrupt %x\n", + 8 + i ); + } + } + + return ret; +} + +void +ip22_intr_establish(level, ipl, handler, arg) + int level; + int ipl; + int (*handler) __P((void *)); + void *arg; +{ + u_int32_t mask; + u_int32_t int23addr; + + if (level < 0 || level >= NINTR) + panic("invalid interrupt level"); + + if (intrtab[level].ih_fun != NULL) + panic("cannot share CPU interrupts"); + + intrtab[level].ih_fun = handler; + intrtab[level].ih_arg = arg; + + if (mach_subtype == MACH_SGI_IP22_FULLHOUSE) + int23addr = 0x1fbd9000; + else + int23addr = 0x1fbd9880; + + if (level < 8) { + mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4); + mask |= (1 << level); + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4) = mask; + } else if (level < 16) { + mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc); + mask |= (1 << (level - 8)); + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc) = mask; + } else if (level < 24) { + /* Map0 interrupt maps to l0 interrupt bit 7, so turn that on too */ + mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4); + mask |= (1 << 7); + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x4) = mask; + + mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14); + mask |= (1 << (level - 16)); + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x14) = mask; + } else { + /* Map1 interrupt maps to l1 interrupt bit 3, so turn that on too */ + mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc); + mask |= (1 << 3); + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0xc) = mask; + + mask = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x18); + mask |= (1 << (level - 24)); + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(int23addr + 0x18) = mask; + } +} + +unsigned long +ip22_clkread(void) +{ + uint32_t res, count; + + count = mips3_cp0_count_read() - last_clk_intr; + MIPS_COUNT_TO_MHZ(curcpu(), count, res); + return (res); +} + +unsigned long +ip22_cal_timer(u_int32_t tctrl, u_int32_t tcount) +{ + int s; + int roundtime; + int sampletime; + int startmsb, lsb, msb; + unsigned long startctr, endctr; + + /* + * NOTE: HZ must be greater than 15 for this to work, as otherwise + * we'll overflow the counter. We round the answer to hearest 1 + * MHz of the master (2x) clock. + */ + roundtime = (1000000 / hz) / 2; + sampletime = (1000000 / hz) + 0xff; + startmsb = (sampletime >> 8); + + s = splhigh(); + + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tctrl) = 0x80 | 0x30 | 0x04; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tcount) = sampletime & 0xff; + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tcount) = sampletime >> 8; + + startctr = mips3_cp0_count_read(); + + /* Wait for the MSB to count down to zero */ + do { + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tctrl) = 0x80 | 0x00; + lsb = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tcount) & 0xff; + msb = *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tcount) & 0xff; + + endctr = mips3_cp0_count_read(); + } while (msb); + + /* Turn off timer */ + *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(tctrl) = 0x80 | 0x30 | 0x08; + + splx(s); + + return (endctr - startctr) / roundtime * roundtime; +} + +void ip22_cache_init(void); + +void +ip22_cache_init(void) +{ + + /* + * If we don't have an R4000-style cache, then initialize the + * IP22 SysAD L2 cache. + * + * XXX: For now we disable the SysAD cache on R4600/R5k systems, + * as there's no code to drive it; also make sure to clear the + * flags used by the generic MIPS code so it doesn't attempt to + * use the L2. + */ + switch (MIPS_PRID_IMPL(cpu_id)) { + case MIPS_R4600: +#ifndef ENABLE_MIPS_R3NKK + case MIPS_R5000: +#endif + mips_sdcache_size = 0; + mips_sdcache_line_size = 0; + printf("disabling IP22 SysAD L2 cache\n"); + ip22_sdcache_disable(); + break; + } } ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#13 (text+ko) ==== @@ -34,7 +34,9 @@ #include #include +#include #include +#include #include #include @@ -56,6 +58,10 @@ int arcsmem, availmem; int mach_type, mach_subtype, mach_boardrev; +struct platform platform; + +struct sgimips_intrhand intrtab[NINTR]; + void platform_halt(void) { @@ -82,10 +88,15 @@ arcbios_init(MIPS_PHYS_TO_KSEG1(0x00001000)); arcbios_cnattach(); + ARCBIOS->FlushAllCaches(); + cpufreq = ARCBIOS->GetEnvironmentVariable("cpufreq"); if (cpufreq == NULL) panic("$cpufreq not set"); + /* Set up hz, among others. */ + init_param1(); + for (mtp = machines; mtp->identifier != NULL; mtp++) { if (strcmp(mtp->identifier, arcbios_system_identifier) == 0) break; @@ -141,6 +152,8 @@ printf("avail memory = %d (%d MB)\n", ctob(availmem), ctob(availmem) / (1024 * 1024)); + init_param2(ctob(availmem)); + mips_vector_init(); pmap_bootstrap(); mips_init(); } From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:19:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 019D037B404; Mon, 28 Apr 2003 18:19: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 ADAA137B401 for ; Mon, 28 Apr 2003 18:19:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55AD943FB1 for ; Mon, 28 Apr 2003 18:19:56 -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 h3T1Ju0U078162 for ; Mon, 28 Apr 2003 18:19:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1JtEH078158 for perforce@freebsd.org; Mon, 28 Apr 2003 18:19:55 -0700 (PDT) Date: Mon, 28 Apr 2003 18:19:55 -0700 (PDT) Message-Id: <200304290119.h3T1JtEH078158@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 30018 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, 29 Apr 2003 01:19:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=30018 Change 30018 by peter@peter_daintree on 2003/04/28 18:19:33 use the ia64 in_cksum, since it has the same endian by default. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/in_cksum.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/in_cksum.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/in_cksum.c,v 1.2 2003/02/13 08:56:41 grehan Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ /* @@ -71,19 +71,11 @@ } static const u_int32_t in_masks[] = { -#if 0 /*0 bytes*/ /*1 byte*/ /*2 bytes*/ /*3 bytes*/ 0x00000000, 0x000000FF, 0x0000FFFF, 0x00FFFFFF, /* offset 0 */ 0x00000000, 0x0000FF00, 0x00FFFF00, 0xFFFFFF00, /* offset 1 */ 0x00000000, 0x00FF0000, 0xFFFF0000, 0xFFFF0000, /* offset 2 */ 0x00000000, 0xFF000000, 0xFF000000, 0xFF000000, /* offset 3 */ -#else - /*0 bytes*/ /*1 byte*/ /*2 bytes*/ /*3 bytes*/ - 0x00000000, 0xFF000000, 0xFFFF0000, 0xFFFFFF00, /* offset 0 */ - 0x00000000, 0x00FF0000, 0x00FFFF00, 0x00FFFFFF, /* offset 1 */ - 0x00000000, 0x0000FF00, 0x0000FFFF, 0x0000FFFF, /* offset 2 */ - 0x00000000, 0x000000FF, 0x000000FF, 0x000000FF, /* offset 3 */ -#endif }; union l_util { @@ -227,7 +219,6 @@ skip_start: if (len < mlen) mlen = len; - if ((clen ^ (long) addr) & 1) sum += in_cksumdata(addr, mlen) << 8; else From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:28:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62B3737B404; Mon, 28 Apr 2003 18:28:07 -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 1989637B401 for ; Mon, 28 Apr 2003 18:28:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B75B243F93 for ; Mon, 28 Apr 2003 18:28:06 -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 h3T1S60U084663 for ; Mon, 28 Apr 2003 18:28:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1S6oA084659 for perforce@freebsd.org; Mon, 28 Apr 2003 18:28:06 -0700 (PDT) Date: Mon, 28 Apr 2003 18:28:06 -0700 (PDT) Message-Id: <200304290128.h3T1S6oA084659@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 30019 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, 29 Apr 2003 01:28:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=30019 Change 30019 by peter@peter_daintree on 2003/04/28 18:27:45 Avoid libdisk, and libstand for now. libdisk is actually easy since we can just clone the i386 bits. libstand is more of an issue since we use i386 boot code, which means we need a toolchain that can produce i386 code... Affected files ... .. //depot/projects/hammer/lib/Makefile#6 edit Differences ... ==== //depot/projects/hammer/lib/Makefile#6 (text+ko) ==== @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ + ${_libstand} ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -70,10 +70,14 @@ _compat= compat .endif -.if ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "amd64" _libdisk=libdisk .endif +.if ${MACHINE_ARCH} != "amd64" +_libstand=libstand +.endif + .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ defined(NOCRYPT) || \ From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:33:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B32AB37B404; Mon, 28 Apr 2003 18:33:14 -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 2F9C637B401 for ; Mon, 28 Apr 2003 18:33:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB61B43FAF for ; Mon, 28 Apr 2003 18:33:13 -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 h3T1XD0U088197 for ; Mon, 28 Apr 2003 18:33:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1XDva088187 for perforce@freebsd.org; Mon, 28 Apr 2003 18:33:13 -0700 (PDT) Date: Mon, 28 Apr 2003 18:33:13 -0700 (PDT) Message-Id: <200304290133.h3T1XDva088187@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 30020 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, 29 Apr 2003 01:33:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30020 Change 30020 by peter@peter_daintree on 2003/04/28 18:32:56 Maybe port libdisk to amd64. Duplicate all the i386 cases and code. Affected files ... .. //depot/projects/hammer/lib/libdisk/chunk.c#6 edit .. //depot/projects/hammer/lib/libdisk/create_chunk.c#10 edit .. //depot/projects/hammer/lib/libdisk/disk.c#10 edit .. //depot/projects/hammer/lib/libdisk/libdisk.h#6 edit .. //depot/projects/hammer/lib/libdisk/rules.c#9 edit .. //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#1 branch Differences ... ==== //depot/projects/hammer/lib/libdisk/chunk.c#6 (text+ko) ==== @@ -239,6 +239,7 @@ /* PLATFORM POLICY BEGIN ------------------------------------- */ switch(platform) { case p_i386: + case p_amd64: switch (type) { case fat: case mbr: @@ -317,7 +318,7 @@ if (platform == p_sparc64) { offset = Prev_Cyl_Aligned(d, offset); size = Next_Cyl_Aligned(d, size); - } else if (platform == p_i386 || platform == p_pc98) { + } else if (platform == p_i386 || platform == p_pc98 || platform == p_amd64) { if (type != freebsd) break; if (!(flags & CHUNK_ALIGN)) ==== //depot/projects/hammer/lib/libdisk/create_chunk.c#10 (text+ko) ==== @@ -138,7 +138,7 @@ Fixup_Names(struct disk *d) { struct chunk *c1, *c2; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) struct chunk *c3; int j; #endif @@ -149,7 +149,7 @@ continue; if (strcmp(c2->name, "X")) continue; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) c2->oname = malloc(12); if (!c2->oname) return -1; ==== //depot/projects/hammer/lib/libdisk/disk.c#10 (text+ko) ==== @@ -371,7 +371,7 @@ #if defined(PC98) printf(" boot1=%p, boot2=%p, bootipl=%p, bootmenu=%p\n", d->boot1, d->boot2, d->bootipl, d->bootmenu); -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) printf(" boot1=%p, boot2=%p, bootmgr=%p\n", d->boot1, d->boot2, d->bootmgr); #elif defined(__alpha__) @@ -407,7 +407,7 @@ if (d->boot1) free(d->boot1); #endif -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot2) free(d->boot2); #endif @@ -536,7 +536,7 @@ int Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) { -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot1) free(d->boot1); d->boot1 = malloc(512); ==== //depot/projects/hammer/lib/libdisk/libdisk.h#6 (text+ko) ==== @@ -27,7 +27,8 @@ p_pc98, p_sparc64, p_ia64, - p_ppc + p_ppc, + p_amd64 } platform = #if defined (P_DEBUG) P_DEBUG @@ -43,6 +44,8 @@ p_ia64 #elif defined(__ppc__) p_ppc +#elif defined(__amd64__) + p_amd64 #else IHAVENOIDEA #endif ==== //depot/projects/hammer/lib/libdisk/rules.c#9 (text+ko) ==== @@ -242,6 +242,7 @@ switch (platform) { case p_i386: + case p_amd64: Rule_000(d, c, msg); Rule_001(d, c, msg); Rule_002(d, c, msg); From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:35:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BB3E37B405; Mon, 28 Apr 2003 18:35:17 -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 4B1C337B401 for ; Mon, 28 Apr 2003 18:35:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDB4843F75 for ; Mon, 28 Apr 2003 18:35:16 -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 h3T1ZG0U090011 for ; Mon, 28 Apr 2003 18:35:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1ZGdc090005 for perforce@freebsd.org; Mon, 28 Apr 2003 18:35:16 -0700 (PDT) Date: Mon, 28 Apr 2003 18:35:16 -0700 (PDT) Message-Id: <200304290135.h3T1ZGdc090005@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 30021 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, 29 Apr 2003 01:35:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30021 Change 30021 by peter@peter_daintree on 2003/04/28 18:35:01 missed a __i386__ define that needed cloning Affected files ... .. //depot/projects/hammer/lib/libdisk/libdisk.h#7 edit Differences ... ==== //depot/projects/hammer/lib/libdisk/libdisk.h#7 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(__ia64__) u_char *boot1; #endif -#if defined(__i386__) /* the i386 needs extra help... */ +#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */ u_char *boot2; #endif struct chunk *chunks; From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:36:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 699C237B404; Mon, 28 Apr 2003 18:36:19 -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 3444737B401 for ; Mon, 28 Apr 2003 18:36:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF88E43F75 for ; Mon, 28 Apr 2003 18:36:18 -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 h3T1aI0U090918 for ; Mon, 28 Apr 2003 18:36:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1aIjL090911 for perforce@freebsd.org; Mon, 28 Apr 2003 18:36:18 -0700 (PDT) Date: Mon, 28 Apr 2003 18:36:18 -0700 (PDT) Message-Id: <200304290136.h3T1aIjL090911@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 30022 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, 29 Apr 2003 01:36:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30022 Change 30022 by peter@peter_daintree on 2003/04/28 18:35:52 turn libdisk back on Affected files ... .. //depot/projects/hammer/lib/Makefile#7 edit Differences ... ==== //depot/projects/hammer/lib/Makefile#7 (text+ko) ==== @@ -70,7 +70,7 @@ _compat= compat .endif -.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "amd64" +.if ${MACHINE_ARCH} != "powerpc" _libdisk=libdisk .endif From owner-p4-projects@FreeBSD.ORG Mon Apr 28 18:41:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62D0E37B404; Mon, 28 Apr 2003 18:41:26 -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 0385837B401 for ; Mon, 28 Apr 2003 18:41:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90DF843F93 for ; Mon, 28 Apr 2003 18:41:25 -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 h3T1fP0U093679 for ; Mon, 28 Apr 2003 18:41:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T1fPrq093672 for perforce@freebsd.org; Mon, 28 Apr 2003 18:41:25 -0700 (PDT) Date: Mon, 28 Apr 2003 18:41:25 -0700 (PDT) Message-Id: <200304290141.h3T1fPrq093672@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 30023 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, 29 Apr 2003 01:41:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30023 Change 30023 by peter@peter_daintree on 2003/04/28 18:40:29 copy from opensslconf-alpha.h (which also works for -ia64.h) Affected files ... .. //depot/projects/hammer/secure/lib/libcrypto/opensslconf-amd64.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 28 19:18:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0208E37B404; Mon, 28 Apr 2003 19:18:11 -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 A8E2C37B401 for ; Mon, 28 Apr 2003 19:18:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5452A43F3F for ; Mon, 28 Apr 2003 19:18:10 -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 h3T2IA0U021226 for ; Mon, 28 Apr 2003 19:18:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T2I958021220 for perforce@freebsd.org; Mon, 28 Apr 2003 19:18:09 -0700 (PDT) Date: Mon, 28 Apr 2003 19:18:09 -0700 (PDT) Message-Id: <200304290218.h3T2I958021220@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 30024 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, 29 Apr 2003 02:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30024 Change 30024 by peter@peter_daintree on 2003/04/28 19:17:41 add NFSSERVER, bpf (for tcpdump), pty (for telnetd/sshd) Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#14 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#14 (text+ko) ==== @@ -34,6 +34,7 @@ options SOFTUPDATES #Enable FFS soft updates support options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client +options NFSSERVER options NFS_ROOT #NFS usable as root device, requires NFSCLIENT # Debugging for use in -current @@ -48,6 +49,8 @@ device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives +options KTRACE + # atkbdc0 controls both the keyboard and the PS/2 mouse #device atkbdc # AT keyboard controller #device atkbd # AT keyboard @@ -82,6 +85,8 @@ device loop # Network loopback device ether # Ethernet support device md # Memory "disks" +device pty +device bpf # USB support #device uhci # UHCI PCI->USB interface From owner-p4-projects@FreeBSD.ORG Mon Apr 28 19:43:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C46537B405; Mon, 28 Apr 2003 19:43:42 -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 1A19837B404 for ; Mon, 28 Apr 2003 19:43:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A195843FBD for ; Mon, 28 Apr 2003 19:43:41 -0700 (PDT) (envelope-from jmallett@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 h3T2hf0U039486 for ; Mon, 28 Apr 2003 19:43:41 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T2hfbD039478 for perforce@freebsd.org; Mon, 28 Apr 2003 19:43:41 -0700 (PDT) Date: Mon, 28 Apr 2003 19:43:41 -0700 (PDT) Message-Id: <200304290243.h3T2hfbD039478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30025 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, 29 Apr 2003 02:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30025 Change 30025 by jmallett@jmallett_dalek on 2003/04/28 19:43:14 Desperately seeking new text editor... Fix previous incomplete paste of function so it doesn't fall off the bottom to lala land. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#6 (text+ko) ==== @@ -356,6 +356,13 @@ * saved in trap frames and restores. */ LEAF(mips_cp0_status_write) + mtc0 a0, MIPS_COP_0_STATUS + COP0_SYNC + nop + nop + j ra + nop +END(mips_cp0_status_write) LEAF(mips_wait_idle) j mips_maybewait_idle From owner-p4-projects@FreeBSD.ORG Mon Apr 28 19:49:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 637B037B404; Mon, 28 Apr 2003 19:49:50 -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 EFAD437B401 for ; Mon, 28 Apr 2003 19:49:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AB6A43F93 for ; Mon, 28 Apr 2003 19:49:49 -0700 (PDT) (envelope-from jmallett@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 h3T2nn0U043354 for ; Mon, 28 Apr 2003 19:49:49 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T2nnGZ043350 for perforce@freebsd.org; Mon, 28 Apr 2003 19:49:49 -0700 (PDT) Date: Mon, 28 Apr 2003 19:49:49 -0700 (PDT) Message-Id: <200304290249.h3T2nnGZ043350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30026 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, 29 Apr 2003 02:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=30026 Change 30026 by jmallett@jmallett_dalek on 2003/04/28 19:49:35 It's safe to turn off BEV now. While here, print some friendly little reminders in reset/halt functions so I don't get confused about whether the machine just died or rebooted. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#18 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#18 (text+ko) ==== @@ -195,12 +195,14 @@ void cpu_halt(void) { + printf("Halting...\n"); platform_halt(); } void cpu_reset(void) { + printf("Resetting...\n"); platform_reset(); } @@ -594,8 +596,7 @@ mips_dcache_wbinv_all(); /* Clear BEV in SR so we start handling our own exceptions */ - if (0) - mips_cp0_status_write(mips_cp0_status_read() & ~MIPS_SR_BEV); + mips_cp0_status_write(mips_cp0_status_read() & ~MIPS_SR_BEV); } /* From owner-p4-projects@FreeBSD.ORG Mon Apr 28 21:34:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29B9937B404; Mon, 28 Apr 2003 21:34:57 -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 D648537B401 for ; Mon, 28 Apr 2003 21:34:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CD3E43F93 for ; Mon, 28 Apr 2003 21:34:56 -0700 (PDT) (envelope-from jmallett@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 h3T4Yu0U025801 for ; Mon, 28 Apr 2003 21:34:56 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T4Yurv025794 for perforce@freebsd.org; Mon, 28 Apr 2003 21:34:56 -0700 (PDT) Date: Mon, 28 Apr 2003 21:34:56 -0700 (PDT) Message-Id: <200304290434.h3T4Yurv025794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30027 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, 29 Apr 2003 04:34:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=30027 Change 30027 by jmallett@jmallett_dalek on 2003/04/28 21:33:54 Extend the addresses for VM_MIN_KERNEL_ADDRESS and related, for 64-bit world. Fake avail_start/avail_end with those values afforementioned. Affected files ... .. //depot/projects/mips/sys/mips/include/vmparam.h#5 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#9 edit Differences ... ==== //depot/projects/mips/sys/mips/include/vmparam.h#5 (text+ko) ==== @@ -121,14 +121,14 @@ #ifndef VM_INITIAL_PAGEIN #define VM_INITIAL_PAGEIN 16 #endif -#define VM_MIN_ADDRESS ((vm_offset_t)0x00000000) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x80000000) -#define VM_MAX_ADDRESS ((vm_offset_t)0x80000000) -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)0xC0000000) +#define VM_MIN_ADDRESS ((vm_offset_t)0x0000000000000000) +#define VM_MAXUSER_ADDRESS ((vm_offset_t)0xFFFFFFFF80000000) +#define VM_MAX_ADDRESS ((vm_offset_t)0xFFFFFFFF80000000) +#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)0xFFFFFFFFC0000000) #ifdef ENABLE_MIPS_TX3900 #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xFF000000) #else -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xFFFFC000) +#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)0xFFFFFFFFFFFFC000) #endif #define KERNBASE (VM_MIN_KERNEL_ADDRESS) ==== //depot/projects/mips/sys/mips/mips/pmap.c#9 (text+ko) ==== @@ -343,6 +343,12 @@ for (i = 0; phys_avail[i + 2] != 0; i += 2) ; avail_end = phys_avail[i + 1]; + + /* + * Set the start and end of kva. + */ + virtual_avail = VM_MIN_KERNEL_ADDRESS; + virtual_end = VM_MAX_KERNEL_ADDRESS; } /* From owner-p4-projects@FreeBSD.ORG Mon Apr 28 22:44:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A666D37B404; Mon, 28 Apr 2003 22:44:22 -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 59EEA37B401 for ; Mon, 28 Apr 2003 22:44:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E94B743FBD for ; Mon, 28 Apr 2003 22:44:21 -0700 (PDT) (envelope-from marcel@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 h3T5iL0U075770 for ; Mon, 28 Apr 2003 22:44:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3T5iLpd075762 for perforce@freebsd.org; Mon, 28 Apr 2003 22:44:21 -0700 (PDT) Date: Mon, 28 Apr 2003 22:44:21 -0700 (PDT) Message-Id: <200304290544.h3T5iLpd075762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30030 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, 29 Apr 2003 05:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=30030 Change 30030 by marcel@marcel_nfs on 2003/04/28 22:43:51 RIFia64_epc (Reverse IF) Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#11 integrate Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#11 (text+ko) ==== @@ -37,7 +37,6 @@ #include #endif -#include #include #include #include @@ -61,9 +60,6 @@ static device_t acpi_timer_dev; struct resource *acpi_timer_reg; -#define TIMER_READ bus_space_read_4(rman_get_bustag(acpi_timer_reg), \ - rman_get_bushandle(acpi_timer_reg), \ - 0) static u_int acpi_timer_frequency = 14318182/4; @@ -75,6 +71,9 @@ static int acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS); static void acpi_timer_test(void); +static u_int32_t read_counter(void); +static int test_counter(void); + /* * Driver hung off ACPI. */ @@ -106,7 +105,20 @@ "ACPI" }; -static int test_counter(void); + +static u_int32_t +read_counter() +{ + bus_space_handle_t bsh; + bus_space_tag_t bst; + u_int32_t tv; + + bsh = rman_get_bushandle(acpi_timer_reg); + bst = rman_get_bustag(acpi_timer_reg); + tv = bus_space_read_4(bst, bsh, 0); + bus_space_barrier(bst, bsh, 0, 4, BUS_SPACE_BARRIER_READ); + return (tv); +} #define N 2000 static int @@ -117,9 +129,9 @@ min = 10000000; max = 0; - last = TIMER_READ; + last = read_counter(); for (n = 0; n < N; n++) { - this = TIMER_READ; + this = read_counter(); delta = (this - last) & 0xffffff; if (delta > max) max = delta; @@ -167,11 +179,11 @@ acpi_timer_dev = dev; rid = 0; - rlen = 3 + AcpiGbl_FADT->TmrValExt; /* 24 or 32 bit timers. */ + rlen = AcpiGbl_FADT->PmTmLen; rtype = (AcpiGbl_FADT->XPmTmrBlk.AddressSpaceId) ? SYS_RES_IOPORT : SYS_RES_MEMORY; rstart = AcpiGbl_FADT->XPmTmrBlk.Address; - bus_set_resource(dev, rtype, rid, rstart, 4); + bus_set_resource(dev, rtype, rid, rstart, rlen); acpi_timer_reg = bus_alloc_resource(dev, rtype, &rid, 0, ~0, 1, RF_ACTIVE); if (acpi_timer_reg == NULL) { device_printf(dev, "couldn't allocate I/O resource (%s 0x%lx)\n", @@ -194,7 +206,8 @@ } tc_init(&acpi_timer_timecounter); - sprintf(desc, "%d-bit timer at 3.579545MHz", (int)(rlen << 3)); + sprintf(desc, "%d-bit timer at 3.579545MHz", (AcpiGbl_FADT->TmrValExt) + ? 32 : 24); device_set_desc_copy(dev, desc); return_VOID; @@ -220,7 +233,7 @@ static unsigned acpi_timer_get_timecount(struct timecounter *tc) { - return(TIMER_READ); + return (read_counter()); } /* @@ -232,12 +245,12 @@ { unsigned u1, u2, u3; - u2 = TIMER_READ; - u3 = TIMER_READ; + u2 = read_counter(); + u3 = read_counter(); do { u1 = u2; u2 = u3; - u3 = TIMER_READ; + u3 = read_counter(); } while (u1 > u2 || u2 > u3 || (u3 - u1) > 15); return (u2); } @@ -274,9 +287,9 @@ { u_int32_t u1, u2, u3; - u1 = TIMER_READ; - u2 = TIMER_READ; - u3 = TIMER_READ; + u1 = read_counter(); + u2 = read_counter(); + u3 = read_counter(); device_printf(acpi_timer_dev, "timer test in progress, reboot to quit.\n"); for (;;) { @@ -291,7 +304,7 @@ } u1 = u2; u2 = u3; - u3 = TIMER_READ; + u3 = read_counter(); } } From owner-p4-projects@FreeBSD.ORG Tue Apr 29 08:01:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED2FC37B40D; Tue, 29 Apr 2003 08:01:32 -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 8B96A37B401 for ; Tue, 29 Apr 2003 08:01:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2137143F93 for ; Tue, 29 Apr 2003 08:01:32 -0700 (PDT) (envelope-from obrien@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 h3TF1V0U089570 for ; Tue, 29 Apr 2003 08:01:31 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TF1VZ5089562 for perforce@freebsd.org; Tue, 29 Apr 2003 08:01:31 -0700 (PDT) Date: Tue, 29 Apr 2003 08:01:31 -0700 (PDT) Message-Id: <200304291501.h3TF1VZ5089562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30032 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, 29 Apr 2003 15:01:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30032 Change 30032 by obrien@obrien_trang on 2003/04/29 08:01:08 Add -m32 to CFLAGS so we're affectively a 32-bit i386 toolchain. Affected files ... .. //depot/projects/hammer/sys/boot/common/Makefile.inc#4 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/Makefile.inc#4 (text+ko) ==== @@ -35,3 +35,6 @@ MAN+= loader.8 +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+= -m32 +.endif From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:05:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1DDF37B404; Tue, 29 Apr 2003 12:05:26 -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 9419C37B401 for ; Tue, 29 Apr 2003 12:05:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BED343FBF for ; Tue, 29 Apr 2003 12:05:26 -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 h3TJ5Q0U073431 for ; Tue, 29 Apr 2003 12:05:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJ5PsC073423 for perforce@freebsd.org; Tue, 29 Apr 2003 12:05:25 -0700 (PDT) Date: Tue, 29 Apr 2003 12:05:25 -0700 (PDT) Message-Id: <200304291905.h3TJ5PsC073423@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 30034 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, 29 Apr 2003 19:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=30034 Change 30034 by peter@peter_daintree on 2003/04/29 12:04:52 rename Ovfork.S to vfork.S. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/vfork.S#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:05:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3794137B401; Tue, 29 Apr 2003 12:05:28 -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 1539F37B412 for ; Tue, 29 Apr 2003 12:05:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0C9143FCB for ; Tue, 29 Apr 2003 12:05:26 -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 h3TJ5Q0U073443 for ; Tue, 29 Apr 2003 12:05:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJ5QLp073436 for perforce@freebsd.org; Tue, 29 Apr 2003 12:05:26 -0700 (PDT) Date: Tue, 29 Apr 2003 12:05:26 -0700 (PDT) Message-Id: <200304291905.h3TJ5QLp073436@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 30035 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, 29 Apr 2003 19:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30035 Change 30035 by peter@peter_daintree on 2003/04/29 12:05:04 Kill Ovfork.S Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/Ovfork.S#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:06:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B96737B404; Tue, 29 Apr 2003 12:06:29 -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 E5A9437B401 for ; Tue, 29 Apr 2003 12:06:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90B4443F75 for ; Tue, 29 Apr 2003 12:06:28 -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 h3TJ6S0U074368 for ; Tue, 29 Apr 2003 12:06:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJ6Soq074361 for perforce@freebsd.org; Tue, 29 Apr 2003 12:06:28 -0700 (PDT) Date: Tue, 29 Apr 2003 12:06:28 -0700 (PDT) Message-Id: <200304291906.h3TJ6Soq074361@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 30036 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, 29 Apr 2003 19:06:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30036 Change 30036 by peter@peter_daintree on 2003/04/29 12:05:35 gah. 3 commits for the price of one. rename Ovfork.S to vfork.S Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/Makefile.inc#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,7 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ -MDASM= Ovfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ +MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ setlogin.S sigreturn.S #syscall.S # Don't generate default code for these syscalls: From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:06:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC77E37B404; Tue, 29 Apr 2003 12:06: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 814F637B407 for ; Tue, 29 Apr 2003 12:06:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12F9843F75 for ; Tue, 29 Apr 2003 12:06:29 -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 h3TJ6S0U074380 for ; Tue, 29 Apr 2003 12:06:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJ6ShH074374 for perforce@freebsd.org; Tue, 29 Apr 2003 12:06:28 -0700 (PDT) Date: Tue, 29 Apr 2003 12:06:28 -0700 (PDT) Message-Id: <200304291906.h3TJ6ShH074374@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 30037 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, 29 Apr 2003 19:06:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30037 Change 30037 by peter@peter_daintree on 2003/04/29 12:06:14 no need for a syscall wrapper. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/Makefile.inc#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/Makefile.inc#6 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ - setlogin.S sigreturn.S #syscall.S + setlogin.S sigreturn.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:09:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1159037B404; Tue, 29 Apr 2003 12:09:34 -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 CF87D37B401 for ; Tue, 29 Apr 2003 12:09:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6484243FA3 for ; Tue, 29 Apr 2003 12:09:33 -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 h3TJ9X0U075851 for ; Tue, 29 Apr 2003 12:09:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJ9WWw075846 for perforce@freebsd.org; Tue, 29 Apr 2003 12:09:32 -0700 (PDT) Date: Tue, 29 Apr 2003 12:09:32 -0700 (PDT) Message-Id: <200304291909.h3TJ9WWw075846@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 30038 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, 29 Apr 2003 19:09:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30038 Change 30038 by peter@peter_daintree on 2003/04/29 12:08:46 Can't use %rdx for fiddling with PSL_T, because %rdx is the third register arg for the call, which clobbers the 'env' argument to exect() Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/exect.S#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/exect.S#4 (text+ko) ==== @@ -46,9 +46,9 @@ ENTRY(exect) movq $SYS_execve,%rax pushfq - popq %rdx - orq $ PSL_T,%rdx - pushq %rdx + popq %r8 + orq $PSL_T,%r8 + pushq %r8 popfq KERNCALL jmp PIC_PLT(HIDENAME(cerror)) /* exect(file, argv, env); */ From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:10:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1034137B404; Tue, 29 Apr 2003 12:10:36 -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 A1F0C37B401 for ; Tue, 29 Apr 2003 12:10:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F27F43F75 for ; Tue, 29 Apr 2003 12:10:35 -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 h3TJAZ0U076450 for ; Tue, 29 Apr 2003 12:10:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJAYCY076442 for perforce@freebsd.org; Tue, 29 Apr 2003 12:10:34 -0700 (PDT) Date: Tue, 29 Apr 2003 12:10:34 -0700 (PDT) Message-Id: <200304291910.h3TJAYCY076442@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 30039 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, 29 Apr 2003 19:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=30039 Change 30039 by peter@peter_daintree on 2003/04/29 12:10:15 take advantage of the kernel preserving %rdi across a syscall Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#6 (text+ko) ==== @@ -42,20 +42,8 @@ #include "SYS.h" - .weak _pipe - .set _pipe,__sys_pipe - .weak pipe - .set pipe,__sys_pipe -ENTRY(__sys_pipe) - pushq %rdi - mov $SYS_pipe,%rax - KERNCALL - jb 1f - popq %rcx - movl %eax,(%rcx) - movl %edx,4(%rcx) +SYSCALL(pipe) + movl %eax,(%rdi) /* %rdi is preserved by syscall */ + movl %edx,4(%rdi) movq $0,%rax ret -1: - popq %rdi - jmp PIC_PLT(HIDENAME(cerror)) From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:13:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B72A37B404; Tue, 29 Apr 2003 12:13:40 -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 2516037B401 for ; Tue, 29 Apr 2003 12:13:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE42E43F3F for ; Tue, 29 Apr 2003 12:13:39 -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 h3TJDd0U079107 for ; Tue, 29 Apr 2003 12:13:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJDdG7079097 for perforce@freebsd.org; Tue, 29 Apr 2003 12:13:39 -0700 (PDT) Date: Tue, 29 Apr 2003 12:13:39 -0700 (PDT) Message-Id: <200304291913.h3TJDdG7079097@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 30040 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, 29 Apr 2003 19:13:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30040 Change 30040 by peter@peter_daintree on 2003/04/29 12:12:45 Remove, these haven't been converted, use the C code for now. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/string/Makefile.inc#3 delete .. //depot/projects/hammer/lib/libc/x86_64/string/bcmp.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/bcopy.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/bzero.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/ffs.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/index.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/memchr.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/memcmp.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/memcpy.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/memmove.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/memset.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/rindex.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strcat.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strchr.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strcmp.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strcpy.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strlen.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strncmp.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/strrchr.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/swab.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/wcschr.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/wcscmp.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/wcslen.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/string/wmemchr.S#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:15:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8639337B404; Tue, 29 Apr 2003 12:15:43 -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 3BFC037B401 for ; Tue, 29 Apr 2003 12:15:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C732543FB1 for ; Tue, 29 Apr 2003 12:15:42 -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 h3TJFg0U080870 for ; Tue, 29 Apr 2003 12:15:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJFgae080863 for perforce@freebsd.org; Tue, 29 Apr 2003 12:15:42 -0700 (PDT) Date: Tue, 29 Apr 2003 12:15:42 -0700 (PDT) Message-Id: <200304291915.h3TJFgae080863@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 30041 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, 29 Apr 2003 19:15:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=30041 Change 30041 by peter@peter_daintree on 2003/04/29 12:14:58 nuke in case of confusion Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/stdlib/Makefile.inc#3 delete .. //depot/projects/hammer/lib/libc/x86_64/stdlib/abs.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/stdlib/div.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/stdlib/labs.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/stdlib/ldiv.S#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:17:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC4D937B404; Tue, 29 Apr 2003 12:17:46 -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 469F137B401 for ; Tue, 29 Apr 2003 12:17:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E695043F85 for ; Tue, 29 Apr 2003 12:17:45 -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 h3TJHj0U082338 for ; Tue, 29 Apr 2003 12:17:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJHjbX082332 for perforce@freebsd.org; Tue, 29 Apr 2003 12:17:45 -0700 (PDT) Date: Tue, 29 Apr 2003 12:17:45 -0700 (PDT) Message-Id: <200304291917.h3TJHjbX082332@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 30042 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, 29 Apr 2003 19:17:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=30042 Change 30042 by peter@peter_daintree on 2003/04/29 12:17:30 nuke unconverted stuff to minimize confusion Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/gen/_ctx_start.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/alloca.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/fabs.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/makecontext.c#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/modf.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/rfork_thread.S#3 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/signalcontext.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 29 12:18:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A373437B404; Tue, 29 Apr 2003 12:18:48 -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 59A5237B401 for ; Tue, 29 Apr 2003 12:18:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3E5E43FB1 for ; Tue, 29 Apr 2003 12:18:47 -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 h3TJIl0U082746 for ; Tue, 29 Apr 2003 12:18:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJIlBr082740 for perforce@freebsd.org; Tue, 29 Apr 2003 12:18:47 -0700 (PDT) Date: Tue, 29 Apr 2003 12:18:47 -0700 (PDT) Message-Id: <200304291918.h3TJIlBr082740@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 30043 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, 29 Apr 2003 19:18:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=30043 Change 30043 by peter@peter_daintree on 2003/04/29 12:18:44 reintegrate with x86_64/... dir to sync up Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/_ctx_start.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/makecontext.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/rfork_thread.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/gen/signalcontext.c#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/abs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/div.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/labs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/stdlib/ldiv.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/Makefile.inc#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/bcmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/bcopy.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/bzero.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/ffs.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/index.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memcmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memcpy.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memmove.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/memset.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/rindex.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strcat.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strcmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strcpy.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strlen.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strncmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/strrchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/swab.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wcschr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wcscmp.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wcslen.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/string/wmemchr.S#2 delete .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/Ovfork.S#3 delete .. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#3 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#1 branch Differences ... ==== //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ -MDASM= Ovfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ - setlogin.S sigreturn.S #syscall.S +MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ + setlogin.S sigreturn.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/hammer/lib/libc/amd64/sys/exect.S#2 (text+ko) ==== @@ -46,9 +46,9 @@ ENTRY(exect) movq $SYS_execve,%rax pushfq - popq %rdx - orq $ PSL_T,%rdx - pushq %rdx + popq %r8 + orq $PSL_T,%r8 + pushq %r8 popfq KERNCALL jmp PIC_PLT(HIDENAME(cerror)) /* exect(file, argv, env); */ ==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#3 (text+ko) ==== @@ -42,20 +42,8 @@ #include "SYS.h" - .weak _pipe - .set _pipe,__sys_pipe - .weak pipe - .set pipe,__sys_pipe -ENTRY(__sys_pipe) - pushq %rdi - mov $SYS_pipe,%rax - KERNCALL - jb 1f - popq %rcx - movl %eax,(%rcx) - movl %edx,4(%rcx) +SYSCALL(pipe) + movl %eax,(%rdi) /* %rdi is preserved by syscall */ + movl %edx,4(%rdi) movq $0,%rax ret -1: - popq %rdi - jmp PIC_PLT(HIDENAME(cerror)) From owner-p4-projects@FreeBSD.ORG Tue Apr 29 16:37:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6D5C37B404; Tue, 29 Apr 2003 16:37:29 -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 72B2E37B401 for ; Tue, 29 Apr 2003 16:37:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AFFA43FB1 for ; Tue, 29 Apr 2003 16:37:28 -0700 (PDT) (envelope-from marcel@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 h3TNbR0U078120 for ; Tue, 29 Apr 2003 16:37:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TNbN9k078096 for perforce@freebsd.org; Tue, 29 Apr 2003 16:37:23 -0700 (PDT) Date: Tue, 29 Apr 2003 16:37:23 -0700 (PDT) Message-Id: <200304292337.h3TNbN9k078096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30059 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, 29 Apr 2003 23:37:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30059 Change 30059 by marcel@marcel_pluto1 on 2003/04/29 16:37:07 IFC @30058 Affected files ... .. //depot/projects/ia64/etc/netstart#3 integrate .. //depot/projects/ia64/etc/rc.d/motd#5 integrate .. //depot/projects/ia64/etc/rc.d/network_ipv6#4 integrate .. //depot/projects/ia64/etc/services#7 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/c++config.h#5 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/config.h#5 integrate .. //depot/projects/ia64/include/limits.h#5 integrate .. //depot/projects/ia64/include/wchar.h#13 integrate .. //depot/projects/ia64/lib/libc/gen/check_utility_compat.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/confstr.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/fmtmsg.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#9 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#11 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#4 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#10 integrate .. //depot/projects/ia64/lib/libc/include/un-namespace.h#8 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.c#5 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#11 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#7 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.c#5 integrate .. //depot/projects/ia64/lib/libc/net/hesiod.c#4 integrate .. //depot/projects/ia64/lib/libc/net/if_nametoindex.c#4 integrate .. //depot/projects/ia64/lib/libc/nls/msgcat.c#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_soc.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/realpath.c#6 integrate .. //depot/projects/ia64/lib/libc/string/strerror.c#9 integrate .. //depot/projects/ia64/lib/libc/string/strlcat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strlcpy.c#4 integrate .. //depot/projects/ia64/lib/libc/yp/yplib.c#5 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_switch.S#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_detach.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_exit.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_find_thread.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_join.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#12 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_nanosleep.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_priority_queue.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#9 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sigwait.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_spinlock.c#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_yield.c#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#17 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#45 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#11 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#84 integrate .. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#5 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#6 integrate .. //depot/projects/ia64/share/man/man4/ip.4#7 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#11 integrate .. //depot/projects/ia64/sys/alpha/include/limits.h#5 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#14 integrate .. //depot/projects/ia64/sys/arm/include/limits.h#4 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/ia64/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#13 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#7 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/ia64/sys/conf/files#75 integrate .. //depot/projects/ia64/sys/conf/files.ia64#37 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdispat.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdos16.h#3 delete .. //depot/projects/ia64/sys/contrib/dev/acpica/acefi.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acevents.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acexcep.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acgcc.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acinterp.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acnamesp.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acoutput.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acparser.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpi.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acresrc.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acstruct.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl71.h#3 delete .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#12 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlcode.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbhistry.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbinput.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbstats.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbxface.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmbuffer.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmnames.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmutils.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsfield.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsobject.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsutils.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswload.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswscope.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evevent.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpe.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/evgpeblk.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evrgnini.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evsci.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfevnt.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfregn.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconvrt.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/excreate.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfield.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmisc.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmutex.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exnames.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg2.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg3.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg6.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exprep.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exregion.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresnte.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresolv.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresop.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstoren.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstorob.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwacpi.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwgpe.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwtimer.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsalloc.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdump.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsinit.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsload.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsnames.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsobject.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsparse.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nswalk.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfname.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfobj.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psfind.c#6 delete .. //depot/projects/ia64/sys/contrib/dev/acpica/psopcode.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psscope.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/pstree.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psutils.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/pswalk.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psxface.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsdump.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsio.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rslist.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsmemory.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsutils.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsxface.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbrsdt.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbutils.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxface.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxfroot.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utalloc.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utclib.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utcopy.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdebug.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdelete.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utinit.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmath.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmisc.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utobject.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utxface.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdDebug.c#4 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#5 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdStream.c#3 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/ia64/sys/dev/eisa/eisaconf.c#5 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#12 integrate .. //depot/projects/ia64/sys/dev/fb/fbreg.h#6 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#17 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#24 integrate .. //depot/projects/ia64/sys/dev/firewire/iec13213.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/iec68113.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#27 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#29 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#8 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#5 integrate .. //depot/projects/ia64/sys/dev/mca/mca_bus.c#3 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#24 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_types.h#3 integrate .. //depot/projects/ia64/sys/dev/ray/if_ray.c#8 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#40 integrate .. //depot/projects/ia64/sys/dev/sound/midi/midi.h#5 integrate .. //depot/projects/ia64/sys/dev/syscons/scmouse.c#7 integrate .. //depot/projects/ia64/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#38 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_fileno.c#7 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#16 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#12 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#33 integrate .. //depot/projects/ia64/sys/i386/include/limits.h#6 integrate .. //depot/projects/ia64/sys/i386/isa/clock.c#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#30 integrate .. //depot/projects/ia64/sys/ia64/include/bus.h#10 integrate .. //depot/projects/ia64/sys/ia64/include/cpufunc.h#10 integrate .. //depot/projects/ia64/sys/ia64/include/limits.h#6 integrate .. //depot/projects/ia64/sys/isa/psm.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#51 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_scanf.c#3 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#23 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#32 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#41 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#28 integrate .. //depot/projects/ia64/sys/libkern/quad.h#4 integrate .. //depot/projects/ia64/sys/libkern/strtol.c#2 integrate .. //depot/projects/ia64/sys/libkern/strtoq.c#2 integrate .. //depot/projects/ia64/sys/libkern/strtoul.c#2 integrate .. //depot/projects/ia64/sys/libkern/strtouq.c#2 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#9 integrate .. //depot/projects/ia64/sys/net/if_atm.h#4 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#9 integrate .. //depot/projects/ia64/sys/net/if_media.c#5 integrate .. //depot/projects/ia64/sys/net/if_media.h#8 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/ia64/sys/netgraph/ng_ppp.c#12 integrate .. //depot/projects/ia64/sys/netinet/in.h#18 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#24 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#17 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#28 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#26 integrate .. //depot/projects/ia64/sys/netinet6/ah_output.c#5 integrate .. //depot/projects/ia64/sys/netinet6/esp_output.c#5 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#17 integrate .. //depot/projects/ia64/sys/netinet6/in6.h#9 integrate .. //depot/projects/ia64/sys/netinet6/in6_cksum.c#4 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#11 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#13 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/clock.c#15 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98kbd.c#4 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#22 integrate .. //depot/projects/ia64/sys/pci/if_en_pci.c#5 integrate .. //depot/projects/ia64/sys/powerpc/include/limits.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/asm.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/limits.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/trap.h#4 integrate .. //depot/projects/ia64/sys/sparc64/include/utrap.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#20 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/interrupt.S#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.S#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_exception.S#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/swtch.S#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/upa.c#2 delete .. //depot/projects/ia64/sys/sys/param.h#32 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.h#8 integrate .. //depot/projects/ia64/sys/x86_64/include/limits.h#5 integrate .. //depot/projects/ia64/usr.sbin/acpi/acpiconf/acpiconf.c#4 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#7 integrate .. //depot/projects/ia64/usr.sbin/pcvt/vttest/main.c#2 integrate Differences ... ==== //depot/projects/ia64/etc/netstart#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/netstart,v 1.60 2001/05/18 09:14:39 brian Exp $ +# $FreeBSD: src/etc/netstart,v 1.62 2003/04/29 15:32:02 imp Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -34,41 +34,33 @@ # the network by hand, this script will do it for you). # -# If there is a global system configuration file, suck it in. -if [ -f /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -f /etc/rc.conf ]; then - . /etc/rc.conf -fi +. /etc/rc.subr -# Start pccard if necessary -if [ -r /etc/rc.pccard ]; then - . /etc/rc.pccard -fi - -if [ -r /etc/rc.network ]; then - . /etc/rc.network -else - echo 'Sorry, I cannot find /etc/rc.network - aborting' - exit 1 -fi - -echo 'Doing stage one network startup:' -network_pass1 - -case ${ipv6_enable} in -[Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 - else - echo 'Sorry, I cannot find /etc/rc.network6 - aborting' - exit 1 - fi - - echo 'Doing stage one network6 startup:' - network6_pass1 - ;; -esac +load_rc_config 'XXX' +/etc/rc.d/pccard start +/etc/rc.d/devd start +/etc/rc.d/hostname start +/etc/rc.d/ipmon start +/etc/rc.d/ipfilter start +/etc/rc.d/ipnat start +/etc/rc.d/ipfs start +/etc/rc.d/sppp start +# /etc/rc.d/atm1 start +# . /etc/rc.d/atm2.sh start +# . /etc/rc.d/atm3.sh start +/etc/rc.d/netif start +/etc/rc.d/ipsec start +/etc/rc.d/dhclient start +/etc/rc.d/isdnd start +/etc/rc.d/ppp-user start +/etc/rc.d/ipfw start +/etc/rc.d/network2 start +/etc/rc.d/ip6fw start +/etc/rc.d/network_ipv6 start +/etc/rc.d/mroute6d start +/etc/rc.d/route6d start +/etc/rc.d/mrouted start +/etc/rc.d/routed start +/etc/rc.d/nisdomain start exit 0 ==== //depot/projects/ia64/etc/rc.d/motd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.5 2003/04/29 06:56:40 dougb Exp $ # # PROVIDE: motd @@ -18,11 +18,9 @@ case ${OSTYPE} in FreeBSD) - T=`mktemp /tmp/_motd.XXXXXX` PERMS="644" ;; NetBSD) - T="/etc/_motd" PERMS="664" ;; esac @@ -40,10 +38,12 @@ case ${OSTYPE} in FreeBSD) + T=`mktemp /tmp/_motd.XXXXXX` uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T} awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T} ;; NetBSD) + T='/etc/_motd' sysctl -n kern.version | while read i; do echo $i; break; done > $T sed '1{/^NetBSD.*/{d;};};' < /etc/motd >> $T ;; ==== //depot/projects/ia64/etc/rc.d/network_ipv6#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.32 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.33 2003/04/29 12:08:43 jwd Exp $ # From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43 # @@ -32,6 +32,8 @@ # REQUIRE: network2 # KEYWORD: FreeBSD +. /etc/rc.subr + name="network_ipv6" rcvar=`set_rcvar ipv6` start_cmd="network_ipv6_start" ==== //depot/projects/ia64/etc/services#7 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.91 2003/01/04 16:03:56 schweikh Exp $ +# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2004,6 +2004,8 @@ hacl-test 5305/udp cfengine 5308/tcp cfengine 5308/udp +mdns 5353/tcp #Multicast DNS +mdns 5353/udp #Multicast DNS postgresql 5432/tcp #PostgreSQL Database postgresql 5432/udp #PostgreSQL Database rplay 5555/udp ==== //depot/projects/ia64/gnu/lib/libstdc++/c++config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $ +// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.5 2003/04/29 18:10:45 kan Exp $ // Predefined symbols and macros -*- C++ -*- @@ -104,7 +104,7 @@ #define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. -/* #undef _GLIBCPP_USE_WCHAR_T */ +#define _GLIBCPP_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. /* #undef _GLIBCPP_MEM_LIMITS */ ==== //depot/projects/ia64/gnu/lib/libstdc++/config.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.6 2003/04/29 18:10:45 kan Exp $ */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -16,7 +16,7 @@ #define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. -/* #undef _GLIBCPP_USE_WCHAR_T */ +#define _GLIBCPP_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. /* #undef _GLIBCPP_MEM_LIMITS */ ==== //depot/projects/ia64/include/limits.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.15 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $ */ #ifndef _LIMITS_H_ @@ -125,7 +125,7 @@ #define MB_LEN_MAX 6 /* 31-bit UTF-8 */ -#include +#include #if __POSIX_VISIBLE #include ==== //depot/projects/ia64/include/wchar.h#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.34 2003/03/13 06:29:53 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $ */ /*- @@ -69,6 +69,7 @@ #include #include +#include #ifndef NULL #define NULL 0 @@ -96,6 +97,11 @@ #define _WINT_T_DECLARED #endif +#ifndef WCHAR_MIN +#define WCHAR_MIN __INT_MIN +#define WCHAR_MAX __INT_MAX +#endif + #ifndef WEOF #define WEOF ((wint_t)-1) #endif ==== //depot/projects/ia64/lib/libc/gen/check_utility_compat.c#2 (text+ko) ==== @@ -28,17 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.1 2002/10/28 00:15:43 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.2 2003/04/29 21:13:48 nectar Exp $"); -/* - * I din't use "namespace.h" here because none of the relevant utilities - * are threaded, so I'm not concerned about cancellation points or other - * niceties. - */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #ifndef LINE_MAX #define LINE_MAX _POSIX2_LINE_MAX @@ -55,7 +52,7 @@ int len; if ((p = getenv(_ENV_UTIL_COMPAT)) != NULL) { - strlcpy(buf, p, sizeof buf); + _strlcpy(buf, p, sizeof buf); } else { if ((len = readlink(_PATH_UTIL_COMPAT, buf, sizeof buf)) < 0) return 0; ==== //depot/projects/ia64/lib/libc/gen/confstr.c#5 (text+ko) ==== @@ -35,15 +35,16 @@ static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.7 2002/09/19 03:47:36 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.8 2003/04/29 21:13:48 nectar Exp $"); +#include "namespace.h" #include - #include #include #include #include #include +#include "un-namespace.h" size_t @@ -114,7 +115,7 @@ docopy: if (len != 0 && buf != NULL) - strlcpy(buf, p, len); + _strlcpy(buf, p, len); return (strlen(p) + 1); default: ==== //depot/projects/ia64/lib/libc/gen/fmtmsg.c#3 (text+ko) ==== @@ -25,12 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.3 2002/09/01 01:49:27 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.4 2003/04/29 21:13:48 nectar Exp $"); +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" /* Default value for MSGVERB. */ #define DFLT_MSGVERB "label:severity:text:action:tag" @@ -101,13 +103,13 @@ #define INSERT_COLON \ if (*output != '\0') \ - strlcat(output, ": ", size) + _strlcat(output, ": ", size) #define INSERT_NEWLINE \ if (*output != '\0') \ - strlcat(output, "\n", size) + _strlcat(output, "\n", size) #define INSERT_SPACE \ if (*output != '\0') \ - strlcat(output, " ", size) + _strlcat(output, " ", size) /* * Returns NULL on memory allocation failure, otherwise returns a pointer to @@ -139,20 +141,20 @@ while ((comp = nextcomp(msgverb)) != NULL) { if (strcmp(comp, "label") == 0 && label != MM_NULLLBL) { INSERT_COLON; - strlcat(output, label, size); + _strlcat(output, label, size); } else if (strcmp(comp, "severity") == 0 && sevname != NULL) { INSERT_COLON; - strlcat(output, sevinfo(sev), size); + _strlcat(output, sevinfo(sev), size); } else if (strcmp(comp, "text") == 0 && text != MM_NULLTXT) { INSERT_COLON; - strlcat(output, text, size); + _strlcat(output, text, size); } else if (strcmp(comp, "action") == 0 && act != MM_NULLACT) { INSERT_NEWLINE; - strlcat(output, "TO FIX: ", size); - strlcat(output, act, size); + _strlcat(output, "TO FIX: ", size); + _strlcat(output, act, size); } else if (strcmp(comp, "tag") == 0 && tag != MM_NULLTAG) { INSERT_SPACE; - strlcat(output, tag, size); + _strlcat(output, tag, size); } } INSERT_NEWLINE; @@ -171,7 +173,7 @@ char *retval; if (*lmsgverb == '\0') { - strlcpy(lmsgverb, msgverb, sizeof(lmsgverb)); + _strlcpy(lmsgverb, msgverb, sizeof(lmsgverb)); retval = strtok_r(lmsgverb, ":", &state); } else { retval = strtok_r(NULL, ":", &state); ==== //depot/projects/ia64/lib/libc/gen/getgrent.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.30 2003/04/29 21:13:48 nectar Exp $"); #include "namespace.h" #include @@ -620,7 +620,7 @@ * pointer for the member list terminator. */ adjsize = bufsize - _ALIGNBYTES - sizeof(char *); - linesize = strlcpy(buffer, hes[0], adjsize); + linesize = _strlcpy(buffer, hes[0], adjsize); if (linesize >= adjsize) { *errnop = ERANGE; rv = NS_RETURN; @@ -721,7 +721,7 @@ rv = NS_NOTFOUND; switch (how) { case nss_lt_name: - if (strlcpy(buffer, name, bufsize) >= bufsize) + if (_strlcpy(buffer, name, bufsize) >= bufsize) goto erange; break; case nss_lt_id: ==== //depot/projects/ia64/lib/libc/gen/getpwent.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.79 2003/04/25 18:25:19 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.80 2003/04/29 21:13:48 nectar Exp $"); #include "namespace.h" #include @@ -584,7 +584,7 @@ /* MAXLOGNAME includes NUL byte, but we do not * include the NUL byte in the key. */ - namesize = strlcpy(&keybuf[1], name, sizeof(keybuf)-1); + namesize = _strlcpy(&keybuf[1], name, sizeof(keybuf)-1); if (namesize >= sizeof(keybuf)-1) { *errnop = EINVAL; rv = NS_NOTFOUND; @@ -897,7 +897,7 @@ hes = NULL; continue; } - linesize = strlcpy(buffer, hes[0], bufsize); + linesize = _strlcpy(buffer, hes[0], bufsize); if (linesize >= bufsize) { *errnop = ERANGE; rv = NS_RETURN; @@ -1055,7 +1055,7 @@ rv = NS_NOTFOUND; switch (how) { case nss_lt_name: - if (strlcpy(buffer, name, bufsize) >= bufsize) + if (_strlcpy(buffer, name, bufsize) >= bufsize) goto erange; break; case nss_lt_id: @@ -1215,7 +1215,7 @@ hold.field = NULL; \ else { \ hold.field = p; \ - p += strlcpy(p, pwd->field, eob-p) + 1; \ + p += _strlcpy(p, pwd->field, eob-p) + 1; \ } \ } while (0) COPY(pw_name); @@ -1233,7 +1233,7 @@ pwd->field = NULL; \ else { \ pwd->field = p; \ - if ((n = strlcpy(p, q, eob-p)) >= eob-p) { \ + if ((n = _strlcpy(p, q, eob-p)) >= eob-p) { \ free(copy); \ return (ERANGE); \ } \ ==== //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.2#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.12 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.13 2003/04/29 08:35:28 mdodd Exp $ .\" .Dd July 27, 1998 .Os @@ -79,9 +79,38 @@ .Em Nth bit is set, the interrupt will be reflected to the process, otherwise it will be dispatched by the vm86 interrupt table. -.\" .It Dv VM86_SET_VME -.\" .It Dv VM86_GET_VME -.\" .It Dv VM86_INTCALL +.It Dv VM86_INTCALL +This allows calls to be made to vm86 interrupt handlers by the process. It +effectively simulates an INT instruction. +.Fa data +should point to the following structure: +.Bd -literal +struct vm86_intcall_args { + int intnum; + struct vm86frame vmf; +}; +.Ed +.Pp +.Fa intnum +specifies the operand of INT for the simulated call. A value of 0x10, for +example, would often be used to call into the VGA BIOS. +.Fa vmf +is used to initialize CPU registers according to the calling convention for +the interrupt handler. +.It Dv VM86_GET_VME +This is used to retrieve the current state of the Pentium(r) processor's +VME (Virtual-8086 Mode Extensions) flag, which is bit 0 of CR4. +.Fa data +should be initialized to point to the following: +.Bd -literal +struct vm86_vme_args { + int state; /* status */ +}; +.Ed +.Pp +.Fa state +will contain the state of the VME flag on return. +\" .It Dv VM86_SET_VME .El .Pp vm86 mode is entered by calling @@ -104,4 +133,6 @@ .El .Sh AUTHORS This man page was written by -.An Jonathan Lemon . +.An Jonathan Lemon , +and updated by +.An Bruce M Simpson . ==== //depot/projects/ia64/lib/libc/include/namespace.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/namespace.h,v 1.14 2003/04/17 14:14:22 nectar Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.15 2003/04/29 21:13:49 nectar Exp $ */ #ifndef _NAMESPACE_H_ @@ -43,6 +43,8 @@ #define err _err #define warn _warn #define nsdispatch _nsdispatch +#define strlcat _strlcat +#define strlcpy _strlcpy /* * Prototypes for syscalls/functions that need to be overridden ==== //depot/projects/ia64/lib/libc/include/un-namespace.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.11 2003/04/17 14:14:22 nectar Exp $ + * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.12 2003/04/29 21:13:49 nectar Exp $ */ #ifndef _UN_NAMESPACE_H_ @@ -149,5 +149,7 @@ #undef err #undef warn #undef nsdispatch +#undef strlcat +#undef strlcpy #endif /* _UN_NAMESPACE_H_ */ ==== //depot/projects/ia64/lib/libc/locale/setlocale.c#5 (text+ko) ==== @@ -39,8 +39,9 @@ static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.41 2002/08/08 05:51:54 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.42 2003/04/29 21:13:49 nectar Exp $"); +#include "namespace.h" #include #include #include @@ -50,6 +51,7 @@ #include #include #include +#include "un-namespace.h" #include "collate.h" #include "lmonetary.h" /* for __monetary_load_locale() */ #include "lnumeric.h" /* for __numeric_load_locale() */ @@ -180,7 +182,7 @@ errno = EINVAL; return (NULL); } - (void)strlcpy(new_categories[i], locale, + (void)_strlcpy(new_categories[i], locale, len + 1); i++; locale = r; ==== //depot/projects/ia64/lib/libc/net/getaddrinfo.c#11 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.38 2003/04/24 17:41:20 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.39 2003/04/29 21:13:49 nectar Exp $"); #include "namespace.h" #include @@ -853,7 +853,7 @@ ai->ai_canonname = (char *)malloc(strlen(str) + 1); if (ai->ai_canonname == NULL) return EAI_MEMORY; - strlcpy(ai->ai_canonname, str, strlen(str) + 1); + _strlcpy(ai->ai_canonname, str, strlen(str) + 1); } return 0; } @@ -1305,7 +1305,7 @@ had_error++; continue; } - strlcpy(bp, tbuf, ep - bp); + _strlcpy(bp, tbuf, ep - bp); canonname = bp; bp += n; continue; ==== //depot/projects/ia64/lib/libc/net/gethostbydns.c#7 (text+ko) ==== @@ -58,8 +58,9 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.41 2002/10/26 19:00:14 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.42 2003/04/29 21:13:49 nectar Exp $"); +#include "namespace.h" #include #include #include @@ -78,6 +79,7 @@ #include #include #include +#include "un-namespace.h" #include "res_config.h" @@ -674,7 +676,7 @@ uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf)); } - strlcat(qbuf, "ip6.arpa", sizeof(qbuf)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 29 16:43:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03AEB37B404; Tue, 29 Apr 2003 16:43:40 -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 A3C7337B401 for ; Tue, 29 Apr 2003 16:43:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E53643F3F for ; Tue, 29 Apr 2003 16:43:39 -0700 (PDT) (envelope-from marcel@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 h3TNhd0U084392 for ; Tue, 29 Apr 2003 16:43:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TNhatf084339 for perforce@freebsd.org; Tue, 29 Apr 2003 16:43:36 -0700 (PDT) Date: Tue, 29 Apr 2003 16:43:36 -0700 (PDT) Message-Id: <200304292343.h3TNhatf084339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30061 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, 29 Apr 2003 23:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30061 Change 30061 by marcel@marcel_pluto1 on 2003/04/29 16:42:36 IFia64 Affected files ... .. //depot/projects/ia64_epc/etc/netstart#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/motd#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/network_ipv6#2 integrate .. //depot/projects/ia64_epc/etc/services#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libstdc++/c++config.h#4 integrate .. //depot/projects/ia64_epc/gnu/lib/libstdc++/config.h#4 integrate .. //depot/projects/ia64_epc/include/limits.h#2 integrate .. //depot/projects/ia64_epc/include/wchar.h#3 integrate .. //depot/projects/ia64_epc/lib/libc/gen/check_utility_compat.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/getgrent.c#7 integrate .. //depot/projects/ia64_epc/lib/libc/gen/getpwent.c#7 integrate .. //depot/projects/ia64_epc/lib/libc/i386/sys/i386_vm86.2#2 integrate .. //depot/projects/ia64_epc/lib/libc/include/namespace.h#4 integrate .. //depot/projects/ia64_epc/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/ia64_epc/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/ia64_epc/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/net/hesiod.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/net/if_nametoindex.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/nls/msgcat.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/rpc/rpc_soc.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/realpath.c#4 integrate .. //depot/projects/ia64_epc/lib/libc/string/strerror.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/arch/i386/i386/thr_switch.S#4 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_create.c#5 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_detach.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_exit.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_find_thread.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_init.c#5 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_join.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_kern.c#7 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_nanosleep.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_priority_queue.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_sig.c#5 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_sigwait.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_spinlock.c#4 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_yield.c#3 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/errata/article.sgml#7 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/ia64_epc/sbin/ifconfig/ifmedia.c#3 integrate .. //depot/projects/ia64_epc/share/man/man4/acpi.4#3 integrate .. //depot/projects/ia64_epc/share/man/man4/ip.4#4 integrate .. //depot/projects/ia64_epc/share/misc/bsd-family-tree#4 integrate .. //depot/projects/ia64_epc/sys/alpha/include/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/alpha/osf1/osf1_signal.c#6 integrate .. //depot/projects/ia64_epc/sys/arm/include/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/ia64_epc/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/ia64_epc/sys/conf/files#12 integrate .. //depot/projects/ia64_epc/sys/conf/files.ia64#10 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acdos16.h#2 delete .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/actbl71.h#2 delete .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evgpe.c#1 branch .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evgpeblk.c#1 branch .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsparse.c#1 branch .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psfind.c#2 delete .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbconvrt.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbget.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/en/midway.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/fb/fbreg.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/fwohci.c#9 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/iec68113.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/ia64_epc/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/raidframe/rf_types.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/sio/sio.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/syscons/scmouse.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/wi/if_wi.c#7 integrate .. //depot/projects/ia64_epc/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_crypt.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_dev.c#7 integrate .. //depot/projects/ia64_epc/sys/i386/include/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/isa/clock.c#4 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/ia64_epc/sys/ia64/include/bus.h#4 integrate .. //depot/projects/ia64_epc/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/ia64_epc/sys/ia64/include/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/isa/psm.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_clock.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/subr_scanf.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/sys_generic.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_default.c#7 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/ia64_epc/sys/libkern/quad.h#2 integrate .. //depot/projects/ia64_epc/sys/libkern/strtol.c#2 integrate .. //depot/projects/ia64_epc/sys/libkern/strtoq.c#2 integrate .. //depot/projects/ia64_epc/sys/libkern/strtoul.c#2 integrate .. //depot/projects/ia64_epc/sys/libkern/strtouq.c#2 integrate .. //depot/projects/ia64_epc/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/net/if_atm.h#3 integrate .. //depot/projects/ia64_epc/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/ia64_epc/sys/net/if_media.c#3 integrate .. //depot/projects/ia64_epc/sys/net/if_media.h#3 integrate .. //depot/projects/ia64_epc/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/ia64_epc/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/ia64_epc/sys/netinet/in.h#3 integrate .. //depot/projects/ia64_epc/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/ia64_epc/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_input.c#6 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_output.c#6 integrate .. //depot/projects/ia64_epc/sys/netinet6/ah_output.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet6/esp_output.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/ia64_epc/sys/netinet6/in6.h#2 integrate .. //depot/projects/ia64_epc/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/ia64_epc/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/ia64_epc/sys/netinet6/nd6.c#3 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/ia64_epc/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/clock.c#4 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/pc98kbd.c#2 integrate .. //depot/projects/ia64_epc/sys/pc98/pc98/sio.c#5 integrate .. //depot/projects/ia64_epc/sys/pci/if_en_pci.c#4 integrate .. //depot/projects/ia64_epc/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/asm.h#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/utrap.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/exception.S#5 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/genassym.c#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/mp_locore.S#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/swtch.S#5 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/upa.c#2 delete .. //depot/projects/ia64_epc/sys/sys/param.h#9 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/ia64_epc/sys/vm/vm_glue.c#6 integrate .. //depot/projects/ia64_epc/sys/vm/vm_pageout.h#3 integrate .. //depot/projects/ia64_epc/sys/x86_64/include/limits.h#2 integrate .. //depot/projects/ia64_epc/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/pcvt/vttest/main.c#2 integrate Differences ... ==== //depot/projects/ia64_epc/etc/netstart#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/netstart,v 1.60 2001/05/18 09:14:39 brian Exp $ +# $FreeBSD: src/etc/netstart,v 1.62 2003/04/29 15:32:02 imp Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -34,41 +34,33 @@ # the network by hand, this script will do it for you). # -# If there is a global system configuration file, suck it in. -if [ -f /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -f /etc/rc.conf ]; then - . /etc/rc.conf -fi +. /etc/rc.subr -# Start pccard if necessary -if [ -r /etc/rc.pccard ]; then - . /etc/rc.pccard -fi - -if [ -r /etc/rc.network ]; then - . /etc/rc.network -else - echo 'Sorry, I cannot find /etc/rc.network - aborting' - exit 1 -fi - -echo 'Doing stage one network startup:' -network_pass1 - -case ${ipv6_enable} in -[Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 - else - echo 'Sorry, I cannot find /etc/rc.network6 - aborting' - exit 1 - fi - - echo 'Doing stage one network6 startup:' - network6_pass1 - ;; -esac +load_rc_config 'XXX' +/etc/rc.d/pccard start +/etc/rc.d/devd start +/etc/rc.d/hostname start +/etc/rc.d/ipmon start +/etc/rc.d/ipfilter start +/etc/rc.d/ipnat start +/etc/rc.d/ipfs start +/etc/rc.d/sppp start +# /etc/rc.d/atm1 start +# . /etc/rc.d/atm2.sh start +# . /etc/rc.d/atm3.sh start +/etc/rc.d/netif start +/etc/rc.d/ipsec start +/etc/rc.d/dhclient start +/etc/rc.d/isdnd start +/etc/rc.d/ppp-user start +/etc/rc.d/ipfw start +/etc/rc.d/network2 start +/etc/rc.d/ip6fw start +/etc/rc.d/network_ipv6 start +/etc/rc.d/mroute6d start +/etc/rc.d/route6d start +/etc/rc.d/mrouted start +/etc/rc.d/routed start +/etc/rc.d/nisdomain start exit 0 ==== //depot/projects/ia64_epc/etc/rc.d/motd#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.5 2003/04/29 06:56:40 dougb Exp $ # # PROVIDE: motd @@ -18,11 +18,9 @@ case ${OSTYPE} in FreeBSD) - T=`mktemp /tmp/_motd.XXXXXX` PERMS="644" ;; NetBSD) - T="/etc/_motd" PERMS="664" ;; esac @@ -40,10 +38,12 @@ case ${OSTYPE} in FreeBSD) + T=`mktemp /tmp/_motd.XXXXXX` uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T} awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T} ;; NetBSD) + T='/etc/_motd' sysctl -n kern.version | while read i; do echo $i; break; done > $T sed '1{/^NetBSD.*/{d;};};' < /etc/motd >> $T ;; ==== //depot/projects/ia64_epc/etc/rc.d/network_ipv6#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.32 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.33 2003/04/29 12:08:43 jwd Exp $ # From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43 # @@ -32,6 +32,8 @@ # REQUIRE: network2 # KEYWORD: FreeBSD +. /etc/rc.subr + name="network_ipv6" rcvar=`set_rcvar ipv6` start_cmd="network_ipv6_start" ==== //depot/projects/ia64_epc/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.91 2003/01/04 16:03:56 schweikh Exp $ +# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2004,6 +2004,8 @@ hacl-test 5305/udp cfengine 5308/tcp cfengine 5308/udp +mdns 5353/tcp #Multicast DNS +mdns 5353/udp #Multicast DNS postgresql 5432/tcp #PostgreSQL Database postgresql 5432/udp #PostgreSQL Database rplay 5555/udp ==== //depot/projects/ia64_epc/gnu/lib/libstdc++/c++config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $ +// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.5 2003/04/29 18:10:45 kan Exp $ // Predefined symbols and macros -*- C++ -*- @@ -104,7 +104,7 @@ #define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. -/* #undef _GLIBCPP_USE_WCHAR_T */ +#define _GLIBCPP_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. /* #undef _GLIBCPP_MEM_LIMITS */ ==== //depot/projects/ia64_epc/gnu/lib/libstdc++/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.6 2003/04/29 18:10:45 kan Exp $ */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -16,7 +16,7 @@ #define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. -/* #undef _GLIBCPP_USE_WCHAR_T */ +#define _GLIBCPP_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. /* #undef _GLIBCPP_MEM_LIMITS */ ==== //depot/projects/ia64_epc/include/limits.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.15 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $ */ #ifndef _LIMITS_H_ @@ -125,7 +125,7 @@ #define MB_LEN_MAX 6 /* 31-bit UTF-8 */ -#include +#include #if __POSIX_VISIBLE #include ==== //depot/projects/ia64_epc/include/wchar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.34 2003/03/13 06:29:53 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $ */ /*- @@ -69,6 +69,7 @@ #include #include +#include #ifndef NULL #define NULL 0 @@ -96,6 +97,11 @@ #define _WINT_T_DECLARED #endif +#ifndef WCHAR_MIN +#define WCHAR_MIN __INT_MIN +#define WCHAR_MAX __INT_MAX +#endif + #ifndef WEOF #define WEOF ((wint_t)-1) #endif ==== //depot/projects/ia64_epc/lib/libc/gen/check_utility_compat.c#2 (text+ko) ==== @@ -28,17 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.1 2002/10/28 00:15:43 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.2 2003/04/29 21:13:48 nectar Exp $"); -/* - * I din't use "namespace.h" here because none of the relevant utilities - * are threaded, so I'm not concerned about cancellation points or other - * niceties. - */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #ifndef LINE_MAX #define LINE_MAX _POSIX2_LINE_MAX @@ -55,7 +52,7 @@ int len; if ((p = getenv(_ENV_UTIL_COMPAT)) != NULL) { - strlcpy(buf, p, sizeof buf); + _strlcpy(buf, p, sizeof buf); } else { if ((len = readlink(_PATH_UTIL_COMPAT, buf, sizeof buf)) < 0) return 0; ==== //depot/projects/ia64_epc/lib/libc/gen/confstr.c#2 (text+ko) ==== @@ -35,15 +35,16 @@ static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.7 2002/09/19 03:47:36 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.8 2003/04/29 21:13:48 nectar Exp $"); +#include "namespace.h" #include - #include #include #include #include #include +#include "un-namespace.h" size_t @@ -114,7 +115,7 @@ docopy: if (len != 0 && buf != NULL) - strlcpy(buf, p, len); + _strlcpy(buf, p, len); return (strlen(p) + 1); default: ==== //depot/projects/ia64_epc/lib/libc/gen/fmtmsg.c#2 (text+ko) ==== @@ -25,12 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.3 2002/09/01 01:49:27 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.4 2003/04/29 21:13:48 nectar Exp $"); +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" /* Default value for MSGVERB. */ #define DFLT_MSGVERB "label:severity:text:action:tag" @@ -101,13 +103,13 @@ #define INSERT_COLON \ if (*output != '\0') \ - strlcat(output, ": ", size) + _strlcat(output, ": ", size) #define INSERT_NEWLINE \ if (*output != '\0') \ - strlcat(output, "\n", size) + _strlcat(output, "\n", size) #define INSERT_SPACE \ if (*output != '\0') \ - strlcat(output, " ", size) + _strlcat(output, " ", size) /* * Returns NULL on memory allocation failure, otherwise returns a pointer to @@ -139,20 +141,20 @@ while ((comp = nextcomp(msgverb)) != NULL) { if (strcmp(comp, "label") == 0 && label != MM_NULLLBL) { INSERT_COLON; - strlcat(output, label, size); + _strlcat(output, label, size); } else if (strcmp(comp, "severity") == 0 && sevname != NULL) { INSERT_COLON; - strlcat(output, sevinfo(sev), size); + _strlcat(output, sevinfo(sev), size); } else if (strcmp(comp, "text") == 0 && text != MM_NULLTXT) { INSERT_COLON; - strlcat(output, text, size); + _strlcat(output, text, size); } else if (strcmp(comp, "action") == 0 && act != MM_NULLACT) { INSERT_NEWLINE; - strlcat(output, "TO FIX: ", size); - strlcat(output, act, size); + _strlcat(output, "TO FIX: ", size); + _strlcat(output, act, size); } else if (strcmp(comp, "tag") == 0 && tag != MM_NULLTAG) { INSERT_SPACE; - strlcat(output, tag, size); + _strlcat(output, tag, size); } } INSERT_NEWLINE; @@ -171,7 +173,7 @@ char *retval; if (*lmsgverb == '\0') { - strlcpy(lmsgverb, msgverb, sizeof(lmsgverb)); + _strlcpy(lmsgverb, msgverb, sizeof(lmsgverb)); retval = strtok_r(lmsgverb, ":", &state); } else { retval = strtok_r(NULL, ":", &state); ==== //depot/projects/ia64_epc/lib/libc/gen/getgrent.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.30 2003/04/29 21:13:48 nectar Exp $"); #include "namespace.h" #include @@ -620,7 +620,7 @@ * pointer for the member list terminator. */ adjsize = bufsize - _ALIGNBYTES - sizeof(char *); - linesize = strlcpy(buffer, hes[0], adjsize); + linesize = _strlcpy(buffer, hes[0], adjsize); if (linesize >= adjsize) { *errnop = ERANGE; rv = NS_RETURN; @@ -721,7 +721,7 @@ rv = NS_NOTFOUND; switch (how) { case nss_lt_name: - if (strlcpy(buffer, name, bufsize) >= bufsize) + if (_strlcpy(buffer, name, bufsize) >= bufsize) goto erange; break; case nss_lt_id: ==== //depot/projects/ia64_epc/lib/libc/gen/getpwent.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.79 2003/04/25 18:25:19 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.80 2003/04/29 21:13:48 nectar Exp $"); #include "namespace.h" #include @@ -584,7 +584,7 @@ /* MAXLOGNAME includes NUL byte, but we do not * include the NUL byte in the key. */ - namesize = strlcpy(&keybuf[1], name, sizeof(keybuf)-1); + namesize = _strlcpy(&keybuf[1], name, sizeof(keybuf)-1); if (namesize >= sizeof(keybuf)-1) { *errnop = EINVAL; rv = NS_NOTFOUND; @@ -897,7 +897,7 @@ hes = NULL; continue; } - linesize = strlcpy(buffer, hes[0], bufsize); + linesize = _strlcpy(buffer, hes[0], bufsize); if (linesize >= bufsize) { *errnop = ERANGE; rv = NS_RETURN; @@ -1055,7 +1055,7 @@ rv = NS_NOTFOUND; switch (how) { case nss_lt_name: - if (strlcpy(buffer, name, bufsize) >= bufsize) + if (_strlcpy(buffer, name, bufsize) >= bufsize) goto erange; break; case nss_lt_id: @@ -1215,7 +1215,7 @@ hold.field = NULL; \ else { \ hold.field = p; \ - p += strlcpy(p, pwd->field, eob-p) + 1; \ + p += _strlcpy(p, pwd->field, eob-p) + 1; \ } \ } while (0) COPY(pw_name); @@ -1233,7 +1233,7 @@ pwd->field = NULL; \ else { \ pwd->field = p; \ - if ((n = strlcpy(p, q, eob-p)) >= eob-p) { \ + if ((n = _strlcpy(p, q, eob-p)) >= eob-p) { \ free(copy); \ return (ERANGE); \ } \ ==== //depot/projects/ia64_epc/lib/libc/i386/sys/i386_vm86.2#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.12 2002/12/19 09:40:22 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.13 2003/04/29 08:35:28 mdodd Exp $ .\" .Dd July 27, 1998 .Os @@ -79,9 +79,38 @@ .Em Nth bit is set, the interrupt will be reflected to the process, otherwise it will be dispatched by the vm86 interrupt table. -.\" .It Dv VM86_SET_VME -.\" .It Dv VM86_GET_VME -.\" .It Dv VM86_INTCALL +.It Dv VM86_INTCALL +This allows calls to be made to vm86 interrupt handlers by the process. It +effectively simulates an INT instruction. +.Fa data +should point to the following structure: +.Bd -literal +struct vm86_intcall_args { + int intnum; + struct vm86frame vmf; +}; +.Ed +.Pp +.Fa intnum +specifies the operand of INT for the simulated call. A value of 0x10, for +example, would often be used to call into the VGA BIOS. +.Fa vmf +is used to initialize CPU registers according to the calling convention for +the interrupt handler. +.It Dv VM86_GET_VME +This is used to retrieve the current state of the Pentium(r) processor's +VME (Virtual-8086 Mode Extensions) flag, which is bit 0 of CR4. +.Fa data +should be initialized to point to the following: +.Bd -literal +struct vm86_vme_args { + int state; /* status */ +}; +.Ed +.Pp +.Fa state +will contain the state of the VME flag on return. +\" .It Dv VM86_SET_VME .El .Pp vm86 mode is entered by calling @@ -104,4 +133,6 @@ .El .Sh AUTHORS This man page was written by -.An Jonathan Lemon . +.An Jonathan Lemon , +and updated by +.An Bruce M Simpson . ==== //depot/projects/ia64_epc/lib/libc/include/namespace.h#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/lib/libc/include/namespace.h,v 1.14 2003/04/17 14:14:22 nectar Exp $ + * $FreeBSD: src/lib/libc/include/namespace.h,v 1.15 2003/04/29 21:13:49 nectar Exp $ */ #ifndef _NAMESPACE_H_ @@ -43,6 +43,8 @@ #define err _err #define warn _warn #define nsdispatch _nsdispatch +#define strlcat _strlcat +#define strlcpy _strlcpy /* * Prototypes for syscalls/functions that need to be overridden ==== //depot/projects/ia64_epc/lib/libc/include/un-namespace.h#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/lib/libc/include/un-namespace.h,v 1.11 2003/04/17 14:14:22 nectar Exp $ + * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.12 2003/04/29 21:13:49 nectar Exp $ */ #ifndef _UN_NAMESPACE_H_ @@ -149,5 +149,7 @@ #undef err #undef warn #undef nsdispatch +#undef strlcat +#undef strlcpy #endif /* _UN_NAMESPACE_H_ */ ==== //depot/projects/ia64_epc/lib/libc/locale/setlocale.c#2 (text+ko) ==== @@ -39,8 +39,9 @@ static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.41 2002/08/08 05:51:54 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.42 2003/04/29 21:13:49 nectar Exp $"); +#include "namespace.h" #include #include #include @@ -50,6 +51,7 @@ #include #include #include +#include "un-namespace.h" #include "collate.h" #include "lmonetary.h" /* for __monetary_load_locale() */ #include "lnumeric.h" /* for __numeric_load_locale() */ @@ -180,7 +182,7 @@ errno = EINVAL; return (NULL); } - (void)strlcpy(new_categories[i], locale, + (void)_strlcpy(new_categories[i], locale, len + 1); i++; locale = r; ==== //depot/projects/ia64_epc/lib/libc/net/getaddrinfo.c#4 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.38 2003/04/24 17:41:20 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.39 2003/04/29 21:13:49 nectar Exp $"); #include "namespace.h" #include @@ -853,7 +853,7 @@ ai->ai_canonname = (char *)malloc(strlen(str) + 1); if (ai->ai_canonname == NULL) return EAI_MEMORY; - strlcpy(ai->ai_canonname, str, strlen(str) + 1); + _strlcpy(ai->ai_canonname, str, strlen(str) + 1); } return 0; } @@ -1305,7 +1305,7 @@ had_error++; continue; } - strlcpy(bp, tbuf, ep - bp); + _strlcpy(bp, tbuf, ep - bp); canonname = bp; bp += n; continue; ==== //depot/projects/ia64_epc/lib/libc/net/gethostbydns.c#2 (text+ko) ==== @@ -58,8 +58,9 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.41 2002/10/26 19:00:14 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.42 2003/04/29 21:13:49 nectar Exp $"); +#include "namespace.h" #include #include #include @@ -78,6 +79,7 @@ #include #include #include +#include "un-namespace.h" #include "res_config.h" @@ -674,7 +676,7 @@ uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf)); } - strlcat(qbuf, "ip6.arpa", sizeof(qbuf)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 29 21:21:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CF5D37B404; Tue, 29 Apr 2003 21:21:21 -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 B826837B401 for ; Tue, 29 Apr 2003 21:21:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64B6543FCB for ; Tue, 29 Apr 2003 21:21:20 -0700 (PDT) (envelope-from marcel@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 h3U4LK0U096612 for ; Tue, 29 Apr 2003 21:21:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3U4LJC3096605 for perforce@freebsd.org; Tue, 29 Apr 2003 21:21:19 -0700 (PDT) Date: Tue, 29 Apr 2003 21:21:19 -0700 (PDT) Message-Id: <200304300421.h3U4LJC3096605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30072 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 04:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30072 Change 30072 by marcel@marcel_nfs on 2003/04/29 21:20:44 Perform a memory fence after saving the context. This guarantees that the writes are made visible before we switch-in a new context. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#14 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#14 (text+ko) ==== @@ -284,12 +284,15 @@ stf.spill [r31]=f27,32 stf.spill [r32]=f28,32 ;; +{ .mmi stf.spill [r31]=f29,32 stf.spill [r32]=f30 +(p15) add r8=0,r0 ;; -{ .mib +} +{ .mmb stf.spill [r31]=f31 -(p15) add r8=0,r0 + mf (p15) br.ret.sptk rp ;; } From owner-p4-projects@FreeBSD.ORG Tue Apr 29 23:22:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8778837B404; Tue, 29 Apr 2003 23:22:55 -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 2408237B401 for ; Tue, 29 Apr 2003 23:22:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C242543F85 for ; Tue, 29 Apr 2003 23:22:54 -0700 (PDT) (envelope-from jmallett@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 h3U6Ms0U084779 for ; Tue, 29 Apr 2003 23:22:54 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3U6Mson084772 for perforce@freebsd.org; Tue, 29 Apr 2003 23:22:54 -0700 (PDT) Date: Tue, 29 Apr 2003 23:22:54 -0700 (PDT) Message-Id: <200304300622.h3U6Mson084772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30076 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 06:22:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=30076 Change 30076 by jmallett@jmallett_dalek on 2003/04/29 23:22:33 Never underestimate the power of letting one's girlfriend review your code... For the kernel stack for thread 0, keep the physical and the meta-physical addresses for a reason, the non-physical should be a usable address. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#10 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#10 (text+ko) ==== @@ -328,13 +328,13 @@ int i; kptemapsize = PAGE_SIZE; /* XXX placeholder */ - kptemap = pmap_bootstrap_alloc(sizeof *kptemap * kptemapsize); + kptemap = pmap_steal_memory(sizeof *kptemap * kptemapsize); /* * Allocate a kernel stack for thread0. */ kstack0_phys = pmap_bootstrap_alloc(KSTACK_PAGES * PAGE_SIZE); - kstack0 = kstack0_phys; + kstack0 = MIPS_PHYS_TO_KSEG0(kstack0_phys); /* * Calculate the first and last available physical addresses. From owner-p4-projects@FreeBSD.ORG Tue Apr 29 23:38:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 836B837B404; Tue, 29 Apr 2003 23:38:14 -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 257AC37B401 for ; Tue, 29 Apr 2003 23:38:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C5DFF43F3F for ; Tue, 29 Apr 2003 23:38:13 -0700 (PDT) (envelope-from marcel@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 h3U6cD0U095926 for ; Tue, 29 Apr 2003 23:38:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3U6cDPO095921 for perforce@freebsd.org; Tue, 29 Apr 2003 23:38:13 -0700 (PDT) Date: Tue, 29 Apr 2003 23:38:13 -0700 (PDT) Message-Id: <200304300638.h3U6cDPO095921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30077 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 06:38:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=30077 Change 30077 by marcel@marcel_nfs on 2003/04/29 23:37:53 Catch up with the removal of Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#13 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#13 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,6 @@ #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 00:05:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FEC837B404; Wed, 30 Apr 2003 00:05:48 -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 6588637B401 for ; Wed, 30 Apr 2003 00:05:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1223B43F93 for ; Wed, 30 Apr 2003 00:05:48 -0700 (PDT) (envelope-from marcel@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 h3U75l0U016415 for ; Wed, 30 Apr 2003 00:05:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3U75l0Z016404 for perforce@freebsd.org; Wed, 30 Apr 2003 00:05:47 -0700 (PDT) Date: Wed, 30 Apr 2003 00:05:47 -0700 (PDT) Message-Id: <200304300705.h3U75l0Z016404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30078 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 07:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=30078 Change 30078 by marcel@marcel_nfs on 2003/04/30 00:05:12 IFia64 (removal of ) Affected files ... .. //depot/projects/ia64_epc/sys/dev/sio/sio_cons.c#3 integrate Differences ... ==== //depot/projects/ia64_epc/sys/dev/sio/sio_cons.c#3 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,6 @@ #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 00:19:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7769337B404; Wed, 30 Apr 2003 00:19:05 -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 2598A37B401 for ; Wed, 30 Apr 2003 00:19:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF4BC43F93 for ; Wed, 30 Apr 2003 00:19:04 -0700 (PDT) (envelope-from marcel@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 h3U7J40U025647 for ; Wed, 30 Apr 2003 00:19:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3U7J4Mm025641 for perforce@freebsd.org; Wed, 30 Apr 2003 00:19:04 -0700 (PDT) Date: Wed, 30 Apr 2003 00:19:04 -0700 (PDT) Message-Id: <200304300719.h3U7J4Mm025641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30079 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 07:19:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=30079 Change 30079 by marcel@marcel_pluto2 on 2003/04/30 00:18:22 Fix a botched merge. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#38 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#38 (text+ko) ==== @@ -27,7 +27,6 @@ dev/fb/fb.c optional fb dev/fb/fb.c optional vga sc dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd From owner-p4-projects@FreeBSD.ORG Wed Apr 30 09:27:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D25937B404; Wed, 30 Apr 2003 09:27:16 -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 9A46637B401 for ; Wed, 30 Apr 2003 09:27:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3243E43F75 for ; Wed, 30 Apr 2003 09:27:15 -0700 (PDT) (envelope-from obrien@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 h3UGRF0U039514 for ; Wed, 30 Apr 2003 09:27:15 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UGREHt039507 for perforce@freebsd.org; Wed, 30 Apr 2003 09:27:14 -0700 (PDT) Date: Wed, 30 Apr 2003 09:27:14 -0700 (PDT) Message-Id: <200304301627.h3UGREHt039507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30095 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 16:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=30095 Change 30095 by obrien@obrien_trang on 2003/04/30 09:26:31 Bring alloca.S back to life. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#3 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 09:36:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42E1737B404; Wed, 30 Apr 2003 09:36:28 -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 EB0A737B401 for ; Wed, 30 Apr 2003 09:36:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A58A43FD7 for ; Wed, 30 Apr 2003 09:36:27 -0700 (PDT) (envelope-from obrien@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 h3UGaQ0U046520 for ; Wed, 30 Apr 2003 09:36:26 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UGaQ4t046510 for perforce@freebsd.org; Wed, 30 Apr 2003 09:36:26 -0700 (PDT) Date: Wed, 30 Apr 2003 09:36:26 -0700 (PDT) Message-Id: <200304301636.h3UGaQ4t046510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30096 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 16:36:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30096 Change 30096 by obrien@obrien_trang on 2003/04/30 09:35:47 Convert to x86-64 ISA using NetBSD as a reference. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#4 (text+ko) ==== @@ -45,15 +45,12 @@ /* like alloc, but automatic automatic free in return */ ENTRY(alloca) - popl %edx /* pop return addr */ - popl %eax /* pop amount to allocate */ - movl %esp,%ecx - addl $3,%eax /* round up to next word */ - andl $0xfffffffc,%eax - subl %eax,%esp - movl %esp,%eax /* base of newly allocated space */ - pushl 8(%ecx) /* copy possible saved registers */ - pushl 4(%ecx) - pushl 0(%ecx) - pushl %eax /* dummy to pop at callsite */ - jmp *%edx /* "return" */ + popq %rdx /* pop return addr */ + movl %rsp,%rcx + addq $15,%rdi /* round up to 16 bytes */ + andq $~15,%rdi + subq %rdi,%rsp + movq %rsp,%rax /* base of newly allocated space */ + jmp *%rdx /* "return" */ + + From owner-p4-projects@FreeBSD.ORG Wed Apr 30 09:37:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 159F437B405; Wed, 30 Apr 2003 09:37: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 B24B437B401 for ; Wed, 30 Apr 2003 09:37:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0091543FA3 for ; Wed, 30 Apr 2003 09:37:29 -0700 (PDT) (envelope-from obrien@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 h3UGbS0U047155 for ; Wed, 30 Apr 2003 09:37:28 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UGbSVM047150 for perforce@freebsd.org; Wed, 30 Apr 2003 09:37:28 -0700 (PDT) Date: Wed, 30 Apr 2003 09:37:28 -0700 (PDT) Message-Id: <200304301637.h3UGbSVM047150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30097 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 16:37:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30097 Change 30097 by obrien@obrien_trang on 2003/04/30 09:37:22 Add alloca, fabs, modf. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#2 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.18 2002/11/16 06:39:11 deischen Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ + fabs.S modf.S \ frexp.c infinity.c isinf.c From owner-p4-projects@FreeBSD.ORG Wed Apr 30 10:30:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1120C37B404; Wed, 30 Apr 2003 10:30:45 -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 B46F437B401 for ; Wed, 30 Apr 2003 10:30:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 498C643FD7 for ; Wed, 30 Apr 2003 10:30:44 -0700 (PDT) (envelope-from obrien@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 h3UHUi0U085137 for ; Wed, 30 Apr 2003 10:30:44 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UHUhkG085129 for perforce@freebsd.org; Wed, 30 Apr 2003 10:30:43 -0700 (PDT) Date: Wed, 30 Apr 2003 10:30:43 -0700 (PDT) Message-Id: <200304301730.h3UHUhkG085129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30100 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 17:30:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30100 Change 30100 by obrien@obrien_trang on 2003/04/30 10:30:18 taken from NetBSD. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 11:33:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46CFA37B405; Wed, 30 Apr 2003 11:33:07 -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 E76B037B404 for ; Wed, 30 Apr 2003 11:33:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA67743F93 for ; Wed, 30 Apr 2003 11:33:04 -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 h3UIX40U036133 for ; Wed, 30 Apr 2003 11:33:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UIX16N036080 for perforce@freebsd.org; Wed, 30 Apr 2003 11:33:01 -0700 (PDT) Date: Wed, 30 Apr 2003 11:33:01 -0700 (PDT) Message-Id: <200304301833.h3UIX16N036080@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 30104 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 18:33:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=30104 Change 30104 by peter@peter_daintree on 2003/04/30 11:32:05 IFC @30102 (initial pass, I think I need -i for the rest) Affected files ... .. //depot/projects/hammer/Makefile.inc1#12 integrate .. //depot/projects/hammer/etc/netstart#2 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#8 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#6 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#4 integrate .. //depot/projects/hammer/etc/rc.d/motd#3 integrate .. //depot/projects/hammer/etc/rc.d/network_ipv6#3 integrate .. //depot/projects/hammer/etc/rc.subr#6 integrate .. //depot/projects/hammer/etc/services#3 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#4 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/config.h#4 integrate .. //depot/projects/hammer/include/limits.h#6 integrate .. //depot/projects/hammer/include/wchar.h#11 integrate .. //depot/projects/hammer/lib/Makefile#8 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#3 branch .. //depot/projects/hammer/lib/libc/gen/check_utility_compat.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/fmtmsg.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#5 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#3 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#6 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#8 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#5 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/hammer/lib/libc/net/hesiod.c#3 integrate .. //depot/projects/hammer/lib/libc/net/if_nametoindex.c#3 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/realpath.c#4 integrate .. //depot/projects/hammer/lib/libc/stdtime/strptime.c#6 integrate .. //depot/projects/hammer/lib/libc/string/strerror.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/hammer/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#11 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#8 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#10 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_chroot/pam_chroot.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_login_access/pam_login_access.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_switch.S#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_concurrency.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#3 integrate .. //depot/projects/hammer/libexec/Makefile#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/hammer/sbin/ifconfig/ifmedia.c#3 integrate .. //depot/projects/hammer/secure/lib/Makefile#4 integrate .. //depot/projects/hammer/secure/lib/Makefile.inc#2 integrate .. //depot/projects/hammer/secure/libexec/Makefile#3 integrate .. //depot/projects/hammer/secure/libexec/Makefile.inc#2 integrate .. //depot/projects/hammer/secure/usr.bin/Makefile#3 integrate .. //depot/projects/hammer/secure/usr.bin/Makefile.inc#2 integrate .. //depot/projects/hammer/secure/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/hammer/share/doc/smm/01.setup/3.t#3 integrate .. //depot/projects/hammer/share/doc/smm/06.nfs/1.t#3 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#5 integrate .. //depot/projects/hammer/share/man/man4/ip.4#5 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#8 integrate .. //depot/projects/hammer/sys/alpha/include/limits.h#3 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_signal.c#8 integrate .. //depot/projects/hammer/sys/arm/include/limits.h#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/hammer/sys/conf/files#16 integrate .. //depot/projects/hammer/sys/conf/files.ia64#8 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acdos16.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acgcc.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acinterp.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acnamesp.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acparser.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpiosxf.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/actbl71.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acutils.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlcode.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbdisply.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbfileio.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbstats.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmbuffer.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmnames.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dmwalk.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsfield.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsmthdat.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsobject.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsopcode.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dsutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswexec.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswload.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswscope.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evevent.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpe.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/evgpeblk.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/evmisc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exconvrt.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/excreate.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exfldio.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmisc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg3.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exprep.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresnte.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exresop.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstoren.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exstorob.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exsystem.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/exutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwacpi.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwgpe.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsaccess.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdump.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nseval.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsinit.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsload.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsparse.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/nssearch.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsutils.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psargs.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psfind.c#2 delete .. //depot/projects/hammer/sys/contrib/dev/acpica/psopcode.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rscreate.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsdump.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbconvrt.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbget.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbgetall.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbinstal.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbrsdt.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbutils.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utcopy.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdebug.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utinit.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utmisc.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/hammer/sys/dev/firewire/iec13213.h#5 integrate .. //depot/projects/hammer/sys/dev/firewire/iec68113.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbd.c#4 integrate .. //depot/projects/hammer/sys/dev/mca/mca_bus.c#3 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/hammer/sys/dev/raidframe/rf_types.h#2 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/hammer/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#10 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#6 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#12 integrate .. //depot/projects/hammer/sys/i386/include/limits.h#3 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/hammer/sys/ia64/include/bus.h#5 integrate .. //depot/projects/hammer/sys/ia64/include/cpufunc.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/limits.h#3 integrate .. //depot/projects/hammer/sys/isa/atkbd_isa.c#2 integrate .. //depot/projects/hammer/sys/isa/atkbdc_isa.c#2 integrate .. //depot/projects/hammer/sys/isa/ppc.c#3 integrate .. //depot/projects/hammer/sys/isa/psm.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#22 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_scanf.c#4 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#6 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#9 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/hammer/sys/libkern/quad.h#3 integrate .. //depot/projects/hammer/sys/libkern/strtol.c#2 integrate .. //depot/projects/hammer/sys/libkern/strtoq.c#2 integrate .. //depot/projects/hammer/sys/libkern/strtoul.c#2 integrate .. //depot/projects/hammer/sys/libkern/strtouq.c#2 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/hammer/sys/net/if.c#7 integrate .. //depot/projects/hammer/sys/net/if_atm.h#3 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/hammer/sys/net/if_media.c#3 integrate .. //depot/projects/hammer/sys/net/if_media.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/hammer/sys/netinet/in.h#7 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#12 integrate .. //depot/projects/hammer/sys/netinet6/ah_output.c#3 integrate .. //depot/projects/hammer/sys/netinet6/esp_output.c#3 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#3 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#4 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#3 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#6 integrate .. //depot/projects/hammer/sys/pc98/pc98/pc98kbd.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#7 integrate .. //depot/projects/hammer/sys/pci/if_en_pci.c#4 integrate .. //depot/projects/hammer/sys/powerpc/include/limits.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/hammer/sys/sparc64/include/asm.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/limits.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/trap.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/utrap.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#11 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/interrupt.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/locore.S#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_exception.S#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_locore.S#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/support.S#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/swtch.S#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/upa.c#2 delete .. //depot/projects/hammer/sys/sys/cdio.h#2 integrate .. //depot/projects/hammer/sys/sys/param.h#11 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#4 integrate .. //depot/projects/hammer/sys/x86_64/include/limits.h#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/hammer/usr.sbin/pcvt/vttest/main.c#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.349 2003/04/16 21:05:06 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -203,13 +203,13 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS + -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ + -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ - BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -640,6 +640,12 @@ _strfile= games/fortune/strfile .endif +.if ${BOOTSTRAPPING} < 500042 +_groff= gnu/usr.bin/groff +.else +_groff= gnu/usr.bin/groff/tmac +.endif + .if ( ${BOOTSTRAPPING} < 450005 || \ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 )) _uudecode= usr.bin/uudecode @@ -664,7 +670,7 @@ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ usr.sbin/config ${_kbdcontrol} \ - gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo + gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/hammer/etc/netstart#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/netstart,v 1.60 2001/05/18 09:14:39 brian Exp $ +# $FreeBSD: src/etc/netstart,v 1.62 2003/04/29 15:32:02 imp Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -34,41 +34,33 @@ # the network by hand, this script will do it for you). # -# If there is a global system configuration file, suck it in. -if [ -f /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -f /etc/rc.conf ]; then - . /etc/rc.conf -fi +. /etc/rc.subr -# Start pccard if necessary -if [ -r /etc/rc.pccard ]; then - . /etc/rc.pccard -fi - -if [ -r /etc/rc.network ]; then - . /etc/rc.network -else - echo 'Sorry, I cannot find /etc/rc.network - aborting' - exit 1 -fi - -echo 'Doing stage one network startup:' -network_pass1 - -case ${ipv6_enable} in -[Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 - else - echo 'Sorry, I cannot find /etc/rc.network6 - aborting' - exit 1 - fi - - echo 'Doing stage one network6 startup:' - network6_pass1 - ;; -esac +load_rc_config 'XXX' +/etc/rc.d/pccard start +/etc/rc.d/devd start +/etc/rc.d/hostname start +/etc/rc.d/ipmon start +/etc/rc.d/ipfilter start +/etc/rc.d/ipnat start +/etc/rc.d/ipfs start +/etc/rc.d/sppp start +# /etc/rc.d/atm1 start +# . /etc/rc.d/atm2.sh start +# . /etc/rc.d/atm3.sh start +/etc/rc.d/netif start +/etc/rc.d/ipsec start +/etc/rc.d/dhclient start +/etc/rc.d/isdnd start +/etc/rc.d/ppp-user start +/etc/rc.d/ipfw start +/etc/rc.d/network2 start +/etc/rc.d/ip6fw start +/etc/rc.d/network_ipv6 start +/etc/rc.d/mroute6d start +/etc/rc.d/route6d start +/etc/rc.d/mrouted start +/etc/rc.d/routed start +/etc/rc.d/nisdomain start exit 0 ==== //depot/projects/hammer/etc/rc.d/ipfilter#8 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.8 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipfilter @@ -42,7 +42,7 @@ # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -79,12 +79,12 @@ echo "Enabling ipfilter." case ${OSTYPE} in FreeBSD) - ${ipfilter_program:-/sbin/ipf} -Fa + ${ipfilter_program:-/sbin/ipf} -EFa if [ -r "${ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} \ -f "${ipfilter_rules}" ${ipfilter_flags} fi - ${ipfilter_program:-/sbin/ipf} -6 -Fa + ${ipfilter_program:-/sbin/ipf} -6 -EFa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} ==== //depot/projects/hammer/etc/rc.d/ipnat#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.7 2003/04/24 18:14:52 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.8 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipnat @@ -44,7 +44,7 @@ # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -55,10 +55,10 @@ ipnat_start() { if [ ! -f ${ipnat_rules} ]; then - echo -n ' NO IPNAT RULES' + warn 'NO IPNAT RULES' return 0 fi - echo -n "Installing NAT rules ... " + echo -n "Installing NAT rules." ${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags} } ==== //depot/projects/hammer/etc/rc.d/ldconfig#4 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.4 2002/09/17 01:48:48 peter Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $ # # PROVIDE: ldconfig -# REQUIRE: mountall +# REQUIRE: mountall mountcritremote # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD ==== //depot/projects/hammer/etc/rc.d/motd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.4 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.5 2003/04/29 06:56:40 dougb Exp $ # # PROVIDE: motd @@ -18,11 +18,9 @@ case ${OSTYPE} in FreeBSD) - T=`mktemp /tmp/_motd.XXXXXX` PERMS="644" ;; NetBSD) - T="/etc/_motd" PERMS="664" ;; esac @@ -40,10 +38,12 @@ case ${OSTYPE} in FreeBSD) + T=`mktemp /tmp/_motd.XXXXXX` uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T} awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T} ;; NetBSD) + T='/etc/_motd' sysctl -n kern.version | while read i; do echo $i; break; done > $T sed '1{/^NetBSD.*/{d;};};' < /etc/motd >> $T ;; ==== //depot/projects/hammer/etc/rc.d/network_ipv6#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.32 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.33 2003/04/29 12:08:43 jwd Exp $ # From: src/etc/rc.network6,v 1.29 2002/04/06 15:15:43 # @@ -32,6 +32,8 @@ # REQUIRE: network2 # KEYWORD: FreeBSD +. /etc/rc.subr + name="network_ipv6" rcvar=`set_rcvar ipv6` start_cmd="network_ipv6_start" ==== //depot/projects/hammer/etc/rc.subr#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.10 2003/01/20 19:30:15 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.11 2003/04/30 03:03:47 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -275,7 +275,7 @@ esac done' - debug "in _find_processes: proccheck is ($_proccheck)." +# debug "in _find_processes: proccheck is ($_proccheck)." eval $_proccheck } ==== //depot/projects/hammer/etc/services#3 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.91 2003/01/04 16:03:56 schweikh Exp $ +# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2004,6 +2004,8 @@ hacl-test 5305/udp cfengine 5308/tcp cfengine 5308/udp +mdns 5353/tcp #Multicast DNS +mdns 5353/udp #Multicast DNS postgresql 5432/tcp #PostgreSQL Database postgresql 5432/udp #PostgreSQL Database rplay 5555/udp ==== //depot/projects/hammer/gnu/lib/libstdc++/c++config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.4 2003/04/25 21:17:31 obrien Exp $ +// $FreeBSD: src/gnu/lib/libstdc++/c++config.h,v 1.5 2003/04/29 18:10:45 kan Exp $ // Predefined symbols and macros -*- C++ -*- @@ -104,7 +104,7 @@ #define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. -/* #undef _GLIBCPP_USE_WCHAR_T */ +#define _GLIBCPP_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. /* #undef _GLIBCPP_MEM_LIMITS */ ==== //depot/projects/hammer/gnu/lib/libstdc++/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.5 2003/04/25 21:17:31 obrien Exp $ */ +/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.6 2003/04/29 18:10:45 kan Exp $ */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -16,7 +16,7 @@ #define _GLIBCPP_USE_C99 1 // Define if code specialized for wchar_t should be used. -/* #undef _GLIBCPP_USE_WCHAR_T */ +#define _GLIBCPP_USE_WCHAR_T 1 // Define if using setrlimit to limit memory usage during 'make check'. /* #undef _GLIBCPP_MEM_LIMITS */ ==== //depot/projects/hammer/include/limits.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.15 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $ */ #ifndef _LIMITS_H_ @@ -125,7 +125,7 @@ #define MB_LEN_MAX 6 /* 31-bit UTF-8 */ -#include +#include #if __POSIX_VISIBLE #include ==== //depot/projects/hammer/include/wchar.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.34 2003/03/13 06:29:53 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.35 2003/04/28 22:40:05 kan Exp $ */ /*- @@ -69,6 +69,7 @@ #include #include +#include #ifndef NULL #define NULL 0 @@ -96,6 +97,11 @@ #define _WINT_T_DECLARED #endif +#ifndef WCHAR_MIN +#define WCHAR_MIN __INT_MIN +#define WCHAR_MAX __INT_MAX +#endif + #ifndef WEOF #define WEOF ((wint_t)-1) #endif ==== //depot/projects/hammer/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $ +# $FreeBSD: src/lib/Makefile,v 1.153 2003/04/30 15:33:50 obrien Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -40,9 +40,11 @@ _csu=csu .endif +.if ${MACHINE_ARCH} != "amd64" .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -71,7 +73,7 @@ .endif .if ${MACHINE_ARCH} != "powerpc" -_libdisk=libdisk +_libdisk= libdisk .endif .if ${MACHINE_ARCH} != "amd64" ==== //depot/projects/hammer/lib/libc/gen/check_utility_compat.c#2 (text+ko) ==== @@ -28,17 +28,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.1 2002/10/28 00:15:43 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.2 2003/04/29 21:13:48 nectar Exp $"); -/* - * I din't use "namespace.h" here because none of the relevant utilities - * are threaded, so I'm not concerned about cancellation points or other - * niceties. - */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #ifndef LINE_MAX #define LINE_MAX _POSIX2_LINE_MAX @@ -55,7 +52,7 @@ int len; if ((p = getenv(_ENV_UTIL_COMPAT)) != NULL) { - strlcpy(buf, p, sizeof buf); + _strlcpy(buf, p, sizeof buf); } else { if ((len = readlink(_PATH_UTIL_COMPAT, buf, sizeof buf)) < 0) return 0; ==== //depot/projects/hammer/lib/libc/gen/confstr.c#3 (text+ko) ==== @@ -35,15 +35,16 @@ static char sccsid[] = "@(#)confstr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.7 2002/09/19 03:47:36 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.8 2003/04/29 21:13:48 nectar Exp $"); +#include "namespace.h" #include - #include #include #include #include #include +#include "un-namespace.h" size_t @@ -114,7 +115,7 @@ docopy: if (len != 0 && buf != NULL) - strlcpy(buf, p, len); + _strlcpy(buf, p, len); return (strlen(p) + 1); default: ==== //depot/projects/hammer/lib/libc/gen/fmtmsg.c#3 (text+ko) ==== @@ -25,12 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.3 2002/09/01 01:49:27 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.4 2003/04/29 21:13:48 nectar Exp $"); +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" /* Default value for MSGVERB. */ #define DFLT_MSGVERB "label:severity:text:action:tag" @@ -101,13 +103,13 @@ #define INSERT_COLON \ if (*output != '\0') \ - strlcat(output, ": ", size) + _strlcat(output, ": ", size) #define INSERT_NEWLINE \ if (*output != '\0') \ - strlcat(output, "\n", size) + _strlcat(output, "\n", size) #define INSERT_SPACE \ if (*output != '\0') \ - strlcat(output, " ", size) + _strlcat(output, " ", size) /* * Returns NULL on memory allocation failure, otherwise returns a pointer to @@ -139,20 +141,20 @@ while ((comp = nextcomp(msgverb)) != NULL) { if (strcmp(comp, "label") == 0 && label != MM_NULLLBL) { INSERT_COLON; - strlcat(output, label, size); + _strlcat(output, label, size); } else if (strcmp(comp, "severity") == 0 && sevname != NULL) { INSERT_COLON; - strlcat(output, sevinfo(sev), size); + _strlcat(output, sevinfo(sev), size); } else if (strcmp(comp, "text") == 0 && text != MM_NULLTXT) { INSERT_COLON; - strlcat(output, text, size); + _strlcat(output, text, size); } else if (strcmp(comp, "action") == 0 && act != MM_NULLACT) { INSERT_NEWLINE; - strlcat(output, "TO FIX: ", size); - strlcat(output, act, size); + _strlcat(output, "TO FIX: ", size); + _strlcat(output, act, size); } else if (strcmp(comp, "tag") == 0 && tag != MM_NULLTAG) { INSERT_SPACE; - strlcat(output, tag, size); + _strlcat(output, tag, size); } } INSERT_NEWLINE; @@ -171,7 +173,7 @@ char *retval; if (*lmsgverb == '\0') { - strlcpy(lmsgverb, msgverb, sizeof(lmsgverb)); + _strlcpy(lmsgverb, msgverb, sizeof(lmsgverb)); retval = strtok_r(lmsgverb, ":", &state); } else { retval = strtok_r(NULL, ":", &state); ==== //depot/projects/hammer/lib/libc/gen/getgrent.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.29 2003/04/25 18:25:19 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.30 2003/04/29 21:13:48 nectar Exp $"); #include "namespace.h" #include @@ -620,7 +620,7 @@ * pointer for the member list terminator. */ adjsize = bufsize - _ALIGNBYTES - sizeof(char *); - linesize = strlcpy(buffer, hes[0], adjsize); + linesize = _strlcpy(buffer, hes[0], adjsize); if (linesize >= adjsize) { *errnop = ERANGE; rv = NS_RETURN; @@ -721,7 +721,7 @@ rv = NS_NOTFOUND; switch (how) { case nss_lt_name: - if (strlcpy(buffer, name, bufsize) >= bufsize) + if (_strlcpy(buffer, name, bufsize) >= bufsize) goto erange; break; case nss_lt_id: ==== //depot/projects/hammer/lib/libc/gen/getpwent.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 11:34:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84CE637B404; Wed, 30 Apr 2003 11:34:07 -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 3B0DF37B401 for ; Wed, 30 Apr 2003 11:34:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBFD243F85 for ; Wed, 30 Apr 2003 11:34:06 -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 h3UIY60U037130 for ; Wed, 30 Apr 2003 11:34:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UIY6cw037121 for perforce@freebsd.org; Wed, 30 Apr 2003 11:34:06 -0700 (PDT) Date: Wed, 30 Apr 2003 11:34:06 -0700 (PDT) Message-Id: <200304301834.h3UIY6cw037121@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 30105 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 18:34:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=30105 Change 30105 by peter@peter_daintree on 2003/04/30 11:33:40 IFC @30104 (pass 1) Affected files ... .. //depot/projects/hammer/bin/cat/cat.c#3 integrate .. //depot/projects/hammer/release/Makefile#15 integrate .. //depot/projects/hammer/release/picobsd/tinyware/passwd/Makefile#2 integrate .. //depot/projects/hammer/release/scripts/crypto-install.sh#2 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/bin/cat/cat.c#3 (text+ko) ==== @@ -34,11 +34,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#endif #ifndef lint #if 0 @@ -46,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $"); #include #include ==== //depot/projects/hammer/release/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.771 2003/04/25 06:08:11 kuriyama Exp $ +# $FreeBSD: src/release/Makefile,v 1.772 2003/04/30 17:54:18 markm Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -143,7 +143,7 @@ COMPAT_DISTS?= compat4x .endif OTHER_DISTS?= catpages manpages games proflibs dict info doc -CRYPTO_DISTS?= crypto krb5 +CRYPTO_DISTS?= crypto BASE_DISTS?= base DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} @@ -513,7 +513,7 @@ cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees touch release.2 -# Build and install crypto and krb5 distributions. +# Build and install crypto distributions. release.3: # Handle some grief caused by the munition braindeadness. cd ${.CURDIR}/..; \ @@ -605,13 +605,6 @@ echo "$${i} distribution is finished."; \ fi ; \ done - # More munition braindeadness. - ( cd ${RD}/dists && \ - if [ -f krb5/krb5.aa ] ; then \ - mv krb5/krb5.* crypto && \ - cat krb5/CHECKSUM.MD5 >> crypto/CHECKSUM.MD5 && \ - rm -r krb5; \ - fi ) touch release.7 ==== //depot/projects/hammer/release/picobsd/tinyware/passwd/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 -# $FreeBSD: src/release/picobsd/tinyware/passwd/Makefile,v 1.2 2002/06/20 21:17:33 luigi Exp $ +# $FreeBSD: src/release/picobsd/tinyware/passwd/Makefile,v 1.3 2003/04/30 17:50:08 markm Exp $ # Only NOPAM is used by PicoBSD and supported here @@ -57,19 +57,6 @@ LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd MLINKS=passwd.1 yppasswd.1 -.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4) -SRCS+= kpasswd_standalone.c -.PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ - ${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \ - ${.CURDIR}/../../crypto/kerberosIV/kadmin - -CFLAGS+= -DKERBEROS -# XXX not defined: ${LIBKADM}, ${LIBCOM_ERR} -DPADD= ${LIBKADM} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL} -LDADD= -lkadm -lkrb -lcrypto -lcrypt -lrpcsvc -lcom_err -lutil -DISTRIBUTION= krb4 -.endif - beforeinstall: .for i in passwd yppasswd [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ ==== //depot/projects/hammer/release/scripts/crypto-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/crypto-install.sh,v 1.2 2001/04/08 23:09:21 obrien Exp $ +# $FreeBSD: src/release/scripts/crypto-install.sh,v 1.3 2003/04/30 17:54:19 markm Exp $ # if [ "`id -u`" != "0" ]; then @@ -13,14 +13,11 @@ echo -n "otherwise hit return to continue. " read junk cat crypto.?? | tar --unlink -xpzf - -C ${_DEST} -cat krb4.?? | tar --unlink -xpzf - -C ${_DEST} -cat krb5.?? | tar --unlink -xpzf - -C ${_DEST} echo -n "Do you want to install the CRYPTO sources (y/n)? " read ans if [ "$ans" = "y" ]; then cat scrypto.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src cat ssecure.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src - cat skrb4.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src cat skrb5.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src fi exit 0 ==== //depot/projects/hammer/secure/usr.bin/ssh/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.21 2003/04/23 17:25:47 des Exp $ +# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.22 2003/04/30 17:46:24 markm Exp $ # PROG= ssh @@ -11,7 +11,6 @@ sshconnect.c sshconnect1.c sshconnect2.c .if defined(MAKE_KERBEROS5) -DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -DHEIMDAL LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} ==== //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.30 2003/04/23 17:25:47 des Exp $ +# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.31 2003/04/30 17:46:24 markm Exp $ # PROG= sshd @@ -17,7 +17,6 @@ CFLAGS+=-I${SSHDIR} .if defined(MAKE_KERBEROS5) -DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -DHEIMDAL SRCS+= auth-krb5.c LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken From owner-p4-projects@FreeBSD.ORG Wed Apr 30 11:36:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2088F37B404; Wed, 30 Apr 2003 11:36:11 -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 C180F37B401 for ; Wed, 30 Apr 2003 11:36:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 494EB43FAF for ; Wed, 30 Apr 2003 11:36:10 -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 h3UIaA0U039009 for ; Wed, 30 Apr 2003 11:36:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UIa9E6038997 for perforce@freebsd.org; Wed, 30 Apr 2003 11:36:09 -0700 (PDT) Date: Wed, 30 Apr 2003 11:36:09 -0700 (PDT) Message-Id: <200304301836.h3UIa9E6038997@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 30106 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 18:36:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30106 Change 30106 by peter@peter_daintree on 2003/04/30 11:35:21 IFC @30104 (pass 2) Affected files ... .. //depot/projects/hammer/etc/etc.amd64/rc.amd64#2 integrate .. //depot/projects/hammer/etc/etc.amd64/ttys#2 integrate .. //depot/projects/hammer/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/hammer/lib/csu/amd64/crt1.c#2 integrate .. //depot/projects/hammer/lib/csu/amd64/crti.S#2 integrate .. //depot/projects/hammer/lib/csu/amd64/crtn.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/hammer/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/infinity.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/amd64/net/htonl.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/net/htons.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/stdlib/gdtoa.mk#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#3 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/Makefile.inc#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/elf_rtld.x#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/opensslconf-amd64.h#2 integrate Differences ... ==== //depot/projects/hammer/etc/etc.amd64/rc.amd64#2 (text+ko) ==== ==== //depot/projects/hammer/etc/etc.amd64/ttys#2 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/Makefile#2 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/crt1.c#2 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/crti.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/crtn.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/SYS.h#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/_fpmath.h#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/arith.h#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#3 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/infinity.c#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/htonl.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/htons.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/stdlib/gdtoa.mk#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#3 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/brk.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/exect.S#3 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#2 (text+ko) ==== ==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#2 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/elf_rtld.x#2 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#2 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#2 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#2 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#2 (text+ko) ==== ==== //depot/projects/hammer/secure/lib/libcrypto/opensslconf-amd64.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Apr 30 11:44:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91DC637B404; Wed, 30 Apr 2003 11:44:23 -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 2FE1937B401 for ; Wed, 30 Apr 2003 11:44:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD64943F93 for ; Wed, 30 Apr 2003 11:44:22 -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 h3UIiM0U044843 for ; Wed, 30 Apr 2003 11:44:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UIiMgG044833 for perforce@freebsd.org; Wed, 30 Apr 2003 11:44:22 -0700 (PDT) Date: Wed, 30 Apr 2003 11:44:22 -0700 (PDT) Message-Id: <200304301844.h3UIiMgG044833@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 30109 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 18:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=30109 Change 30109 by peter@peter_daintree on 2003/04/30 11:43:57 sync with vendor version Affected files ... .. //depot/projects/hammer/etc/etc.amd64/rc.amd64#3 edit .. //depot/projects/hammer/etc/etc.amd64/ttys#3 edit Differences ... ==== //depot/projects/hammer/etc/etc.amd64/rc.amd64#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/etc.i386/rc.i386,v 1.58 2001/01/09 22:28:17 jhb Exp $ +# $FreeBSD: src/etc/etc.amd64/rc.amd64,v 1.59 2003/04/27 05:49:53 imp Exp $ # Do i386 specific processing # @@ -45,10 +45,4 @@ ;; esac -case ${xtend_enable} in -[Yy][Ee][Ss]) - echo -n ' xtend'; /usr/libexec/xtend - ;; -esac - echo '.' ==== //depot/projects/hammer/etc/etc.amd64/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.9 2002/04/17 10:42:41 gerald Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.9 2002/04/17 10:42:41 gerald Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:12:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB10D37B404; Wed, 30 Apr 2003 14:12:40 -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 5FFC937B401 for ; Wed, 30 Apr 2003 14:12:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC5A943F3F for ; Wed, 30 Apr 2003 14:12:38 -0700 (PDT) (envelope-from jhb@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 h3ULCc0U057767 for ; Wed, 30 Apr 2003 14:12:38 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULCUfQ057684 for perforce@freebsd.org; Wed, 30 Apr 2003 14:12:30 -0700 (PDT) Date: Wed, 30 Apr 2003 14:12:30 -0700 (PDT) Message-Id: <200304302112.h3ULCUfQ057684@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 Subject: PERFORCE change 30124 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 21:12:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30124 Change 30124 by jhb@jhb_laptop on 2003/04/30 14:12:14 IFC @30121. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#47 integrate .. //depot/projects/smpng/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/limits.h#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#19 integrate .. //depot/projects/smpng/sys/arm/include/limits.h#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#37 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#38 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/smpng/sys/conf/files#75 integrate .. //depot/projects/smpng/sys/conf/files.i386#40 integrate .. //depot/projects/smpng/sys/conf/files.ia64#27 integrate .. //depot/projects/smpng/sys/conf/files.pc98#40 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdos16.h#3 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl71.h#3 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psfind.c#10 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#11 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdStream.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#24 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#9 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#8 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#5 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#11 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#16 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/iec68113.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#15 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#34 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#10 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#7 integrate .. //depot/projects/smpng/sys/dev/mca/mca_bus.c#3 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#24 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#24 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#26 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.c#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.h#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#6 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_types.h#3 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#7 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#5 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#8 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#11 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#9 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#50 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#16 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#9 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#10 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#57 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#3 integrate .. //depot/projects/smpng/sys/i386/i386/autoconf.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#55 integrate .. //depot/projects/smpng/sys/i386/include/limits.h#6 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#24 integrate .. //depot/projects/smpng/sys/i386/isa/tw.c#7 delete .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#46 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/ia64/include/limits.h#6 integrate .. //depot/projects/smpng/sys/isa/atkbd_isa.c#6 integrate .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#5 integrate .. //depot/projects/smpng/sys/isa/ppc.c#6 integrate .. //depot/projects/smpng/sys/isa/psm.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#31 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_scanf.c#3 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#23 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#55 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#37 integrate .. //depot/projects/smpng/sys/libkern/quad.h#4 integrate .. //depot/projects/smpng/sys/libkern/strtol.c#2 integrate .. //depot/projects/smpng/sys/libkern/strtoq.c#2 integrate .. //depot/projects/smpng/sys/libkern/strtoul.c#2 integrate .. //depot/projects/smpng/sys/libkern/strtouq.c#2 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#11 integrate .. //depot/projects/smpng/sys/net/if.c#34 integrate .. //depot/projects/smpng/sys/net/if_atm.h#4 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#32 integrate .. //depot/projects/smpng/sys/net/if_ieee80211subr.c#3 integrate .. //depot/projects/smpng/sys/net/if_media.c#4 integrate .. //depot/projects/smpng/sys/net/if_media.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#11 integrate .. //depot/projects/smpng/sys/netinet/in.h#21 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#37 integrate .. //depot/projects/smpng/sys/netinet6/ah_output.c#4 integrate .. //depot/projects/smpng/sys/netinet6/esp_output.c#4 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#9 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#4 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_output.c#5 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#9 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#10 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#23 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#16 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98kbd.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#27 integrate .. //depot/projects/smpng/sys/pci/if_en_pci.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/limits.h#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#33 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/smpng/sys/sparc64/include/asm.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/asmacros.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/ktr.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/limits.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/trap.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/utrap.h#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#50 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#3 delete .. //depot/projects/smpng/sys/sys/cdio.h#4 integrate .. //depot/projects/smpng/sys/sys/limits.h#2 integrate .. //depot/projects/smpng/sys/sys/param.h#39 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#14 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#32 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#28 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#14 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#25 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#30 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#35 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#17 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.h#9 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#29 integrate .. //depot/projects/smpng/sys/x86_64/include/limits.h#4 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#47 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.112 2003/04/22 03:17:41 davidxu Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.113 2003/04/30 17:59:26 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -778,7 +778,7 @@ cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - syscallnames[code]); + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/alpha/include/_limits.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.11 2003/04/23 21:41:58 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.12 2003/04/28 22:35:34 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -87,6 +87,5 @@ #define __FLT_DIG 6 #define __FLT_MAX 3.40282347E+38F #define __FLT_MIN 1.17549435E-38F -#endif #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/smpng/sys/alpha/include/limits.h#6 (text+ko) ==== @@ -32,76 +32,16 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.10 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.11 2003/04/29 13:35:58 kan Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ -#define CHAR_BIT 8 /* number of bits in a char */ +#if __GNUC__ +#warning "machine/limits.h is deprecated. Include sys/limits.h instead." +#endif -/* - * According to ANSI (section 2.2.4.2), the values below must be usable by - * #if preprocessing directives. Additionally, the expression must have the - * same type as would an expression that is an object of the corresponding - * type converted according to the integral promotions. The subtraction for - * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an - * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. - */ -#define SCHAR_MAX 0x7f /* max value for a signed char */ -#define SCHAR_MIN (-0x7f-1) /* min value for a signed char */ - -#define UCHAR_MAX 0xffU /* max value for an unsigned char */ -#define CHAR_MAX 0x7f /* max value for a char */ -#define CHAR_MIN (-0x7f-1) /* min value for a char */ - -#define USHRT_MAX 0xffffU /* max value for an unsigned short */ -#define SHRT_MAX 0x7fff /* max value for a short */ -#define SHRT_MIN (-0x7fff-1) /* min value for a short */ - -#define UINT_MAX 0xffffffffU /* max value for an unsigned int */ -#define INT_MAX 0x7fffffff /* max value for an int */ -#define INT_MIN (-0x7fffffff-1) /* min value for an int */ - -#define ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ -#define LONG_MAX 0x7fffffffffffffffL /* max for a long */ -#define LONG_MIN (-0x7fffffffffffffffL-1) /* min for a long */ - -/* Long longs and longs are the same size on the alpha. */ - /* max for an unsigned long long */ -#define ULLONG_MAX 0xffffffffffffffffULL -#define LLONG_MAX 0x7fffffffffffffffLL /* max for a long long */ -#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min for a long long */ - -#if !defined(_ANSI_SOURCE) -#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */ - -#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) -#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */ - -#define OFF_MAX LONG_MAX /* max value for a off_t */ -#define OFF_MIN LONG_MIN /* min value for a off_t */ - -/* Quads and longs are the same on the alpha. Ensure they stay in sync. */ -#define UQUAD_MAX (ULONG_MAX) /* max value for a uquad_t */ -#define QUAD_MAX (LONG_MAX) /* max value for a quad_t */ -#define QUAD_MIN (LONG_MIN) /* min value for a quad_t */ -#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */ -#endif /* !_ANSI_SOURCE */ - -#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE) -#define LONG_BIT 64 -#define WORD_BIT 32 - -#define DBL_DIG 15 -#define DBL_MAX 1.7976931348623157E+308 -#define DBL_MIN 2.2250738585072014E-308 - -#define FLT_DIG 6 -#define FLT_MAX 3.40282347E+38F -#define FLT_MIN 1.17549435E-38F -#endif +#include #endif /* !_MACHINE_LIMITS_H_ */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * (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/alpha/osf1/osf1_signal.c,v 1.31 2003/04/25 19:52:30 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.32 2003/04/29 06:33:03 alc Exp $ */ #include "opt_compat.h" @@ -572,21 +572,12 @@ p = td->td_proc; scp = uap->sigcntxp; - mtx_lock(&Giant); - if (useracc((caddr_t)scp, sizeof (*scp), VM_PROT_READ) == 0 ) { - uprintf("uac fails\n"); - uprintf("scp: %p\n", scp); - } + /* - * Test and fetch the context structure. - * We grab it all at once for speed. + * Fetch the entire context structure at once for speed. */ - if (useracc((caddr_t)scp, sizeof (*scp), VM_PROT_READ) == 0 || - copyin((caddr_t)scp, (caddr_t)&ksc, sizeof ksc)) { - mtx_unlock(&Giant); + if (copyin((caddr_t)scp, (caddr_t)&ksc, sizeof ksc)) return (EFAULT); - } - mtx_unlock(&Giant); /* * Restore the user-supplied information. ==== //depot/projects/smpng/sys/arm/include/limits.h#4 (text+ko) ==== @@ -31,75 +31,16 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.3 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.4 2003/04/29 13:35:58 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ -#define CHAR_BIT 8 /* number of bits in a char */ - -/* - * According to ANSI (section 2.2.4.2), the values below must be usable by - * #if preprocessing directives. Additionally, the expression must have the - * same type as would an expression that is an object of the corresponding - * type converted according to the integral promotions. The subtraction for - * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an - * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. - */ -#define SCHAR_MAX 0x7f /* max value for a signed char */ -#define SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ - -#define UCHAR_MAX 0xff /* max value for an unsigned char */ - -#ifdef __CHAR_UNSIGNED__ -#define CHAR_MAX UCHAR_MAX /* max value for a char */ -#define CHAR_MIN 0 /* min value for a char */ -#else -#define CHAR_MAX SCHAR_MAX /* max value for a char */ -#define CHAR_MIN SCHAR_MIN /* min value for a char */ +#if __GNUC__ +#warning "machine/limits.h is deprecated. Include sys/limits.h instead." #endif -#define USHRT_MAX 0xffff /* max value for an unsigned short */ -#define SHRT_MAX 0x7fff /* max value for a short */ -#define SHRT_MIN (-0x7fff - 1) /* min value for a short */ - -#define UINT_MAX 0xffffffffU /* max value for an unsigned int */ -#define INT_MAX 0x7fffffff /* max value for an int */ -#define INT_MIN (-0x7fffffff - 1) /* min value for an int */ - -/* Bad hack for gcc configured to give 64-bit longs. */ -#ifdef _LARGE_LONG -#define ULONG_MAX 0xffffffffffffffffUL -#define LONG_MAX 0x7fffffffffffffffL -#define LONG_MIN (-0x7fffffffffffffffL - 1) -#else -#define ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ -#define LONG_MAX 0x7fffffffL /* max value for a long */ -#define LONG_MIN (-0x7fffffffL - 1) /* min value for a long */ -#endif - - /* max value for an unsigned long long */ -#define ULLONG_MAX 0xffffffffffffffffULL -#define LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ -#define LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ - -#if !defined(_ANSI_SOURCE) -#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ - -#if !defined(_POSIX_SOURCE) -#define SIZE_T_MAX UINT_MAX /* max value for a size_t */ - -#define OFF_MAX LLONG_MAX /* max value for a off_t */ -#define OFF_MIN LLONG_MIN /* min value for a off_t */ - -/* Quads and long longs are the same size. Ensure they stay in sync. */ -#define UQUAD_MAX ULLONG_MAX /* max value for a uquad_t */ -#define QUAD_MAX LLONG_MAX /* max value for a quad_t */ -#define QUAD_MIN LLONG_MIN /* min value for a quad_t */ -#endif /* !_POSIX_SOURCE */ -#endif /* !_ANSI_SOURCE */ +#include #endif /* !_MACHINE_LIMITS_H_ */ ==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#3 (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/biosacpi.c,v 1.3 2002/07/09 17:53:44 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $ */ #include @@ -31,6 +31,7 @@ #include #include "acfreebsd.h" +#define ACPI_SYSTEM_XFACE #include "actypes.h" #include "actbl.h" ==== //depot/projects/smpng/sys/cam/cam_ccb.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.22 2001/06/24 18:17:45 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.24 2003/04/30 00:35:22 ken Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -35,7 +35,7 @@ #include #include #ifdef CAM_NEW_TRAN_CODE -#include +#include #endif /* CAM_NEW_TRAN_CODE */ #ifndef _KERNEL #include @@ -488,7 +488,7 @@ /* * Definitions for the path inquiry CCB fields. */ -#define CAM_VERSION 0x14 /* Hex value for current version */ +#define CAM_VERSION 0x15 /* Hex value for current version */ typedef enum { PI_MDP_ABLE = 0x80, /* Supports MDP message */ @@ -789,8 +789,8 @@ struct ccb_calc_geometry { struct ccb_hdr ccb_h; u_int32_t block_size; - u_int32_t volume_size; - u_int16_t cylinders; + u_int64_t volume_size; + u_int32_t cylinders; u_int8_t heads; u_int8_t secs_per_track; }; ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * Implementation of Utility functions for all SCSI device types. * * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. - * Copyright (c) 1997, 1998 Kenneth D. Merry. + * Copyright (c) 1997, 1998, 2003 Kenneth D. Merry. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.39 2003/02/21 06:19:37 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.40 2003/04/30 00:35:22 ken Exp $ */ #include @@ -507,9 +507,11 @@ /* 85 */ /* 86 */ /* 87 */ -/* 88 */ +/* 88 MM OO O O READ(16) */ +{0x88, D|T|W|R|O, "READ(16)"}, /* 89 */ -/* 8A */ +/* 8A OM O O O WRITE(16) */ +{0x8A, D|T|W|R|O, "WRITE(16)"}, /* 8B */ /* 8C */ /* 8D */ @@ -529,8 +531,11 @@ /* 9B */ /* 9C */ /* 9D */ -/* 9E */ -/* 9F */ +/* XXX KDM ALL for these? op-num.txt defines them for none.. */ +/* 9E SERVICE ACTION IN(16) */ +{0x9E, ALL, "SERVICE ACTION IN(16)"}, +/* 9F SERVICE ACTION OUT(16) */ +{0x9F, ALL, "SERVICE ACTION OUT(16)"}, /* A0 OOOOOOOOOOO REPORT LUNS */ {0xA0, ALL & ~(E), "REPORT LUNS"}, @@ -560,16 +565,16 @@ /* A7 OO OO OO MOVE MEDIUM ATTACHED */ {0xA7, D|T|W|R|O|M, "MOVE MEDIUM ATTACHED"}, -/* A8 OM O READ(12) */ -{0xA8, W|R|O, "READ(12)"}, +/* A8 O OM O READ(12) */ +{0xA8,D|W|R|O, "READ(12)"}, /* A8 O GET MESSAGE(12) */ {0xA8, C, "GET MESSAGE(12)"}, /* A9 O PLAY TRACK RELATIVE(12) */ {0xA9, R, "PLAY TRACK RELATIVE(12)"}, -/* AA O O WRITE(12) */ -{0xAA, W|O, "WRITE(12)"}, +/* AA O O O WRITE(12) */ +{0xAA,D|W|O, "WRITE(12)"}, /* AA O WRITE CD(12) {MMC Proposed} */ {0xAA, R, "WRITE CD(12) {MMC Proposed}"}, /* AA O SEND MESSAGE(12) */ @@ -2699,6 +2704,38 @@ } void +scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint8_t tag_action, uint64_t lba, int reladr, int pmi, + struct scsi_read_capacity_data_long *rcap_buf, + uint8_t sense_len, uint32_t timeout) +{ + struct scsi_read_capacity_16 *scsi_cmd; + + + cam_fill_csio(csio, + retries, + cbfcnp, + /*flags*/CAM_DIR_IN, + tag_action, + /*data_ptr*/(u_int8_t *)rcap_buf, + /*dxfer_len*/sizeof(*rcap_buf), + sense_len, + sizeof(*scsi_cmd), + timeout); + scsi_cmd = (struct scsi_read_capacity_16 *)&csio->cdb_io.cdb_bytes; + bzero(scsi_cmd, sizeof(*scsi_cmd)); + scsi_cmd->opcode = SERVICE_ACTION_IN; + scsi_cmd->service_action = SRC16_SERVICE_ACTION; + scsi_u64to8b(lba, scsi_cmd->addr); + scsi_ulto4b(sizeof(*rcap_buf), scsi_cmd->alloc_len); + if (pmi) + reladr |= SRC16_PMI; + if (reladr) + reladr |= SRC16_RELADR; +} + +void scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, struct scsi_report_luns_data *rpl_buf, @@ -2758,7 +2795,7 @@ scsi_read_write(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, u_int8_t byte2, - int minimum_cmd_size, u_int32_t lba, u_int32_t block_count, + int minimum_cmd_size, u_int64_t lba, u_int32_t block_count, u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, u_int32_t timeout) { @@ -2790,7 +2827,8 @@ scsi_cmd->addr[1], scsi_cmd->addr[2], scsi_cmd->length, dxfer_len)); } else if ((minimum_cmd_size < 12) - && ((block_count & 0xffff) == block_count)) { + && ((block_count & 0xffff) == block_count) + && ((lba & 0xffffffff) == lba)) { /* * Need a 10 byte cdb. */ @@ -2810,11 +2848,12 @@ scsi_cmd->addr[1], scsi_cmd->addr[2], scsi_cmd->addr[3], scsi_cmd->length[0], scsi_cmd->length[1], dxfer_len)); - } else { + } else if ((minimum_cmd_size < 16) + && ((block_count & 0xffffffff) == block_count) + && ((lba & 0xffffffff) == lba)) { /* * The block count is too big for a 10 byte CDB, use a 12 - * byte CDB. READ/WRITE(12) are currently only defined for - * optical devices. + * byte CDB. */ struct scsi_rw_12 *scsi_cmd; @@ -2833,6 +2872,21 @@ scsi_cmd->addr[3], scsi_cmd->length[0], scsi_cmd->length[1], scsi_cmd->length[2], scsi_cmd->length[3], dxfer_len)); + } else { + /* + * 16 byte CDB. We'll only get here if the LBA is larger + * than 2^32, or if the user asks for a 16 byte command. + */ + struct scsi_rw_16 *scsi_cmd; + + scsi_cmd = (struct scsi_rw_16 *)&csio->cdb_io.cdb_bytes; + scsi_cmd->opcode = readop ? READ_16 : WRITE_16; + scsi_cmd->byte2 = byte2; + scsi_u64to8b(lba, scsi_cmd->addr); + scsi_cmd->reserved = 0; + scsi_ulto4b(block_count, scsi_cmd->length); + scsi_cmd->control = 0; + cdb_len = sizeof(*scsi_cmd); } cam_fill_csio(csio, retries, ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#7 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.22 2003/02/21 06:19:38 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.23 2003/04/30 00:35:22 ken Exp $ */ /* @@ -419,7 +419,9 @@ { u_int8_t opcode; #define SRW10_RELADDR 0x01 -#define SRW10_FUA 0x08 +/* EBP defined for WRITE(10) only */ +#define SRW10_EBP 0x04 +#define SRW10_FUA 0x08 #define SRW10_DPO 0x10 u_int8_t byte2; u_int8_t addr[4]; @@ -441,6 +443,19 @@ u_int8_t control; }; +struct scsi_rw_16 +{ + u_int8_t opcode; +#define SRW16_RELADDR 0x01 +#define SRW16_FUA 0x08 +#define SRW16_DPO 0x10 + u_int8_t byte2; + u_int8_t addr[8]; + u_int8_t length[4]; + u_int8_t reserved; + u_int8_t control; +}; + struct scsi_start_stop_unit { u_int8_t opcode; @@ -486,11 +501,14 @@ #define LOG_SENSE 0x4d #define MODE_SELECT_10 0x55 #define MODE_SENSE_10 0x5A +#define READ_16 0x88 +#define WRITE_16 0x8a +#define SERVICE_ACTION_IN 0x9e #define REPORT_LUNS 0xA0 -#define MOVE_MEDIUM 0xa5 -#define READ_12 0xa8 -#define WRITE_12 0xaa -#define READ_ELEMENT_STATUS 0xb8 +#define MOVE_MEDIUM 0xa5 +#define READ_12 0xa8 +#define WRITE_12 0xaa +#define READ_ELEMENT_STATUS 0xb8 /* @@ -651,12 +669,31 @@ u_int8_t control; }; +struct scsi_read_capacity_16 +{ + uint8_t opcode; +#define SRC16_SERVICE_ACTION 0x10 + uint8_t service_action; + uint8_t addr[8]; + uint8_t alloc_len[4]; +#define SRC16_PMI 0x01 +#define SRC16_RELADR 0x02 + uint8_t reladr; + uint8_t control; +}; + struct scsi_read_capacity_data { u_int8_t addr[4]; u_int8_t length[4]; }; +struct scsi_read_capacity_data_long +{ + uint8_t addr[8]; + uint8_t length[4]; +}; + struct scsi_report_luns { u_int8_t opcode; @@ -977,6 +1014,13 @@ union ccb *), u_int8_t tag_action, struct scsi_read_capacity_data *, u_int8_t sense_len, u_int32_t timeout); +void scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, + union ccb *), uint8_t tag_action, + uint64_t lba, int reladr, int pmi, + struct scsi_read_capacity_data_long + *rcap_buf, uint8_t sense_len, + uint32_t timeout); void scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, @@ -995,7 +1039,7 @@ void scsi_read_write(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, u_int8_t byte2, - int minimum_cmd_size, u_int32_t lba, + int minimum_cmd_size, u_int64_t lba, u_int32_t block_count, u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, u_int32_t timeout); @@ -1015,10 +1059,12 @@ static __inline void scsi_ulto2b(u_int32_t val, u_int8_t *bytes); static __inline void scsi_ulto3b(u_int32_t val, u_int8_t *bytes); static __inline void scsi_ulto4b(u_int32_t val, u_int8_t *bytes); +static __inline void scsi_u64to8b(u_int64_t val, u_int8_t *bytes); static __inline u_int32_t scsi_2btoul(u_int8_t *bytes); static __inline u_int32_t scsi_3btoul(u_int8_t *bytes); static __inline int32_t scsi_3btol(u_int8_t *bytes); static __inline u_int32_t scsi_4btoul(u_int8_t *bytes); +static __inline u_int64_t scsi_8btou64(u_int8_t *bytes); static __inline void *find_mode_page_6(struct scsi_mode_header_6 *mode_header); static __inline void *find_mode_page_10(struct scsi_mode_header_10 *mode_header); @@ -1059,6 +1105,20 @@ bytes[3] = val & 0xff; } +static __inline void +scsi_u64to8b(u_int64_t val, u_int8_t *bytes) +{ + + bytes[0] = (val >> 56) & 0xff; + bytes[1] = (val >> 48) & 0xff; + bytes[2] = (val >> 40) & 0xff; + bytes[3] = (val >> 32) & 0xff; + bytes[4] = (val >> 24) & 0xff; + bytes[5] = (val >> 16) & 0xff; + bytes[6] = (val >> 8) & 0xff; + bytes[7] = val & 0xff; +} + static __inline u_int32_t scsi_2btoul(u_int8_t *bytes) { @@ -1103,6 +1163,22 @@ return (rv); } +static __inline uint64_t +scsi_8btou64(uint8_t *bytes) +{ + uint64_t rv; + + rv = (((uint64_t)bytes[0]) << 56) | + (((uint64_t)bytes[1]) << 48) | + (((uint64_t)bytes[2]) << 40) | + (((uint64_t)bytes[3]) << 32) | + (((uint64_t)bytes[4]) << 24) | + (((uint64_t)bytes[5]) << 16) | + (((uint64_t)bytes[6]) << 8) | + bytes[7]; + return (rv); +} + /* * Given the pointer to a returned mode sense buffer, return a pointer to * the start of the first mode page. ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:13:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FBCF37B405; Wed, 30 Apr 2003 14:13:42 -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 EEC5237B401 for ; Wed, 30 Apr 2003 14:13:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2451743F85 for ; Wed, 30 Apr 2003 14:13:41 -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 h3ULDe0U058642 for ; Wed, 30 Apr 2003 14:13:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULDelP058629 for perforce@freebsd.org; Wed, 30 Apr 2003 14:13:40 -0700 (PDT) Date: Wed, 30 Apr 2003 14:13:40 -0700 (PDT) Message-Id: <200304302113.h3ULDelP058629@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 30125 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 21:13:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30125 Change 30125 by peter@peter_daintree on 2003/04/30 14:13:22 IFC @30123 Affected files ... .. //depot/projects/hammer/bin/ps/ps.1#6 integrate .. //depot/projects/hammer/bin/sh/sh.1#5 integrate .. //depot/projects/hammer/lib/Makefile#9 integrate .. //depot/projects/hammer/lib/csu/amd64/crt1.c#3 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_float.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#11 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#4 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#12 integrate .. //depot/projects/hammer/usr.bin/ee/ee.1#2 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#3 integrate Differences ... ==== //depot/projects/hammer/bin/ps/ps.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -301,9 +301,7 @@ .Pf ( Dv MADV_RANDOM , from .Xr madvise 2 , -for example, -.Xr lisp 1 -in a garbage collect). +for example, lisp in a garbage collect). .It E The process is trying to exit. .It L ==== //depot/projects/hammer/bin/sh/sh.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.85 2003/04/12 03:20:28 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.86 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -59,8 +59,7 @@ specification for the shell. This version has many features which make it appear similar in some respects to the Korn shell, but it is not a Korn -shell clone like -.Xr pdksh 1 . +shell clone like pdksh. Only features designated by POSIX, plus a few Berkeley extensions, are being incorporated into this shell. ==== //depot/projects/hammer/lib/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.153 2003/04/30 15:33:50 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.154 2003/04/30 18:42:25 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -41,6 +41,7 @@ .endif .if ${MACHINE_ARCH} != "amd64" +_libstand= libstand .if !defined(NOLIBC_R) _libc_r= libc_r .endif ==== //depot/projects/hammer/lib/csu/amd64/crt1.c#3 (text+ko) ==== @@ -95,4 +95,4 @@ __asm__(".previous"); #endif -__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.12 2003/01/26 23:14:47 markm Exp $\""); +__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.13 2003/04/30 19:27:07 peter Exp $\""); ==== //depot/projects/hammer/lib/libc/gmon/gmon.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.16 2002/09/17 01:48:50 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.17 2003/04/30 19:29:02 peter Exp $"); #include "namespace.h" #include @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) extern char *minbrk asm (".minbrk"); #else extern char *minbrk asm ("minbrk"); ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.74 2003/01/30 15:00:17 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.75 2003/04/30 19:30:34 peter Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related @@ -62,7 +62,7 @@ # define malloc_pageshift 13U # define malloc_minsize 16U # endif -# if defined(__x86_64__) +# if defined(__amd64__) # define malloc_pageshift 12U # define malloc_minsize 16U # endif ==== //depot/projects/hammer/lib/libc/xdr/xdr_float.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.11 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.12 2003/04/30 19:32:25 peter Exp $"); /* * xdr_float.c, Generic XDR routines implementation. @@ -64,7 +64,7 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) || defined(__x86_64__) + defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) #include #define IEEEFP #endif ==== //depot/projects/hammer/libexec/rtld-elf/libmap.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.2 2003/04/10 01:44:19 mdodd Exp $ + * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.3 2003/04/30 19:05:53 kan Exp $ */ #include @@ -59,7 +59,7 @@ while (isspace(*cp)) cp++; /* Found a comment or EOL */ - if (iseol(*cp)) goto next; + if (iseol(*cp)) continue; /* Found a constraint selector */ if (*cp == '[') { @@ -69,17 +69,19 @@ while (isspace(*cp)) cp++; /* Found comment, EOL or end of selector */ - if (iseol(*cp) || *cp == ']') goto next; + if (iseol(*cp) || *cp == ']') + continue; - p = cp; + p = cp++; /* Skip to end of word */ - while (!isspace(*cp) && !iseol(*cp) && *cp != ']') cp++; + while (!isspace(*cp) && !iseol(*cp) && *cp != ']') + cp++; /* Skip and zero out trailing space */ while (isspace(*cp)) *cp++ = '\0'; /* Check if there is a closing brace */ - if (*cp != ']') goto next; + if (*cp != ']') continue; /* Terminate string if there was no trailing space */ *cp++ = '\0'; @@ -89,38 +91,37 @@ * from this point to the end of the line. */ while(isspace(*cp++)); - if (*cp != '\0' && *cp != '#') goto next; + if (!iseol(*cp)) continue; - if (strlen(p) > 0) { - bzero(prog, MAXPATHLEN); - strncpy(prog, p, strlen(p)); - p = prog; - } - goto next; + strcpy(prog, p); + p = prog; + continue; } /* Parse the 'from' candidate. */ - f = cp; + f = cp++; while (!isspace(*cp) && !iseol(*cp)) cp++; - *cp++ = '\0'; /* Skip and zero out the trailing whitespace */ while (isspace(*cp)) *cp++ = '\0'; /* Found a comment or EOL */ - if (iseol(*cp)) goto next; + if (iseol(*cp)) continue; /* Parse 'to' mapping */ - t = cp; + t = cp++; while (!isspace(*cp) && !iseol(*cp)) cp++; - *cp++ = '\0'; + + /* Skip and zero out the trailing whitespace */ + while (isspace(*cp)) *cp++ = '\0'; + + /* Should be no extra tokens at this point */ + if (!iseol(*cp)) continue; - if ((strlen(f) > 0) && (strlen(t) > 0)) - lm_add(p, strdup(f), strdup(t)); -next: - bzero(line, sizeof(line)); + *cp = '\0'; + lm_add(p, strdup(f), strdup(t)); } - (void)fclose(fp); + fclose(fp); return; } ==== //depot/projects/hammer/sys/kern/kern_fork.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD: src/sys/kern/kern_fork.c,v 1.194 2003/04/30 12:57:39 markm Exp $ + * $FreeBSD: src/sys/kern/kern_fork.c,v 1.195 2003/04/30 19:41:04 jhb Exp $ */ #include "opt_ktrace.h" @@ -424,8 +424,6 @@ /* * Copy filedesc. - * XXX: This is busted. fd*() need to not take proc - * arguments or something. */ if (flags & RFCFDG) fd = fdinit(td->td_proc->p_fd); ==== //depot/projects/hammer/sys/kern/kern_sig.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.232 2003/04/25 20:01:19 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.233 2003/04/30 19:45:13 jhb Exp $ */ #include "opt_compat.h" @@ -468,12 +468,9 @@ if (error) return (error); } - mtx_lock(&Giant); error = kern_sigaction(td, uap->sig, actp, oactp, KSA_FREEBSD4); - mtx_unlock(&Giant); - if (oactp && !error) { + if (oactp && !error) error = copyout(oactp, uap->oact, sizeof(oact)); - } return (error); } #endif /* COMAPT_FREEBSD4 */ ==== //depot/projects/hammer/sys/sys/signalvar.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.58 2003/03/31 23:30:41 jeff Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.59 2003/04/30 19:57:21 jhb Exp $ */ #ifndef _SYS_SIGNALVAR_H_ @@ -49,16 +49,16 @@ * (not necessarily resident). */ struct sigacts { - sig_t ps_sigact[_SIG_MAXSIG]; /* disposition of signals */ - sigset_t ps_catchmask[_SIG_MAXSIG]; /* signals to be blocked */ - sigset_t ps_sigonstack; /* signals to take on sigstack */ - sigset_t ps_sigintr; /* signals that interrupt syscalls */ - sigset_t ps_sigreset; /* signals that reset when caught */ - sigset_t ps_signodefer; /* signals not masked while handled */ - sigset_t ps_siginfo; /* signals that want SA_SIGINFO args */ - sigset_t ps_freebsd4; /* signals that use freebsd4 ucontext */ - sigset_t ps_osigset; /* signals that use <= 3.x osigset_t */ - sigset_t ps_usertramp; /* SunOS compat; libc sigtramp XXX */ + sig_t ps_sigact[_SIG_MAXSIG]; /* Disposition of signals. */ + sigset_t ps_catchmask[_SIG_MAXSIG]; /* Signals to be blocked. */ + sigset_t ps_sigonstack; /* Signals to take on sigstack. */ + sigset_t ps_sigintr; /* Signals that interrupt syscalls. */ + sigset_t ps_sigreset; /* Signals that reset when caught. */ + sigset_t ps_signodefer; /* Signals not masked while handled. */ + sigset_t ps_siginfo; /* Signals that want SA_SIGINFO args. */ + sigset_t ps_freebsd4; /* Signals using freebsd4 ucontext. */ + sigset_t ps_osigset; /* Signals using <= 3.x osigset_t. */ + sigset_t ps_usertramp; /* SunOS compat; libc sigtramp XXX. */ }; #if defined(_KERNEL) && defined(COMPAT_43) @@ -244,12 +244,12 @@ void pgsignal(struct pgrp *pgrp, int sig, int checkctty); void postsig(int sig); void psignal(struct proc *p, int sig); -void tdsignal(struct thread *td, int sig); void sigexit(struct thread *td, int signum) __dead2; +int sig_ffs(sigset_t *set); void siginit(struct proc *p); void signotify(struct thread *td); +void tdsignal(struct thread *td, int sig); void trapsignal(struct thread *td, int sig, u_long code); -int sig_ffs(sigset_t *set); /* * Machine-dependent functions: ==== //depot/projects/hammer/sys/vm/vm_map.c#12 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.295 2003/04/30 00:43:17 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.296 2003/04/30 19:18:09 alc Exp $ */ /* @@ -2138,19 +2138,20 @@ vm_page_lock_queues(); pmap_remove(map->pmap, s, e); vm_page_unlock_queues(); - if (object != NULL && - object->ref_count != 1 && - (object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING && - (object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) { - vm_object_collapse(object); + if (object != NULL) { VM_OBJECT_LOCK(object); - vm_object_page_remove(object, offidxstart, offidxend, FALSE); - if (object->type == OBJT_SWAP) { - swap_pager_freespace(object, offidxstart, count); - } - if (offidxend >= object->size && - offidxstart < object->size) { - object->size = offidxstart; + if (object->ref_count != 1 && + (object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING && + (object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) { + VM_OBJECT_UNLOCK(object); + vm_object_collapse(object); + VM_OBJECT_LOCK(object); + vm_object_page_remove(object, offidxstart, offidxend, FALSE); + if (object->type == OBJT_SWAP) + swap_pager_freespace(object, offidxstart, count); + if (offidxend >= object->size && + offidxstart < object->size) + object->size = offidxstart; } VM_OBJECT_UNLOCK(object); } ==== //depot/projects/hammer/usr.bin/ee/ee.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.14 2002/04/19 23:32:40 charnier Exp $ +.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.15 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd August 30, 1995 .Dt EE 1 @@ -368,7 +368,7 @@ .Xr spell 1 command, the other is with the optional -.Xr ispell 1 +.Nm ispell command. .Pp Using ==== //depot/projects/hammer/usr.bin/mt/mt.1#3 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.35 2002/10/15 12:53:29 joerg Exp $ +.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.36 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd June 6, 1993 .Dt MT 1 @@ -352,9 +352,7 @@ .Xr st 4 driver appeared in .Bx 386 0.1 -as a separate -.Xr st 1 -command, and have been merged into the +as a separate st(1) command, and have been merged into the .Nm command in .Fx 2.1 . From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:15:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F33F37B407; Wed, 30 Apr 2003 14:15:45 -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 EC69637B405 for ; Wed, 30 Apr 2003 14:15:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 598C743FAF for ; Wed, 30 Apr 2003 14:15:44 -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 h3ULFi0U060866 for ; Wed, 30 Apr 2003 14:15:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULFhpl060857 for perforce@freebsd.org; Wed, 30 Apr 2003 14:15:43 -0700 (PDT) Date: Wed, 30 Apr 2003 14:15:43 -0700 (PDT) Message-Id: <200304302115.h3ULFhpl060857@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 30127 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 21:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30127 Change 30127 by peter@peter_daintree on 2003/04/30 14:15:05 revert to vendor Affected files ... .. //depot/projects/hammer/lib/Makefile#10 edit Differences ... ==== //depot/projects/hammer/lib/Makefile#10 (text+ko) ==== @@ -77,10 +77,6 @@ _libdisk= libdisk .endif -.if ${MACHINE_ARCH} != "amd64" -_libstand=libstand -.endif - .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ defined(NOCRYPT) || \ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:16:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11AB937B407; Wed, 30 Apr 2003 14:16:48 -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 B6EE637B401 for ; Wed, 30 Apr 2003 14:16:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E83C143FB1 for ; Wed, 30 Apr 2003 14:16:46 -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 h3ULGk0U061787 for ; Wed, 30 Apr 2003 14:16:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULGkVx061779 for perforce@freebsd.org; Wed, 30 Apr 2003 14:16:46 -0700 (PDT) Date: Wed, 30 Apr 2003 14:16:46 -0700 (PDT) Message-Id: <200304302116.h3ULGkVx061779@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 30129 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 21:16:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=30129 Change 30129 by peter@peter_daintree on 2003/04/30 14:16:22 revert to vendor (whitespace sync) Affected files ... .. //depot/projects/hammer/lib/csu/amd64/Makefile#3 edit .. //depot/projects/hammer/lib/csu/amd64/crti.S#3 edit .. //depot/projects/hammer/lib/csu/amd64/crtn.S#3 edit Differences ... ==== //depot/projects/hammer/lib/csu/amd64/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.17 2002/07/29 09:40:11 ru Exp $ +# $FreeBSD: src/lib/csu/amd64/Makefile,v 1.17 2002/07/29 09:40:11 ru Exp $ .PATH: ${.CURDIR}/../common ==== //depot/projects/hammer/lib/csu/amd64/crti.S#3 (text+ko) ==== @@ -36,4 +36,4 @@ _fini: .section .rodata -.ascii "$FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0" +.ascii "$FreeBSD: src/lib/csu/amd64/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $\0" ==== //depot/projects/hammer/lib/csu/amd64/crtn.S#3 (text+ko) ==== @@ -30,4 +30,4 @@ ret .section .rodata -.ascii "$FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $\0" +.ascii "$FreeBSD: src/lib/csu/amd64/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $\0" From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:18:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C79E37B404; Wed, 30 Apr 2003 14:18:51 -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 DFB7737B401 for ; Wed, 30 Apr 2003 14:18:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3959343F3F for ; Wed, 30 Apr 2003 14:18:50 -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 h3ULIo0U062917 for ; Wed, 30 Apr 2003 14:18:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULInUW062911 for perforce@freebsd.org; Wed, 30 Apr 2003 14:18:49 -0700 (PDT) Date: Wed, 30 Apr 2003 14:18:49 -0700 (PDT) Message-Id: <200304302118.h3ULInUW062911@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 30130 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 21:18:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=30130 Change 30130 by peter@peter_daintree on 2003/04/30 14:18:17 vendor sync; $FreeBSD$ sync and whitespace Affected files ... .. //depot/projects/hammer/lib/libc/amd64/SYS.h#3 edit .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#3 edit .. //depot/projects/hammer/lib/libc/amd64/arith.h#3 edit .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#5 edit .. //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#3 edit .. //depot/projects/hammer/lib/libc/amd64/gen/infinity.c#3 edit .. //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#3 edit .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#3 edit .. //depot/projects/hammer/lib/libc/amd64/net/htonl.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/net/htons.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/stdlib/gdtoa.mk#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#4 edit .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#5 edit .. //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#3 edit .. //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#3 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/SYS.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)SYS.h 5.5 (Berkeley) 5/7/91 - * $FreeBSD: src/lib/libc/i386/SYS.h,v 1.24 2002/09/17 01:48:51 peter Exp $ + * $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.25 2003/04/30 18:06:14 peter Exp $ */ #include ==== //depot/projects/hammer/lib/libc/amd64/_fpmath.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/i386/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ */ union IEEEl2bits { ==== //depot/projects/hammer/lib/libc/amd64/arith.h#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/i386/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ */ #define IEEE_8087 ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.18 2002/11/16 06:39:11 deischen Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ fabs.S modf.S \ ==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.16 2002/03/23 02:05:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.17 2003/04/30 18:09:33 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -65,8 +65,8 @@ xorq %rax,%rax ret - .weak CNAME(_longjmp) - .set CNAME(_longjmp),CNAME(___longjmp) + .weak CNAME(_longjmp) + .set CNAME(_longjmp),CNAME(___longjmp) ENTRY(___longjmp) movq %rdi,%rdx movq %rsi,%rax /* retval */ ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#5 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)frexp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/frexp.c,v 1.8 2002/03/23 02:05:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/frexp.c,v 1.8 2002/03/23 02:05:17 obrien Exp $"); #include #include ==== //depot/projects/hammer/lib/libc/amd64/gen/infinity.c#3 (text+ko) ==== @@ -3,7 +3,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $"); #include ==== //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ static char sccsid[] = "@(#)isinf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.10 2003/02/12 20:03:41 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/isinf.c,v 1.10 2003/02/12 20:03:41 mike Exp $"); #include ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.22 2002/03/23 02:05:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); /* * C library -- _setjmp, _longjmp ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#3 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.24 2002/03/23 02:05:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/net/Makefile.inc,v 1.6 1999/08/27 23:59:24 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/net/Makefile.inc,v 1.6 1999/08/27 23:59:24 peter Exp $ SRCS+= htonl.S htons.S ntohl.S ntohs.S ==== //depot/projects/hammer/lib/libc/amd64/net/htonl.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)htonl.s 5.3 (Berkeley) 12/17/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/net/htonl.S,v 1.10 2003/04/30 18:07:23 peter Exp $"); /* netorder = htonl(hostorder) */ ==== //depot/projects/hammer/lib/libc/amd64/net/htons.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)htons.s 5.2 (Berkeley) 12/17/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/net/htons.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/net/htons.S,v 1.10 2003/04/30 18:07:23 peter Exp $"); /* netorder = htons(hostorder) */ ==== //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)ntohl.s 5.2 (Berkeley) 12/17/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/net/ntohl.S,v 1.10 2003/04/30 18:07:23 peter Exp $"); /* hostorder = ntohl(netorder) */ ==== //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)ntohs.s 5.2 (Berkeley) 12/17/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/net/ntohs.S,v 1.10 2003/04/30 18:07:23 peter Exp $"); /* hostorder = ntohs(netorder) */ ==== //depot/projects/hammer/lib/libc/amd64/stdlib/gdtoa.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/i386/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $ +# $FreeBSD: src/lib/libc/amd64/stdlib/gdtoa.mk,v 1.1 2003/03/12 20:29:59 das Exp $ # Long double is 80 bits GDTOASRCS+=strtopx.c ==== //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ +# $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.26 2003/04/30 18:17:07 peter Exp $ MDASM= vfork.S brk.S cerror.S exect.S pipe.S ptrace.S reboot.S sbrk.S \ setlogin.S sigreturn.S ==== //depot/projects/hammer/lib/libc/amd64/sys/brk.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)brk.s 5.2 (Berkeley) 12/17/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.10 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/brk.S,v 1.11 2003/04/30 18:16:33 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.12 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/exect.S#4 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)exect.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.9 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/exect.S,v 1.10 2003/04/30 18:16:33 peter Exp $"); #include "SYS.h" #include ==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#5 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)pipe.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.11 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/pipe.S,v 1.12 2003/04/30 18:13:48 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)ptrace.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.9 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/ptrace.S,v 1.10 2003/04/30 18:16:33 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)reboot.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/reboot.S,v 1.7 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/reboot.S,v 1.8 2003/04/30 18:14:44 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)sbrk.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.11 2002/08/08 17:28:07 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/sbrk.S,v 1.12 2003/04/30 18:16:33 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setlogin.s 5.2 (Berkeley) 4/12/91" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/setlogin.S,v 1.9 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/setlogin.S,v 1.10 2003/04/30 18:16:33 peter Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)sigreturn.s 5.2 (Berkeley) 12/17/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sigreturn.S,v 1.12 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/sigreturn.S,v 1.12 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" ==== //depot/projects/hammer/lib/libc/amd64/sys/vfork.S#3 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.19 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.20 2003/04/30 18:13:13 peter Exp $"); #include "SYS.h" From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:20:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 346A437B404; Wed, 30 Apr 2003 14:20:54 -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 DA0A337B401 for ; Wed, 30 Apr 2003 14:20:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73C9743FAF for ; Wed, 30 Apr 2003 14:20:53 -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 h3ULKr0U064153 for ; Wed, 30 Apr 2003 14:20:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULKqRO064143 for perforce@freebsd.org; Wed, 30 Apr 2003 14:20:52 -0700 (PDT) Date: Wed, 30 Apr 2003 14:20:52 -0700 (PDT) Message-Id: <200304302120.h3ULKqRO064143@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 30131 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 21:20:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=30131 Change 30131 by peter@peter_daintree on 2003/04/30 14:20:46 There can be only one. This lives on under amd64/... Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/SYS.h#5 delete .. //depot/projects/hammer/lib/libc/x86_64/_fpmath.h#2 delete .. //depot/projects/hammer/lib/libc/x86_64/arith.h#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/Makefile.inc#6 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/_setjmp.S#3 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/frexp.c#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/infinity.c#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/isinf.c#2 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/setjmp.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/gen/sigsetjmp.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/net/Makefile.inc#4 delete .. //depot/projects/hammer/lib/libc/x86_64/net/htonl.S#3 delete .. //depot/projects/hammer/lib/libc/x86_64/net/htons.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/net/ntohl.S#3 delete .. //depot/projects/hammer/lib/libc/x86_64/net/ntohs.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/stdlib/gdtoa.mk#2 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/Makefile.inc#7 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/brk.S#5 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/cerror.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/exect.S#5 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/pipe.S#7 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/ptrace.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/reboot.S#3 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/sbrk.S#5 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/setlogin.S#4 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/sigreturn.S#2 delete .. //depot/projects/hammer/lib/libc/x86_64/sys/vfork.S#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:21:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4320637B405; Wed, 30 Apr 2003 14:21: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 D063F37B408 for ; Wed, 30 Apr 2003 14:21:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6483543FAF for ; Wed, 30 Apr 2003 14:21:55 -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 h3ULLt0U065150 for ; Wed, 30 Apr 2003 14:21:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULLsm4065142 for perforce@freebsd.org; Wed, 30 Apr 2003 14:21:54 -0700 (PDT) Date: Wed, 30 Apr 2003 14:21:54 -0700 (PDT) Message-Id: <200304302121.h3ULLsm4065142@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 30132 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 21:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30132 Change 30132 by peter@peter_daintree on 2003/04/30 14:21:09 There can be only one. This lives on under amd64/... Affected files ... .. //depot/projects/hammer/lib/csu/x86_64/Makefile#2 delete .. //depot/projects/hammer/lib/csu/x86_64/crt1.c#8 delete .. //depot/projects/hammer/lib/csu/x86_64/crti.S#2 delete .. //depot/projects/hammer/lib/csu/x86_64/crtn.S#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:25:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC47637B404; Wed, 30 Apr 2003 14:25:00 -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 7CE7737B401 for ; Wed, 30 Apr 2003 14:25:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB23D43FBD for ; Wed, 30 Apr 2003 14:24:59 -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 h3ULOx0U067912 for ; Wed, 30 Apr 2003 14:24:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULOxMV067899 for perforce@freebsd.org; Wed, 30 Apr 2003 14:24:59 -0700 (PDT) Date: Wed, 30 Apr 2003 14:24:59 -0700 (PDT) Message-Id: <200304302124.h3ULOxMV067899@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 30133 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 21:25:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=30133 Change 30133 by peter@peter_daintree on 2003/04/30 14:24:38 IFC @30132 (mostly vendor/$FreeBSD$ syncup) Affected files ... .. //depot/projects/hammer/etc/Makefile#9 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#9 integrate .. //depot/projects/hammer/etc/rc.d/kpasswdd#1 branch .. //depot/projects/hammer/etc/root/dot.k5login#1 branch .. //depot/projects/hammer/etc/root/dot.klogin#2 delete .. //depot/projects/hammer/gnu/usr.bin/groff/font/Makefile.dev#2 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#7 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#11 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#12 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#9 integrate .. //depot/projects/hammer/lib/libdisk/rules.c#10 integrate .. //depot/projects/hammer/lib/libkvm/kvm_amd64.c#3 integrate .. //depot/projects/hammer/lib/msun/src/math_private.h#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#3 integrate Differences ... ==== //depot/projects/hammer/etc/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.309 2003/04/18 17:51:53 mtm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.310 2003/04/30 20:58:48 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -99,7 +99,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dot.klogin ${DESTDIR}/root/.klogin; \ + dot.k5login ${DESTDIR}/root/.k5login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ==== //depot/projects/hammer/etc/defaults/rc.conf#9 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.175 2003/04/30 20:58:49 markm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -153,8 +153,9 @@ kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC kadmind5_server_enable="NO" # Run kadmind (or NO) -kadmind5_server="/usr/libexec/k5admind" # path to kerberos 5 admin daemon -kerberos_stash="NO" # Is the kerberos master key stashed? +kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon +kpasswdd_server_enable="NO" # Run kpasswdd (or NO) +kpasswdd_server="/usr/libexec/kpasswdd" # path to kerberos 5 passwd daemon rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod ==== //depot/projects/hammer/gnu/usr.bin/groff/font/Makefile.dev#2 (text+ko) ==== @@ -1,11 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.11 2003/04/30 20:48:03 ru Exp $ -DEVICEDIR?= ${fontdir}/dev${DEV} - -all: ${DEVFILES} - -beforeinstall: ${DEVFILES} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${.ALLSRC} ${DESTDIR}${DEVICEDIR} +FILES= ${DEVFILES} +FILESDIR?= ${fontdir}/dev${DEV} .include ==== //depot/projects/hammer/lib/libdisk/chunk.c#7 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.47 2003/01/10 19:25:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.48 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -318,7 +318,8 @@ if (platform == p_sparc64) { offset = Prev_Cyl_Aligned(d, offset); size = Next_Cyl_Aligned(d, size); - } else if (platform == p_i386 || platform == p_pc98 || platform == p_amd64) { + } else if (platform == p_i386 || platform == p_pc98 || + platform == p_amd64) { if (type != freebsd) break; if (!(flags & CHUNK_ALIGN)) ==== //depot/projects/hammer/lib/libdisk/create_chunk.c#11 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.80 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.81 2003/04/30 21:03:16 peter Exp $"); #include #include ==== //depot/projects/hammer/lib/libdisk/disk.c#12 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.115 2003/04/30 17:14:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.116 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -56,6 +56,8 @@ p_ia64 #elif defined(__ppc__) p_ppc +#elif defined(__amd64__) + p_amd64 #else IHAVENOIDEA #endif ==== //depot/projects/hammer/lib/libdisk/libdisk.h#9 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.56 2003/04/30 17:14:58 obrien Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.57 2003/04/30 21:03:16 peter Exp $ * */ @@ -70,7 +70,7 @@ #if !defined(__ia64__) u_char *boot1; #endif -#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */ +#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */ u_char *boot2; #endif struct chunk *chunks; ==== //depot/projects/hammer/lib/libdisk/rules.c#10 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.30 2003/04/23 12:15:31 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.31 2003/04/30 21:03:16 peter Exp $"); #include #include ==== //depot/projects/hammer/lib/libkvm/kvm_amd64.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.15 2001/10/10 17:48:43 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.16 2003/04/30 21:05:33 peter Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -45,7 +45,7 @@ #endif /* LIBC_SCCS and not lint */ /* - * i386 machine dependent routines for kvm. Hopefully, the forthcoming + * AMD64 machine dependent routines for kvm. Hopefully, the forthcoming * vm code will one day obsolete this module. */ @@ -66,8 +66,8 @@ #include "kvm_private.h" #ifndef btop -#define btop(x) (x86_64_btop(x)) -#define ptob(x) (x86_64_ptob(x)) +#define btop(x) (amd64_btop(x)) +#define ptob(x) (amd64_ptob(x)) #endif struct vmstate { ==== //depot/projects/hammer/lib/msun/src/math_private.h#3 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.12 2002/05/21 04:00:47 benno Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.13 2003/04/30 21:06:30 peter Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -226,7 +226,7 @@ int __kernel_rem_pio2f(float*,float*,int,int,int,const int*); #if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || \ - defined(__powerpc__) || defined(__x86_64__) + defined(__powerpc__) || defined(__amd64__) #define __generic___ieee754_acos __ieee754_acos #define __generic___ieee754_asin __ieee754_asin #define __generic___ieee754_atan2 __ieee754_atan2 ==== //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (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/libexec/rtld-elf/i386/lockdflt.c,v 1.8 2002/07/06 20:25:55 jdp Exp $ + * $FreeBSD: src/libexec/rtld-elf/amd64/lockdflt.c,v 1.9 2003/04/30 21:09:06 peter Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:28:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1002C37B404; Wed, 30 Apr 2003 14:28:05 -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 BBCC937B401 for ; Wed, 30 Apr 2003 14:28:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50DCA43F93 for ; Wed, 30 Apr 2003 14:28:04 -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 h3ULS40U070348 for ; Wed, 30 Apr 2003 14:28:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULS3ED070343 for perforce@freebsd.org; Wed, 30 Apr 2003 14:28:03 -0700 (PDT) Date: Wed, 30 Apr 2003 14:28:03 -0700 (PDT) Message-Id: <200304302128.h3ULS3ED070343@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 30134 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 21:28:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=30134 Change 30134 by peter@peter_daintree on 2003/04/30 14:27:13 rcsid sync Affected files ... .. //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#3 edit Differences ... ==== //depot/projects/hammer/lib/libdisk/write_amd64_disk.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.7 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/write_amd64_disk.c,v 1.7 2003/04/04 16:35:13 phk Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:29:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7115337B404; Wed, 30 Apr 2003 14:29:07 -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 22AEB37B401 for ; Wed, 30 Apr 2003 14:29:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F90743FBD for ; Wed, 30 Apr 2003 14:29:06 -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 h3ULT60U070835 for ; Wed, 30 Apr 2003 14:29:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULT5hI070830 for perforce@freebsd.org; Wed, 30 Apr 2003 14:29:05 -0700 (PDT) Date: Wed, 30 Apr 2003 14:29:05 -0700 (PDT) Message-Id: <200304302129.h3ULT5hI070830@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 30135 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 21:29:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=30135 Change 30135 by peter@peter_daintree on 2003/04/30 14:28:22 This was a bad idea. It should be added back into the kernel. Revert to vendor. Affected files ... .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#9 edit Differences ... ==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#9 (text+ko) ==== @@ -364,9 +364,7 @@ kp->ki_pri.pri_native = mtd.td_base_pri; kp->ki_lastcpu = mtd.td_lastcpu; kp->ki_wchan = mtd.td_wchan; -#ifndef __x86_64__ kp->ki_oncpu = mtd.td_oncpu; -#endif if (!(proc.p_flag & P_THREADED)) { /* stuff from the ksegrp */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:29:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9882537B405; Wed, 30 Apr 2003 14:29:08 -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 8C92D37B40E for ; Wed, 30 Apr 2003 14:29:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B387F43FA3 for ; Wed, 30 Apr 2003 14:29:06 -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 h3ULT60U070844 for ; Wed, 30 Apr 2003 14:29:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULT6EC070839 for perforce@freebsd.org; Wed, 30 Apr 2003 14:29:06 -0700 (PDT) Date: Wed, 30 Apr 2003 14:29:06 -0700 (PDT) Message-Id: <200304302129.h3ULT6EC070839@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 30136 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 21:29:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30136 Change 30136 by peter@peter_daintree on 2003/04/30 14:29:00 Nuke; lives on as kvm_amd64.c Affected files ... .. //depot/projects/hammer/lib/libkvm/kvm_x86_64.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:31:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87AE937B404; Wed, 30 Apr 2003 14:31:10 -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 3C46037B401 for ; Wed, 30 Apr 2003 14:31:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4FAF43FB1 for ; Wed, 30 Apr 2003 14:31:09 -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 h3ULV90U072127 for ; Wed, 30 Apr 2003 14:31:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULV9vx072119 for perforce@freebsd.org; Wed, 30 Apr 2003 14:31:09 -0700 (PDT) Date: Wed, 30 Apr 2003 14:31:09 -0700 (PDT) Message-Id: <200304302131.h3ULV9vx072119@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 30137 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 21:31:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=30137 Change 30137 by peter@peter_daintree on 2003/04/30 14:31:06 sync rcsids Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#3 edit .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#3 edit .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#3 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (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/libexec/rtld-elf/i386/reloc.c,v 1.12 2003/03/14 21:10:12 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/amd64/reloc.c,v 1.12 2003/03/14 21:10:12 kan Exp $ */ /* ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $ + * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $ */ #ifndef RTLD_MACHDEP_H ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (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/libexec/rtld-elf/i386/rtld_start.S,v 1.3 1999/08/28 00:10:15 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.3 1999/08/28 00:10:15 peter Exp $ */ .error finish update please. needs to be updated for calling conventions at the very least From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:32:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20EE437B405; Wed, 30 Apr 2003 14:32:13 -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 AE8FB37B401 for ; Wed, 30 Apr 2003 14:32:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE5C643FAF for ; Wed, 30 Apr 2003 14:32:11 -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 h3ULWB0U073034 for ; Wed, 30 Apr 2003 14:32:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULWBXF073028 for perforce@freebsd.org; Wed, 30 Apr 2003 14:32:11 -0700 (PDT) Date: Wed, 30 Apr 2003 14:32:11 -0700 (PDT) Message-Id: <200304302132.h3ULWBXF073028@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 30138 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 21:32:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30138 Change 30138 by peter@peter_daintree on 2003/04/30 14:31:17 nuke; lives on as amd64/... Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/x86_64/Makefile.inc#2 delete .. //depot/projects/hammer/libexec/rtld-elf/x86_64/elf_rtld.x#2 delete .. //depot/projects/hammer/libexec/rtld-elf/x86_64/lockdflt.c#3 delete .. //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#4 delete .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_machdep.h#3 delete .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_start.S#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:32:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C076C37B40D; Wed, 30 Apr 2003 14:32:13 -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 CB13337B404 for ; Wed, 30 Apr 2003 14:32:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E27943FB1 for ; Wed, 30 Apr 2003 14:32:12 -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 h3ULWC0U073047 for ; Wed, 30 Apr 2003 14:32:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULWBue073039 for perforce@freebsd.org; Wed, 30 Apr 2003 14:32:11 -0700 (PDT) Date: Wed, 30 Apr 2003 14:32:11 -0700 (PDT) Message-Id: <200304302132.h3ULWBue073039@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 30139 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 21:32:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30139 Change 30139 by peter@peter_daintree on 2003/04/30 14:32:04 sync rcsids Affected files ... .. //depot/projects/hammer/secure/lib/libcrypto/opensslconf-amd64.h#3 edit Differences ... ==== //depot/projects/hammer/secure/lib/libcrypto/opensslconf-amd64.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-alpha.h,v 1.5 2003/01/29 01:06:15 nectar Exp $ */ +/* $FreeBSD: src/secure/lib/libcrypto/opensslconf-amd64.h,v 1.5 2003/01/29 01:06:15 nectar Exp $ */ /* opensslconf.h */ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 14:50:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1531437B404; Wed, 30 Apr 2003 14:50: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 B389D37B401 for ; Wed, 30 Apr 2003 14:50:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FB0343FAF for ; Wed, 30 Apr 2003 14:50:55 -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 h3ULos0U086675 for ; Wed, 30 Apr 2003 14:50:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ULosXR086659 for perforce@freebsd.org; Wed, 30 Apr 2003 14:50:54 -0700 (PDT) Date: Wed, 30 Apr 2003 14:50:54 -0700 (PDT) Message-Id: <200304302150.h3ULosXR086659@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 30147 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 21:50:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30147 Change 30147 by peter@peter_daintree on 2003/04/30 14:50:18 IFC @30146 Affected files ... .. //depot/projects/hammer/share/man/man5/make.conf.5#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#12 integrate .. //depot/projects/hammer/sys/isa/isa_common.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#23 integrate .. //depot/projects/hammer/sys/sys/proc.h#19 integrate Differences ... ==== //depot/projects/hammer/share/man/man5/make.conf.5#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.70 2003/03/08 13:39:41 markm Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.71 2003/04/30 21:15:41 markm Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -418,7 +418,7 @@ port(s). .It Va ENABLE_SUID_K5SU .Pq Vt bool -Set this if you wish to use the k5su utility. +Set this if you wish to use the ksu utility. Otherwise, it will be installed without the set-user-ID bit set. .It Va ENABLE_SUID_NEWGRP ==== //depot/projects/hammer/share/man/man5/rc.conf.5#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.183 2003/04/22 18:53:14 trhodes Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.184 2003/04/30 21:15:41 markm Exp $ .\" .Dd March 3, 2002 .Dt RC.CONF 5 @@ -1077,19 +1077,6 @@ is not enabled. This variable is experimental. It may be removed or changed in the near future. -.It Va kerberos_stash -.Pq Vt str -If -.Dq Li YES , -instruct the Kerberos servers to use the stashed master key instead of -prompting for it (only if -.Va kerberos_server_enable -is set to -.Dq Li YES , -and is used for both -.Xr kerberos 1 -and -.Xr kadmind 8 ) . .It Va kerberos5_server_enable .Pq Vt bool Set to @@ -1102,13 +1089,13 @@ .Va kerberos5_server_enable is set to .Dq Li YES -this is the path to Kerberos 5 authentication server. +this is the path to Kerberos 5 Authentication Server. .It Va kadmind5_server_enable .Pq Vt bool Set to .Dq Li YES to start -.Xr k5admind 8 , +.Xr kadmind 8 , the Kerberos 5 Administration Daemon; set to .Dq Li NO on a slave server. @@ -1119,6 +1106,22 @@ is set to .Dq Li YES this is the path to Kerberos 5 Administration Daemon. +.It Va kpasswdd_server_enable +.Pq Vt bool +Set to +.Dq Li YES +to start +.Xr kpasswdd 8 , +the Kerberos 5 Password-Changing Daemon; set to +.Dq Li NO +on a slave server. +.It Va kpasswdd_server +.Pq Vt str +If +.Va kpasswdd_server_enable +is set to +.Dq Li YES +this is the path to Kerberos 5 Password-Changing Daemon. .It Va rwhod_enable .Pq Vt bool If set to ==== //depot/projects/hammer/sys/dev/sio/sio.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sio/sio.c,v 1.396 2003/04/30 12:57:39 markm Exp $ + * $FreeBSD: src/sys/dev/sio/sio.c,v 1.397 2003/04/30 21:39:28 peter Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ ==== //depot/projects/hammer/sys/isa/isa_common.c#8 (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/isa/isa_common.c,v 1.33 2003/04/15 04:19:49 mdodd Exp $ + * $FreeBSD: src/sys/isa/isa_common.c,v 1.34 2003/04/30 21:41:41 peter Exp $ */ /* * Modifications for Intel architecture by Garrett A. Wollman. ==== //depot/projects/hammer/sys/kern/kern_synch.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.218 2003/04/23 18:46:51 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.219 2003/04/30 21:45:03 peter Exp $ */ #include "opt_ddb.h" ==== //depot/projects/hammer/sys/kern/kern_thr.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/kern/kern_thr.c,v 1.6 2003/04/17 22:21:57 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_thr.c,v 1.7 2003/04/30 21:45:03 peter Exp $ * */ ==== //depot/projects/hammer/sys/kern/kern_thread.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thread.c,v 1.126 2003/04/30 01:18:29 davidxu Exp $ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.127 2003/04/30 21:45:03 peter Exp $ */ #include ==== //depot/projects/hammer/sys/sys/proc.h#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.323 2003/04/24 16:20:14 wes Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.324 2003/04/30 21:45:03 peter Exp $ */ #ifndef _SYS_PROC_H_ 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__ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:12:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82BAC37B404; Wed, 30 Apr 2003 15:12:57 -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 1CB2637B401 for ; Wed, 30 Apr 2003 15:12:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B92D243F3F for ; Wed, 30 Apr 2003 15:12:56 -0700 (PDT) (envelope-from jmallett@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 h3UMCu0U004274 for ; Wed, 30 Apr 2003 15:12:56 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMCuxX004267 for perforce@freebsd.org; Wed, 30 Apr 2003 15:12:56 -0700 (PDT) Date: Wed, 30 Apr 2003 15:12:56 -0700 (PDT) Message-Id: <200304302212.h3UMCuxX004267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30156 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:12:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=30156 Change 30156 by jmallett@jmallett_dalek on 2003/04/30 15:12:09 Commit printfs that make the kernel blow up a little later. Warner has suggested cache issues. At this point I wouldn't doubt it. (Get over my fear of submitting filthy hacks.) Affected files ... .. //depot/projects/mips/sys/vm/vm_init.c#3 edit Differences ... ==== //depot/projects/mips/sys/vm/vm_init.c#3 (text+ko) ==== @@ -110,15 +110,21 @@ * memory is accounted for, and we use only virtual addresses. */ vm_set_page_size(); + printf("Doing page startup...\n"); virtual_avail = vm_page_startup(avail_start, avail_end, virtual_avail); /* * Initialize other VM packages */ + printf("vm_object_init...\n"); vm_object_init(); + printf("vm_map_startup...\n"); vm_map_startup(); + printf("kmem_init...\n"); kmem_init(virtual_avail, virtual_end); + printf("pmap_init...\n"); pmap_init(avail_start, avail_end); + printf("vm_pager_init...\n"); vm_pager_init(); } From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:16:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 651A937B409; Wed, 30 Apr 2003 15:16:02 -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 1A09837B405 for ; Wed, 30 Apr 2003 15:16:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9801E43FAF for ; Wed, 30 Apr 2003 15:16:01 -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 h3UMG10U007098 for ; Wed, 30 Apr 2003 15:16:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMG1aD007092 for perforce@freebsd.org; Wed, 30 Apr 2003 15:16:01 -0700 (PDT) Date: Wed, 30 Apr 2003 15:16:01 -0700 (PDT) Message-Id: <200304302216.h3UMG1aD007092@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 30158 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:16:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=30158 Change 30158 by peter@peter_daintree on 2003/04/30 15:15:52 Tidy up a little. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#10 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#10 (text+ko) ==== @@ -43,6 +43,11 @@ struct file_format x86_64_elf = { elf64_loadfile, elf64_exec }; +#define PG_V 0x001 +#define PG_RW 0x002 +#define PG_U 0x004 +#define PG_PS 0x080 + typedef u_int64_t p4_entry_t; typedef u_int64_t p3_entry_t; typedef u_int64_t p2_entry_t; @@ -77,37 +82,31 @@ if (err != 0) return(err); -#define PG_V 0x001 -#define PG_RW 0x002 -#define PG_U 0x004 -#define PG_PS 0x080 - bzero(PT4, PAGE_SIZE); - bzero(PT3, PAGE_SIZE); - bzero(PT2, PAGE_SIZE); + bzero(PT4, PAGE_SIZE); + bzero(PT3, PAGE_SIZE); + bzero(PT2, PAGE_SIZE); - /* single PML4 entry */ - PT4[0] = (p4_entry_t)VTOP((uintptr_t)&PT3[0]); - PT4[0] |= PG_V | PG_RW | PG_U; + /* single PML4 entry */ + PT4[0] = (p4_entry_t)VTOP((uintptr_t)&PT3[0]); + PT4[0] |= PG_V | PG_RW | PG_U; - /* Direct map 1GB at address zero */ - PT3[0] = (p3_entry_t)VTOP((uintptr_t)&PT2[0]); - PT3[0] |= PG_V | PG_RW | PG_U; + /* Direct map 1GB at address zero */ + PT3[0] = (p3_entry_t)VTOP((uintptr_t)&PT2[0]); + PT3[0] |= PG_V | PG_RW | PG_U; - /* Direct map 1GB at KERNBASE (hardcoded for now) */ - PT3[1] = (p3_entry_t)VTOP((uintptr_t)&PT2[0]); - PT3[1] |= PG_V | PG_RW | PG_U; + /* Direct map 1GB at KERNBASE (hardcoded for now) */ + PT3[1] = (p3_entry_t)VTOP((uintptr_t)&PT2[0]); + PT3[1] |= PG_V | PG_RW | PG_U; - /* 512 PG_PS (2MB) page mappings for 1GB of direct mapping */ - for (i = 0; i < 512; i++) { - PT2[i] = i * (2 * 1024 * 1024); - PT2[i] |= PG_V | PG_RW | PG_PS | PG_U; - } + /* 512 PG_PS (2MB) page mappings for 1GB of direct mapping */ + for (i = 0; i < 512; i++) { + PT2[i] = i * (2 * 1024 * 1024); + PT2[i] |= PG_V | PG_RW | PG_PS | PG_U; + } entry_lo = ehdr->e_entry & 0xffffffff; entry_hi = (ehdr->e_entry >> 32) & 0xffffffff; #ifdef DEBUG - printf("modulep: 0x%x\n", modulep); - printf("kernend: 0x%x\n", kernend); printf("Start @ %#llx ...\n", ehdr->e_entry); #endif From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:19:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4D0C37B404; Wed, 30 Apr 2003 15:19:06 -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 7BE0337B401 for ; Wed, 30 Apr 2003 15:19:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1195143F3F for ; Wed, 30 Apr 2003 15:19:06 -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 h3UMJ50U008847 for ; Wed, 30 Apr 2003 15:19:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMJ53R008842 for perforce@freebsd.org; Wed, 30 Apr 2003 15:19:05 -0700 (PDT) Date: Wed, 30 Apr 2003 15:19:05 -0700 (PDT) Message-Id: <200304302219.h3UMJ53R008842@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 30159 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:19:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=30159 Change 30159 by peter@peter_daintree on 2003/04/30 15:18:25 rename to amd64_tramp.S Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:19:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C71137B404; Wed, 30 Apr 2003 15:19:08 -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 0398037B408 for ; Wed, 30 Apr 2003 15:19:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1D8343F85 for ; Wed, 30 Apr 2003 15:19:06 -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 h3UMJ60U008856 for ; Wed, 30 Apr 2003 15:19:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMJ616008851 for perforce@freebsd.org; Wed, 30 Apr 2003 15:19:06 -0700 (PDT) Date: Wed, 30 Apr 2003 15:19:06 -0700 (PDT) Message-Id: <200304302219.h3UMJ616008851@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 30160 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:19:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30160 Change 30160 by peter@peter_daintree on 2003/04/30 15:18:59 Two commits for the price of one. Rename x86_64_tramp.S to amd64_tramp.S Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#7 edit .. //depot/projects/hammer/sys/boot/i386/libi386/x86_64_tramp.S#3 delete Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#7 (text+ko) ==== @@ -8,7 +8,7 @@ comconsole.c devicename.c elf32_freebsd.c \ elf64_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ - time.c vidconsole.c x86_64_tramp.S + time.c vidconsole.c amd64_tramp.S CFLAGS+= -ffreestanding BOOT_COMCONSOLE_PORT?= 0x3f8 From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:21:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DC4D37B404; Wed, 30 Apr 2003 15:21:11 -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 DD57137B401 for ; Wed, 30 Apr 2003 15:21:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8598243F93 for ; Wed, 30 Apr 2003 15:21:10 -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 h3UMLA0U010110 for ; Wed, 30 Apr 2003 15:21:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UML9Kw010102 for perforce@freebsd.org; Wed, 30 Apr 2003 15:21:09 -0700 (PDT) Date: Wed, 30 Apr 2003 15:21:09 -0700 (PDT) Message-Id: <200304302221.h3UML9Kw010102@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 30162 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:21:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30162 Change 30162 by peter@peter_daintree on 2003/04/30 15:20:48 Ok, make that 3 submits for the price of one. Finish renaming x86_64_tramp to amd64_tramp (I hope). Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#11 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#2 (text+ko) ==== @@ -39,8 +39,8 @@ .text .code32 - .globl x86_64_tramp -x86_64_tramp: + .globl amd64_tramp +amd64_tramp: /* Be sure that interrupts are disabled */ cli ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#11 (text+ko) ==== @@ -41,7 +41,7 @@ static int elf64_exec(struct preloaded_file *amp); -struct file_format x86_64_elf = { elf64_loadfile, elf64_exec }; +struct file_format amd64_elf = { elf64_loadfile, elf64_exec }; #define PG_V 0x001 #define PG_RW 0x002 @@ -58,7 +58,7 @@ u_int32_t entry_hi; u_int32_t entry_lo; -extern x86_64_tramp(); +extern amd64_tramp(); /* * There is an a.out kernel and one or more a.out modules loaded. @@ -111,7 +111,7 @@ #endif dev_cleanup(); - __exec((void *)VTOP(x86_64_tramp), modulep, kernend); + __exec((void *)VTOP(amd64_tramp), modulep, kernend); panic("exec returned"); } From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:22:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59D0E37B404; Wed, 30 Apr 2003 15:22:13 -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 1022337B401 for ; Wed, 30 Apr 2003 15:22:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98C5343FA3 for ; Wed, 30 Apr 2003 15:22:12 -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 h3UMMC0U011030 for ; Wed, 30 Apr 2003 15:22:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMMBcJ011020 for perforce@freebsd.org; Wed, 30 Apr 2003 15:22:11 -0700 (PDT) Date: Wed, 30 Apr 2003 15:22:11 -0700 (PDT) Message-Id: <200304302222.h3UMMBcJ011020@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 30163 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:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30163 Change 30163 by peter@peter_daintree on 2003/04/30 15:21:24 Rename x86_64 to amd64. Affected files ... .. //depot/projects/hammer/sys/boot/i386/loader/conf.c#5 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/loader/conf.c#5 (text+ko) ==== @@ -82,11 +82,11 @@ * rather than reading the file go first. */ extern struct file_format i386_elf; -extern struct file_format x86_64_elf; +extern struct file_format amd64_elf; struct file_format *file_formats[] = { &i386_elf, - &x86_64_elf, + &amd64_elf, NULL }; From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:26:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CC8237B404; Wed, 30 Apr 2003 15:26:19 -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 317B337B401 for ; Wed, 30 Apr 2003 15:26:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0F0243F3F for ; Wed, 30 Apr 2003 15:26:18 -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 h3UMQI0U014555 for ; Wed, 30 Apr 2003 15:26:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMQIAo014549 for perforce@freebsd.org; Wed, 30 Apr 2003 15:26:18 -0700 (PDT) Date: Wed, 30 Apr 2003 15:26:18 -0700 (PDT) Message-Id: <200304302226.h3UMQIAo014549@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 30165 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:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30165 Change 30165 by peter@peter_daintree on 2003/04/30 15:26:05 Hmm, how did this get modified here? Affected files ... .. //depot/projects/hammer/sys/i386/include/pcb.h#7 edit Differences ... ==== //depot/projects/hammer/sys/i386/include/pcb.h#7 (text+ko) ==== @@ -63,9 +63,11 @@ union savefpu pcb_save; u_int pcb_flags; +#define FP_SOFTFP 0x01 /* process using software fltng pnt emulator */ #define PCB_DBREGS 0x02 /* process using debug registers */ #define PCB_NPXTRAP 0x04 /* npx trap pending */ #define PCB_NPXINITDONE 0x08 /* fpu state is initialized */ +#define PCB_VM86CALL 0x10 /* in vm86 call */ caddr_t pcb_onfault; /* copyin/out fault recovery */ int pcb_gs; From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:32:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 056EB37B405; Wed, 30 Apr 2003 15:32:28 -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 AADF637B401 for ; Wed, 30 Apr 2003 15:32:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D038E43FB1 for ; Wed, 30 Apr 2003 15:32:26 -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 h3UMWQ0U018394 for ; Wed, 30 Apr 2003 15:32:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMWQCR018386 for perforce@freebsd.org; Wed, 30 Apr 2003 15:32:26 -0700 (PDT) Date: Wed, 30 Apr 2003 15:32:26 -0700 (PDT) Message-Id: <200304302232.h3UMWQCR018386@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 30166 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:32:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30166 Change 30166 by peter@peter_daintree on 2003/04/30 15:31:40 integrate i386_hammer branch Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#12 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#10 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#10 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#32 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#12 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/clock.c,v 1.197 2003/03/24 19:14:46 mdodd Exp $ + * $FreeBSD: src/sys/i386/isa/clock.c,v 1.198 2003/04/29 13:36:02 kan Exp $ */ /* @@ -60,13 +60,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.171 2002/12/14 16:11:28 phk Exp $ + * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.172 2003/04/30 12:57:39 markm Exp $ */ /* @@ -92,8 +92,6 @@ /* SI_ORDER_MIDDLE is hookable */ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL); -device_t nexus_dev; - /* * Determine i/o configuration for a machine. */ ==== //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.121 2003/04/10 07:05:24 wes Exp $ + * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.122 2003/04/30 12:23:58 markm Exp $ */ #include "opt_cpu.h" ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#32 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.250 2003/04/24 01:48:59 davidxu Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.251 2003/04/30 17:59:27 jhb Exp $ */ /* @@ -812,7 +812,7 @@ cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - syscallnames[code]); + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:35:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16A7F37B404; Wed, 30 Apr 2003 15:35:32 -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 D31F237B401 for ; Wed, 30 Apr 2003 15:35:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6636443F93 for ; Wed, 30 Apr 2003 15:35:31 -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 h3UMZV0U021051 for ; Wed, 30 Apr 2003 15:35:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMZUNu021040 for perforce@freebsd.org; Wed, 30 Apr 2003 15:35:30 -0700 (PDT) Date: Wed, 30 Apr 2003 15:35:30 -0700 (PDT) Message-Id: <200304302235.h3UMZUNu021040@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 30167 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:35:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=30167 Change 30167 by peter@peter_daintree on 2003/04/30 15:34:57 fix comment typo that is exported to the asm output Affected files ... .. //depot/projects/hammer/sys/x86_64/include/atomic.h#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/atomic.h#8 (text+ko) ==== @@ -149,7 +149,7 @@ " setz %%al ; " " movzbq %%al,%0 ; " "1: " - "# atomic_cmpset_int" + "# atomic_cmpset_long" : "+a" (res) /* 0 (result) %rax, XXX check */ : "r" (src), /* 1 */ "m" (*(dst)) /* 2 */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:39:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94A6C37B404; Wed, 30 Apr 2003 15:39:38 -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 4C2DE37B401 for ; Wed, 30 Apr 2003 15:39:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7A2443F85 for ; Wed, 30 Apr 2003 15:39:37 -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 h3UMdb0U023358 for ; Wed, 30 Apr 2003 15:39:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMdbce023353 for perforce@freebsd.org; Wed, 30 Apr 2003 15:39:37 -0700 (PDT) Date: Wed, 30 Apr 2003 15:39:37 -0700 (PDT) Message-Id: <200304302239.h3UMdbce023353@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 30169 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:39:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30169 Change 30169 by peter@peter_daintree on 2003/04/30 15:39:17 shorten long lines, remove i386 references Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#11 (text+ko) ==== @@ -68,7 +68,7 @@ register_t tf_r14; register_t tf_r15; register_t tf_trapno; - /* below portion defined in 386 hardware */ + /* below portion defined in hardware */ register_t tf_err; register_t tf_rip; register_t tf_cs; @@ -95,9 +95,9 @@ register_t if_r13; register_t if_r14; register_t if_r15; - register_t :64; /* for compat with trap frame - trapno */ - register_t :64; /* for compat with trap frame - err */ - /* below portion defined in 386 hardware */ + register_t :64; /* compat with trap frame - trapno */ + register_t :64; /* compat with trap frame - err */ + /* below portion defined in hardware */ register_t if_rip; register_t if_cs; register_t if_rflags; @@ -123,9 +123,9 @@ register_t cf_r13; register_t cf_r14; register_t cf_r15; - register_t :64; /* for compat with trap frame - trapno */ - register_t :64; /* for compat with trap frame - err */ - /* below portion defined in 386 hardware */ + register_t :64; /* compat with trap frame - trapno */ + register_t :64; /* compat with trap frame - err */ + /* below portion defined in hardware */ register_t cf_rip; register_t cf_cs; register_t cf_rflags; From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:53:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 701CF37B404; Wed, 30 Apr 2003 15:53:57 -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 2095937B401 for ; Wed, 30 Apr 2003 15:53:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A948343F85 for ; Wed, 30 Apr 2003 15:53:56 -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 h3UMru0U034003 for ; Wed, 30 Apr 2003 15:53:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMruDa033996 for perforce@freebsd.org; Wed, 30 Apr 2003 15:53:56 -0700 (PDT) Date: Wed, 30 Apr 2003 15:53:56 -0700 (PDT) Message-Id: <200304302253.h3UMruDa033996@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 30171 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:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=30171 Change 30171 by peter@peter_daintree on 2003/04/30 15:53:14 nuke symlinks. I have great fear what will happen at the next checkout with amd64 directories. Affected files ... .. //depot/projects/hammer/sys/amd64#2 delete .. //depot/projects/hammer/sys/conf/Makefile.amd64#2 delete .. //depot/projects/hammer/sys/conf/files.amd64#2 delete .. //depot/projects/hammer/sys/conf/ldscript.amd64#2 delete .. //depot/projects/hammer/sys/conf/options.amd64#2 delete .. //depot/projects/hammer/sys/x86_64/amd64#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 15:58:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 610AA37B404; Wed, 30 Apr 2003 15:58:04 -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 EF10037B401 for ; Wed, 30 Apr 2003 15:58:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61D1043FDD for ; Wed, 30 Apr 2003 15:58:03 -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 h3UMw20U037012 for ; Wed, 30 Apr 2003 15:58:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UMw22K037006 for perforce@freebsd.org; Wed, 30 Apr 2003 15:58:02 -0700 (PDT) Date: Wed, 30 Apr 2003 15:58:02 -0700 (PDT) Message-Id: <200304302258.h3UMw22K037006@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 30173 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:58:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=30173 Change 30173 by peter@peter_daintree on 2003/04/30 15:57:41 IFC @30172 Affected files ... .. //depot/projects/hammer/etc/pam.d/ftpd#3 integrate .. //depot/projects/hammer/etc/pam.d/gdm#3 integrate .. //depot/projects/hammer/etc/pam.d/kde#3 integrate .. //depot/projects/hammer/etc/pam.d/login#3 integrate .. //depot/projects/hammer/etc/pam.d/other#3 integrate .. //depot/projects/hammer/etc/pam.d/sshd#3 integrate .. //depot/projects/hammer/etc/pam.d/su#4 integrate .. //depot/projects/hammer/etc/pam.d/telnetd#3 integrate .. //depot/projects/hammer/etc/pam.d/xdm#3 integrate .. //depot/projects/hammer/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/hammer/sys/amd64/include/_limits.h#1 branch .. //depot/projects/hammer/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/hammer/sys/amd64/include/_types.h#1 branch .. //depot/projects/hammer/sys/amd64/include/endian.h#1 branch .. //depot/projects/hammer/sys/amd64/include/limits.h#1 branch .. //depot/projects/hammer/sys/amd64/include/param.h#1 branch .. //depot/projects/hammer/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/hammer/sys/boot/Makefile#4 integrate .. //depot/projects/hammer/sys/conf/kern.mk#7 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#6 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#6 integrate Differences ... ==== //depot/projects/hammer/etc/pam.d/ftpd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.17 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "ftpd" service # @@ -17,5 +17,4 @@ account required pam_unix.so # session -#session required pam_krb5.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/gdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "gdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/kde#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "kde" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/login#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "login" service # @@ -20,7 +20,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/hammer/etc/pam.d/other#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.9 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "other" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/sshd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "sshd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/su#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.13 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "su" service # @@ -19,5 +19,4 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so ==== //depot/projects/hammer/etc/pam.d/telnetd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "telnetd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/hammer/etc/pam.d/xdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.7 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.8 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "xdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/hammer/sys/boot/Makefile#4 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.15 2003/02/13 04:35:04 benno Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.16 2003/04/30 22:13:36 peter Exp $ + +.if ${MACHINE_ARCH} == "amd64" +MACHINE_ARCH=i386 +MACHINE=i386 +.endif .if ${MACHINE_ARCH} == "amd64" MACHINE_ARCH=i386 ==== //depot/projects/hammer/sys/conf/kern.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.32 2003/02/28 06:49:59 jake Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.33 2003/04/30 22:22:29 peter Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -54,10 +54,11 @@ # # For AMD64, use a medium model for now. We'll switch to "kernel" -# once pmap is ready. +# once pmap is ready. Be excessively careful to not generate FPU code. # .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -mcmodel=medium -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float +CFLAGS+= -mcmodel=medium -mno-red-zone \ + -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float .endif # ==== //depot/projects/hammer/sys/dev/puc/puc.c#6 (text+ko) ==== @@ -58,7 +58,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.22 2003/03/15 16:25:40 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.23 2003/04/30 22:15:47 sobomax Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, @@ -140,7 +140,7 @@ case PUC_ILR_TYPE_DIGI: sc->ilr_st = rman_get_bustag(res); sc->ilr_sh = rman_get_bushandle(res); - for (i = 0; i < 2; i++) { + for (i = 0; i < 2 && sc->sc_desc->ilr_offset[i] != 0; i++) { t1 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, sc->sc_desc->ilr_offset[i]); t1 = ~t1; @@ -353,7 +353,7 @@ mask = 0; switch (sc->sc_desc->ilr_type) { case PUC_ILR_TYPE_DIGI: - for (i = 1; i >= 0; i--) { + for (i = 1; i >= 0 && sc->sc_desc->ilr_offset[i] != 0; i--) { mask = (mask << 8) | (bus_space_read_1(sc->ilr_st, sc->ilr_sh, sc->sc_desc->ilr_offset[i]) & 0xff); } ==== //depot/projects/hammer/sys/dev/puc/pucdata.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.19 2003/04/07 09:42:45 murray Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.20 2003/04/30 22:15:47 sobomax Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -1008,6 +1008,40 @@ }, }, + { "IC Book Labs Ironclad x8 Lite", + NULL, + { 0xb00c, 0x041c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ } + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + + { "IC Book Labs Ironclad x8 Pro", + NULL, + { 0xb00c, 0x051c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ } + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + { "IC Book Labs Dreadnought x16 Lite", NULL, { 0xb00c, 0x091c, 0, 0 }, From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:03:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 178C037B404; Wed, 30 Apr 2003 16:03:11 -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 C0D2037B401 for ; Wed, 30 Apr 2003 16:03:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23A3043F85 for ; Wed, 30 Apr 2003 16:03:10 -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 h3UN390U041402 for ; Wed, 30 Apr 2003 16:03:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UN39l4041392 for perforce@freebsd.org; Wed, 30 Apr 2003 16:03:09 -0700 (PDT) Date: Wed, 30 Apr 2003 16:03:09 -0700 (PDT) Message-Id: <200304302303.h3UN39l4041392@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 30174 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 23:03:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30174 Change 30174 by peter@peter_daintree on 2003/04/30 16:02:34 rename x86_64/... into amd64/... Affected files ... .. //depot/projects/hammer/sys/amd64/Makefile#1 branch .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/exception.s#1 branch .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/locore.s#1 branch .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#1 branch .. //depot/projects/hammer/sys/amd64/amd64/support.s#1 branch .. //depot/projects/hammer/sys/amd64/amd64/swtch.s#1 branch .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/compile/.cvsignore#2 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/hammer/sys/amd64/conf/Makefile#1 branch .. //depot/projects/hammer/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/hammer/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/hammer/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#1 branch .. //depot/projects/hammer/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/hammer/sys/amd64/include/atomic.h#1 branch .. //depot/projects/hammer/sys/amd64/include/bus.h#1 branch .. //depot/projects/hammer/sys/amd64/include/bus_at386.h#1 branch .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/hammer/sys/amd64/include/clock.h#1 branch .. //depot/projects/hammer/sys/amd64/include/cpu.h#1 branch .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/hammer/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/hammer/sys/amd64/include/critical.h#1 branch .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/hammer/sys/amd64/include/elf.h#1 branch .. //depot/projects/hammer/sys/amd64/include/endian.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#1 branch .. //depot/projects/hammer/sys/amd64/include/float.h#1 branch .. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/hammer/sys/amd64/include/frame.h#1 branch .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/hammer/sys/amd64/include/kse.h#1 branch .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/hammer/sys/amd64/include/limits.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#1 branch .. //depot/projects/hammer/sys/amd64/include/mutex.h#1 branch .. //depot/projects/hammer/sys/amd64/include/npx.h#1 branch .. //depot/projects/hammer/sys/amd64/include/param.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pcb.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/hammer/sys/amd64/include/pmap.h#1 branch .. //depot/projects/hammer/sys/amd64/include/proc.h#1 branch .. //depot/projects/hammer/sys/amd64/include/profile.h#1 branch .. //depot/projects/hammer/sys/amd64/include/psl.h#1 branch .. //depot/projects/hammer/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/hammer/sys/amd64/include/reg.h#1 branch .. //depot/projects/hammer/sys/amd64/include/reloc.h#1 branch .. //depot/projects/hammer/sys/amd64/include/resource.h#1 branch .. //depot/projects/hammer/sys/amd64/include/runq.h#1 branch .. //depot/projects/hammer/sys/amd64/include/segments.h#1 branch .. //depot/projects/hammer/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/hammer/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/hammer/sys/amd64/include/signal.h#1 branch .. //depot/projects/hammer/sys/amd64/include/smp.h#1 branch .. //depot/projects/hammer/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/hammer/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/hammer/sys/amd64/include/trap.h#1 branch .. //depot/projects/hammer/sys/amd64/include/tss.h#1 branch .. //depot/projects/hammer/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/hammer/sys/amd64/include/varargs.h#1 branch .. //depot/projects/hammer/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/clock.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/icu.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#1 branch .. //depot/projects/hammer/sys/amd64/isa/icu_vector.s#1 branch .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/isa.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/isa.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/ithread.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/npx.c#1 branch .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/hammer/sys/amd64/isa/vector.s#1 branch .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#1 branch Differences ... ==== //depot/projects/hammer/sys/amd64/compile/.cvsignore#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_limits.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_stdint.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_types.h#2 (text+ko) ==== @@ -56,6 +56,8 @@ */ typedef __int32_t __clock_t; /* clock()... */ typedef __int64_t __critical_t; +typedef double __double_t; +typedef double __float_t; typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int64_t __intptr_t; @@ -72,7 +74,7 @@ typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __uint64_t __size_t; /* sizeof() */ typedef __int64_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ +typedef __int64_t __time_t; /* time()... */ typedef __uint64_t __uintfptr_t; typedef __uint64_t __uintmax_t; typedef __uint64_t __uintptr_t; ==== //depot/projects/hammer/sys/amd64/include/endian.h#2 (text+ko) ==== @@ -74,25 +74,26 @@ __asm ("rorl $16, %0" : "+r" (__X)); \ __X; }) -#if defined(_KERNEL) #define __byte_swap_int(x) \ __extension__ ({ register __uint32_t __X = (x); \ __asm ("bswap %0" : "+r" (__X)); \ __X; }) -#endif + +#define __byte_swap_long(x) \ +__extension__ ({ register __uint64_t __X = (x); \ + __asm ("bswap %0" : "+r" (__X)); \ + __X; }) #define __byte_swap_word(x) \ __extension__ ({ register __uint16_t __X = (x); \ - __asm ("xchgb %h0, %b0" : "+q" (__X)); \ + __asm ("xchgb %h0, %b0" : "+Q" (__X)); \ __X; }) static __inline __uint64_t __bswap64(__uint64_t _x) { - return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) | - ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) | - ((_x << 24) & ((__uint64_t)0xff << 40)) | - ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56))); + + return (__byte_swap_long(_x)); } static __inline __uint32_t ==== //depot/projects/hammer/sys/amd64/include/limits.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/param.h#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ /* - * Machine dependent constants for the AMD64. + * Machine dependent constants for AMD64. */ /* @@ -55,7 +55,7 @@ * */ #ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(int) - 1) +#define _ALIGNBYTES (sizeof(long) - 1) #endif #ifndef _ALIGN #define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) @@ -83,40 +83,71 @@ #define MACHINE_ARCH "amd64" #endif -#ifdef SMP -#define MAXCPU 16 -#else #define MAXCPU 1 -#endif /* SMP */ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) #define ALIGNED_POINTER(p,t) _ALIGNED_POINTER((p),(t)) +/* Size of the level 1 page table units */ +#define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) #define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ #define PAGE_SIZE (1<> PGSHIFT) +#define NKPML4E 1 /* addressable number of page tables/pde's */ +#define NKPDPE 1 /* addressable number of page tables/pde's */ +#define NPGPTD 4 + +#define NBPTD (NPGPTD<> PAGE_SHIFT) #define ptoa(x) ((unsigned long)(x) << PAGE_SHIFT) @@ -124,7 +155,7 @@ #define amd64_btop(x) ((unsigned long)(x) >> PAGE_SHIFT) #define amd64_ptob(x) ((unsigned long)(x) << PAGE_SHIFT) -#define pgtok(x) ((x) * (PAGE_SIZE / 1024)) +#define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) #endif /* !_MACHINE_PARAM_H_ */ #endif /* !_NO_NAMESPACE_POLLUTION */ ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:06:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8F0A37B404; Wed, 30 Apr 2003 16:06:15 -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 83FCA37B401 for ; Wed, 30 Apr 2003 16:06:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1795E43F75 for ; Wed, 30 Apr 2003 16:06:15 -0700 (PDT) (envelope-from jmallett@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 h3UN6E0U044789 for ; Wed, 30 Apr 2003 16:06:14 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UN6ErV044780 for perforce@freebsd.org; Wed, 30 Apr 2003 16:06:14 -0700 (PDT) Date: Wed, 30 Apr 2003 16:06:14 -0700 (PDT) Message-Id: <200304302306.h3UN6ErV044780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30176 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 23:06:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=30176 Change 30176 by jmallett@jmallett_dalek on 2003/04/30 16:05:38 Don't need a .ent here. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#8 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#8 (text+ko) ==== @@ -63,7 +63,7 @@ #define HIDENAME(asmsym) __CONCAT(.,asmsym) #define _GLOBAL(x) \ - .data; .align 2; .globl x; .ent x; x: + .data; .align 2; .globl x; x: #define _ENTRY(x) \ .text; .align 2; .globl x; .ent x; .type x,@function; x: From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:07:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8EDE37B404; Wed, 30 Apr 2003 16:07:17 -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 8FCF637B401 for ; Wed, 30 Apr 2003 16:07:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1858043F75 for ; Wed, 30 Apr 2003 16:07:17 -0700 (PDT) (envelope-from marcel@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 h3UN7G0U045398 for ; Wed, 30 Apr 2003 16:07:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UN7GDp045393 for perforce@freebsd.org; Wed, 30 Apr 2003 16:07:16 -0700 (PDT) Date: Wed, 30 Apr 2003 16:07:16 -0700 (PDT) Message-Id: <200304302307.h3UN7GDp045393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30177 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 23:07:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30177 Change 30177 by marcel@marcel_nfs on 2003/04/30 16:06:14 Hook up ia32 support again: o Move option IA32 to opt_global.h so that we can use conditional compilation more safely, such as in pcb.h o Add functions ia32_restorectx() and ia32_savectx() and call them from cpu_throw() and cpu_switch(). This mimics the current implementation by treating the ia32 registers as preserved resources. We should have enough unused "slots" in the trapframe to treat them as scratch resources eventually. The free "slots" are those fields that relate to the RSE (bsp, ndirty, pfs, cfm and rnat) and NaTs (unat). DOing the ia32 context switch in cpu_switch() is the least difficult approach for now. Note that ar.csd and ar.ssd are part of the ia64 runtime now and consequently are saved and restored in the trapframe already (they are defined as scratch). o Support for exec'ing an ia32 binary by using the EPC syscall is not added. Focus is on getting the break based syscall to work first, which at this point is getting things hooked up again and see where it fails. Affected files ... .. //depot/projects/ia64_epc/sys/conf/options.ia64#3 edit .. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#2 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/genassym.c#8 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#19 edit .. //depot/projects/ia64_epc/sys/ia64/include/pcb.h#8 edit Differences ... ==== //depot/projects/ia64_epc/sys/conf/options.ia64#3 (text+ko) ==== @@ -4,7 +4,7 @@ ITANIUM opt_global.h ITANIUM2 opt_global.h -IA32 +IA32 opt_global.h PAGE_SIZE_4K opt_global.h PAGE_SIZE_8K opt_global.h ==== //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -244,44 +244,19 @@ struct segment_descriptor desc; struct vmspace *vmspace = td->td_proc->p_vmspace; - /* - * Make sure that we restore the entire trapframe after an - * execve. - */ - frame->tf_flags &= ~FRAME_SYSCALL; + exec_setregs(td, entry, stack, ps_strings); - bzero(frame->tf_r, sizeof(frame->tf_r)); - bzero(frame->tf_f, sizeof(frame->tf_f)); - - frame->tf_cr_iip = entry; - frame->tf_cr_ipsr = (IA64_PSR_IC - | IA64_PSR_I - | IA64_PSR_IT - | IA64_PSR_DT - | IA64_PSR_RT - | IA64_PSR_DFH - | IA64_PSR_IS - | IA64_PSR_BN - | IA64_PSR_CPL_USER); - frame->tf_r[FRAME_R12] = stack; + /* Mark this process as using the ia32 instruction set. */ + frame->tf_special.psr |= IA64_PSR_IS; codesel = LSEL(LUCODE_SEL, SEL_UPL); datasel = LSEL(LUDATA_SEL, SEL_UPL); ldtsel = GSEL(GLDT_SEL, SEL_UPL); -#if 1 - frame->tf_r[FRAME_R16] = (datasel << 48) | (datasel << 32) - | (datasel << 16) | datasel; - frame->tf_r[FRAME_R17] = (ldtsel << 32) | (datasel << 16) | codesel; -#else - frame->tf_r[FRAME_R16] = datasel; - frame->tf_r[FRAME_R17] = codesel; - frame->tf_r[FRAME_R18] = datasel; - frame->tf_r[FRAME_R19] = datasel; - frame->tf_r[FRAME_R20] = datasel; - frame->tf_r[FRAME_R21] = datasel; - frame->tf_r[FRAME_R22] = ldtsel; -#endif + /* Setup ia32 segment registers. */ + frame->tf_scratch.gr16 = (datasel << 48) | (datasel << 32) | + (datasel << 16) | datasel; + frame->tf_scratch.gr17 = (ldtsel << 32) | (datasel << 16) | codesel; /* * Build the GDT and LDT. @@ -330,12 +305,13 @@ + (1L << 59) /* present */ + (1L << 62) /* 32 bits */ + (1L << 63); /* page granularity */ - ia64_set_csd(codeseg); - ia64_set_ssd(dataseg); - frame->tf_r[FRAME_R24] = dataseg; /* ESD */ - frame->tf_r[FRAME_R27] = dataseg; /* DSD */ - frame->tf_r[FRAME_R28] = dataseg; /* FSD */ - frame->tf_r[FRAME_R29] = dataseg; /* GSD */ + + frame->tf_scratch.csd = codeseg; + frame->tf_scratch.ssd = dataseg; + frame->tf_scratch.gr24 = dataseg; /* ESD */ + frame->tf_scratch.gr27 = dataseg; /* DSD */ + frame->tf_scratch.gr28 = dataseg; /* FSD */ + frame->tf_scratch.gr29 = dataseg; /* GSD */ gdtseg = gdt /* base */ + ((8L*NGDT - 1) << 32) /* limit */ @@ -351,13 +327,16 @@ + (1L << 59) /* present */ + (0L << 62) /* 16 bits */ + (0L << 63); /* byte granularity */ - frame->tf_r[FRAME_R30] = ldtseg; /* LDTD */ - frame->tf_r[FRAME_R31] = gdtseg; /* GDTD */ + + frame->tf_scratch.gr30 = ldtseg; /* LDTD */ + frame->tf_scratch.gr31 = gdtseg; /* GDTD */ +#if 0 ia64_set_eflag(PSL_USER); +#endif /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ - frame->tf_r[FRAME_R11] = IA32_PS_STRINGS; + frame->tf_scratch.gr11 = IA32_PS_STRINGS; /* * XXX - Linux emulator @@ -366,3 +345,27 @@ */ td->td_retval[1] = 0; } + +void +ia32_restorectx(struct pcb *pcb) +{ + + ia64_set_cflg(pcb->pcb_ia32_cflg); + ia64_set_eflag(pcb->pcb_ia32_eflag); + ia64_set_fcr(pcb->pcb_ia32_fcr); + ia64_set_fdr(pcb->pcb_ia32_fdr); + ia64_set_fir(pcb->pcb_ia32_fir); + ia64_set_fsr(pcb->pcb_ia32_fsr); +} + +void +ia32_savectx(struct pcb *pcb) +{ + + pcb->pcb_ia32_cflg = ia64_get_cflg(); + pcb->pcb_ia32_eflag = ia64_get_eflag(); + pcb->pcb_ia32_fcr = ia64_get_fcr(); + pcb->pcb_ia32_fdr = ia64_get_fdr(); + pcb->pcb_ia32_fir = ia64_get_fir(); + pcb->pcb_ia32_fsr = ia64_get_fsr(); +} ==== //depot/projects/ia64_epc/sys/ia64/ia64/genassym.c#8 (text+ko) ==== @@ -37,8 +37,6 @@ * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.33 2003/02/17 09:55:09 julian Exp $ */ -#include "opt_ia32.h" - #include #include #include @@ -78,10 +76,6 @@ ASSYM(FRAME_SYSCALL, FRAME_SYSCALL); -#ifdef IA32 -ASSYM(IA32, IA32); -#endif - ASSYM(KSTACK_PAGES, KSTACK_PAGES); ASSYM(MC_PRESERVED, offsetof(mcontext_t, mc_preserved)); ==== //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#19 (text+ko) ==== @@ -219,10 +219,16 @@ oldpcb = old->td_pcb; oldpcb->pcb_current_pmap = PCPU_GET(current_pmap); +#if IA32 + ia32_savectx(oldpcb); +#endif if (!savectx(oldpcb)) { newpcb = new->td_pcb; pmap_install(newpcb->pcb_current_pmap); PCPU_SET(curthread, new); +#if IA32 + ia32_restorectx(newpcb); +#endif restorectx(newpcb); } } @@ -235,6 +241,9 @@ newpcb = new->td_pcb; pmap_install(newpcb->pcb_current_pmap); PCPU_SET(curthread, new); +#if IA32 + ia32_restorectx(newpcb); +#endif restorectx(newpcb); /* We should not get here. */ panic("cpu_throw: restorectx() returned"); ==== //depot/projects/ia64_epc/sys/ia64/include/pcb.h#8 (text+ko) ==== @@ -46,13 +46,29 @@ uint64_t pcb_onfault; /* for copy faults */ uint64_t pcb_accessaddr; /* for [fs]uswintr */ + +#if IA32 + uint64_t pcb_ia32_cflg; + uint64_t pcb_ia32_eflag; + uint64_t pcb_ia32_fcr; + uint64_t pcb_ia32_fdr; + uint64_t pcb_ia32_fir; + uint64_t pcb_ia32_fsr; +#endif }; #ifdef _KERNEL + #define savectx savectx__ void restorectx(struct pcb *) __dead2; int savectx(struct pcb *); void swapctx(struct pcb *old, struct pcb *new); + +#if IA32 +void ia32_restorectx(struct pcb *); +void ia32_savectx(struct pcb *); +#endif + #endif #endif /* _MACHINE_PCB_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:07:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E329837B404; Wed, 30 Apr 2003 16:07:18 -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 0430A37B410 for ; Wed, 30 Apr 2003 16:07:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E68943FA3 for ; Wed, 30 Apr 2003 16:07:17 -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 h3UN7H0U045406 for ; Wed, 30 Apr 2003 16:07:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UN7Hkk045401 for perforce@freebsd.org; Wed, 30 Apr 2003 16:07:17 -0700 (PDT) Date: Wed, 30 Apr 2003 16:07:17 -0700 (PDT) Message-Id: <200304302307.h3UN7Hkk045401@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 30178 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 23:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=30178 Change 30178 by peter@peter_daintree on 2003/04/30 16:07:13 IFC @30176 Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.amd64#3 branch .. //depot/projects/hammer/sys/conf/files.amd64#3 branch .. //depot/projects/hammer/sys/conf/ldscript.amd64#3 branch .. //depot/projects/hammer/sys/conf/options.amd64#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:10:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E0FB37B404; Wed, 30 Apr 2003 16:10:23 -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 0D70F37B401 for ; Wed, 30 Apr 2003 16:10:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3483143F3F for ; Wed, 30 Apr 2003 16:10:22 -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 h3UNAM0U046738 for ; Wed, 30 Apr 2003 16:10:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNAL2B046731 for perforce@freebsd.org; Wed, 30 Apr 2003 16:10:21 -0700 (PDT) Date: Wed, 30 Apr 2003 16:10:21 -0700 (PDT) Message-Id: <200304302310.h3UNAL2B046731@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 30179 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 23:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=30179 Change 30179 by peter@peter_daintree on 2003/04/30 16:10:08 Forced integrate to update new branch points.. I hope. Affected files ... .. //depot/projects/hammer/lib/csu/amd64/Makefile#4 integrate .. //depot/projects/hammer/lib/csu/amd64/crt1.c#4 integrate .. //depot/projects/hammer/lib/csu/amd64/crti.S#4 integrate .. //depot/projects/hammer/lib/csu/amd64/crtn.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#4 integrate .. //depot/projects/hammer/lib/libc/amd64/arith.h#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/infinity.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/amd64/net/htonl.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/net/htons.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/stdlib/gdtoa.mk#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/exect.S#5 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#4 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/Makefile.inc#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/elf_rtld.x#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#4 integrate .. //depot/projects/hammer/sys/amd64/Makefile#2 integrate .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/atomic.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/critical.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.s#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.s#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.s#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/swtch.s#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/hammer/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/hammer/sys/amd64/conf/gethints.awk#2 integrate .. //depot/projects/hammer/sys/amd64/include/_inttypes.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/bus_at386.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/kse.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/npx.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/psl.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/ptrace.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/resource.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/runq.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/sigframe.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/trap.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/tss.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/ucontext.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#2 integrate .. //depot/projects/hammer/sys/amd64/isa/icu_vector.s#2 integrate .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#2 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#2 integrate .. //depot/projects/hammer/sys/amd64/isa/ithread.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/npx.c#2 integrate .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#2 integrate .. //depot/projects/hammer/sys/amd64/isa/vector.s#2 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#2 integrate Differences ... ==== //depot/projects/hammer/lib/csu/amd64/Makefile#4 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/crt1.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/crti.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/csu/amd64/crtn.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/_fpmath.h#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/arith.h#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#5 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/_setjmp.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#6 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/fabs.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/frexp.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/infinity.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/isinf.c#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/modf.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/Makefile.inc#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/htonl.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/htons.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/ntohl.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/net/ntohs.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/stdlib/gdtoa.mk#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/Makefile.inc#5 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/brk.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/cerror.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/exect.S#5 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/pipe.S#6 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/ptrace.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/reboot.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/sbrk.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/setlogin.S#4 (text+ko) ==== ==== //depot/projects/hammer/lib/libc/amd64/sys/sigreturn.S#4 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/Makefile.inc#3 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/elf_rtld.x#3 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/lockdflt.c#4 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/reloc.c#4 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_machdep.h#4 (text+ko) ==== ==== //depot/projects/hammer/libexec/rtld-elf/amd64/rtld_start.S#4 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/Makefile#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/atomic.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/locore.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/swtch.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/Makefile#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/gethints.awk#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_inttypes.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asm.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/atomic.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_at386.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_memio.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_pio.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/clock.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpu.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/critical.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/elf.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/exec.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/float.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/floatingpoint.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/frame.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/kse.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/md_var.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/mutex.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/npx.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pc/display.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb_ext.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/proc.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/psl.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ptrace.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reg.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reloc.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/resource.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/runq.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/segments.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/setjmp.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sigframe.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/signal.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/smp.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/trap.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/tss.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ucontext.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/varargs.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu_vector.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/ithread.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/npx.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/timerreg.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/vector.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:20:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02BD137B404; Wed, 30 Apr 2003 16:20:37 -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 8AAC037B401 for ; Wed, 30 Apr 2003 16:20:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C81A543F93 for ; Wed, 30 Apr 2003 16:20:35 -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 h3UNKZ0U054060 for ; Wed, 30 Apr 2003 16:20:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNKZEf054051 for perforce@freebsd.org; Wed, 30 Apr 2003 16:20:35 -0700 (PDT) Date: Wed, 30 Apr 2003 16:20:35 -0700 (PDT) Message-Id: <200304302320.h3UNKZEf054051@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 30181 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 23:20:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=30181 Change 30181 by peter@peter_daintree on 2003/04/30 16:19:49 IFC @30180 (after dumbass repo-copy in cvs) Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/hammer/sys/conf/Makefile.x86_64#13 delete .. //depot/projects/hammer/sys/conf/files.amd64#4 integrate .. //depot/projects/hammer/sys/conf/files.x86_64#19 delete .. //depot/projects/hammer/sys/conf/options.amd64#4 integrate .. //depot/projects/hammer/sys/conf/options.x86_64#9 delete .. //depot/projects/hammer/sys/ia64/include/param.h#4 integrate Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.amd64#4 (text+ko) ==== @@ -1,18 +1,19 @@ -# Makefile.i386 -- with config changes. +# Makefile.x86_64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.259 2003/04/15 21:29:11 phk Exp $ +# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.5 2003/04/15 21:29:11 phk Exp $ # # Makefile for FreeBSD # # This makefile is constructed from a machine description: # config machineid # Most changes should be made in the machine description -# /sys/i386/conf/``machineid'' +# /sys/x86_64/conf/``machineid'' # after which you should do # config machineid # Generic makefile changes should be made in -# /sys/conf/Makefile.i386 +# /sys/conf/Makefile.x86_64 # after which config should be rerun for all machines. # @@ -30,7 +31,7 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=i386 +MKMODULESENV+= MACHINE=x86_64 %BEFORE_DEPEND ==== //depot/projects/hammer/sys/conf/files.amd64#4 (text+ko) ==== @@ -1,125 +1,13 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.444 2003/04/27 05:40:53 imp Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.10 2003/02/28 21:59:13 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # -linux_genassym.o optional compat_linux \ - dependency "$S/i386/linux/linux_genassym.c" \ - compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \ - no-obj no-implicit-rule \ - clean "linux_genassym.o" -# -linux_assym.h optional compat_linux \ - dependency "$S/kern/genassym.sh linux_genassym.o" \ - compile-with "sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \ - no-obj no-implicit-rule before-depend \ - clean "linux_assym.h" -# -svr4_genassym.o optional compat_svr4 \ - dependency "$S/i386/svr4/svr4_genassym.c" \ - compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \ - no-obj no-implicit-rule \ - clean "svr4_genassym.o" -# -svr4_assym.h optional compat_svr4 \ - dependency "$S/kern/genassym.sh svr4_genassym.o" \ - compile-with "sh $S/kern/genassym.sh svr4_genassym.o > ${.TARGET}" \ - no-obj no-implicit-rule before-depend \ - clean "svr4_assym.h" -# -font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -# -atkbdmap.h optional atkbd_dflt_keymap \ - compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ - no-obj no-implicit-rule before-depend \ - clean "atkbdmap.h" -# -ukbdmap.h optional ukbd_dflt_keymap \ - compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ - no-obj no-implicit-rule before-depend \ - clean "ukbdmap.h" -# -msysosak.o optional fla \ - dependency "$S/contrib/dev/fla/i386/msysosak.o.uu" \ - compile-with "uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu" \ - no-implicit-rule -# -trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ - no-implicit-rule -# -compat/linux/linux_file.c optional compat_linux -compat/linux/linux_getcwd.c optional compat_linux -compat/linux/linux_ioctl.c optional compat_linux -compat/linux/linux_ipc.c optional compat_linux -compat/linux/linux_mib.c optional compat_linux -compat/linux/linux_misc.c optional compat_linux -compat/linux/linux_signal.c optional compat_linux -compat/linux/linux_socket.c optional compat_linux -compat/linux/linux_stats.c optional compat_linux -compat/linux/linux_sysctl.c optional compat_linux -compat/linux/linux_uid16.c optional compat_linux -compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support -compat/svr4/imgact_svr4.c optional compat_svr4 -compat/svr4/svr4_fcntl.c optional compat_svr4 -compat/svr4/svr4_filio.c optional compat_svr4 -compat/svr4/svr4_ioctl.c optional compat_svr4 -compat/svr4/svr4_ipc.c optional compat_svr4 -compat/svr4/svr4_misc.c optional compat_svr4 -compat/svr4/svr4_resource.c optional compat_svr4 -compat/svr4/svr4_signal.c optional compat_svr4 -compat/svr4/svr4_socket.c optional compat_svr4 -compat/svr4/svr4_sockio.c optional compat_svr4 -compat/svr4/svr4_stat.c optional compat_svr4 -compat/svr4/svr4_stream.c optional compat_svr4 -compat/svr4/svr4_syscallnames.c optional compat_svr4 -compat/svr4/svr4_sysent.c optional compat_svr4 -compat/svr4/svr4_sysvec.c optional compat_svr4 -compat/svr4/svr4_termios.c optional compat_svr4 -compat/svr4/svr4_ttold.c optional compat_svr4 -contrib/dev/fla/fla.c optional fla -contrib/dev/oltr/if_oltr.c optional oltr -contrib/dev/oltr/trlldbm.c optional oltr -contrib/dev/oltr/trlldhm.c optional oltr -contrib/dev/oltr/trlldmac.c optional oltr -bf_enc.o optional ipsec ipsec_esp \ - dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ - compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ - no-implicit-rule -crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto -crypto/des/arch/i386/des_enc.S optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto -bf_enc.o optional crypto \ - dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ - compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ - no-implicit-rule -crypto/des/arch/i386/des_enc.S optional crypto -crypto/des/des_ecb.c optional crypto -crypto/des/des_setkey.c optional crypto -dev/advansys/adv_isa.c optional adv isa -dev/aic/aic_isa.c optional aic isa -dev/ar/if_ar.c optional ar -dev/ar/if_ar_pci.c optional ar pci -dev/ar/if_ar_isa.c optional ar isa -dev/cm/if_cm_isa.c optional cm isa -dev/dgb/dgb.c count dgb -dev/ed/if_ed_isa.c optional ed isa -dev/eisa/eisaconf.c optional eisa -dev/fb/fb.c optional fb -dev/fb/fb.c optional vga -dev/fb/splash.c optional splash -dev/fb/vga.c optional vga -dev/fe/if_fe_isa.c optional fe isa + dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd @@ -127,13 +15,8 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt -dev/lnc/if_lnc_isa.c optional lnc isa -dev/sbni/if_sbni.c optional sbni -dev/sbni/if_sbni_isa.c optional sbni isa -dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa -dev/sr/if_sr_isa.c optional sr isa dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc @@ -146,278 +29,34 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -geom/geom_bsd.c standard -geom/geom_bsd_enc.c standard -geom/geom_mbr.c standard -geom/geom_mbr_enc.c standard -gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ - warning "kernel contains GPL contaminated math emulator" -gnu/i386/fpemul/errors.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate -gnu/i386/fpemul/get_address.c optional gpl_math_emulate -gnu/i386/fpemul/load_store.c optional gpl_math_emulate -gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate -gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate -gnu/i386/fpemul/poly_div.s optional gpl_math_emulate -gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate -gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate -gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate -gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate -gnu/i386/fpemul/polynomial.s optional gpl_math_emulate -gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate -gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate -gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate -gnu/i386/fpemul/reg_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate -gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate -gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate -gnu/i386/fpemul/reg_round.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate -gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate -gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate -i386/acpica/OsdEnvironment.c optional acpi -i386/acpica/acpi_machdep.c optional acpi -i386/acpica/acpi_wakeup.c optional acpi -acpi_wakecode.h optional acpi \ - dependency "$S/i386/acpica/acpi_wakecode.S" \ - compile-with "${MAKE} -f $S/i386/acpica/Makefile MAKESRCPATH=$S/i386/acpica" \ - no-obj no-implicit-rule before-depend \ - clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin" -# -i386/bios/apm.c optional apm -i386/bios/mca_machdep.c optional mca -i386/bios/smapi.c optional smapi -i386/bios/smapi_bios.S optional smapi -i386/bios/smbios.c optional smbios -i386/bios/vpd.c optional vpd -i386/i386/atomic.c standard \ - compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -i386/i386/autoconf.c standard -i386/i386/bios.c standard -i386/i386/bioscall.s standard -i386/i386/busdma_machdep.c standard -i386/i386/critical.c standard -i386/i386/db_disasm.c optional ddb -i386/i386/db_interface.c optional ddb -i386/i386/db_trace.c optional ddb -i386/i386/dump_machdep.c standard -i386/i386/elan-mmcr.c optional cpu_elan -i386/i386/elf_machdep.c standard -i386/i386/exception.s standard -i386/i386/i386-gdbstub.c optional ddb -i386/i386/i686_mem.c standard -i386/i386/identcpu.c standard -i386/i386/in_cksum.c optional inet -i386/i386/initcpu.c standard -i386/i386/k6_mem.c standard -i386/i386/legacy.c standard -i386/i386/locore.s standard no-obj -i386/i386/machdep.c standard -i386/i386/math_emulate.c optional math_emulate -i386/i386/mem.c standard -i386/i386/mp_clock.c optional smp -i386/i386/mp_machdep.c optional smp -i386/i386/mpapic.c optional smp -i386/i386/mpboot.s optional smp -i386/i386/nexus.c standard -i386/i386/perfmon.c optional perfmon -i386/i386/perfmon.c optional perfmon profiling-routine -i386/i386/pmap.c standard -i386/i386/support.s standard -i386/i386/swtch.s standard -i386/i386/sys_machdep.c standard -i386/i386/trap.c standard -i386/i386/tsc.c standard -i386/i386/vm86.c standard -i386/i386/vm_machdep.c standard -i386/ibcs2/ibcs2_errno.c optional ibcs2 -i386/ibcs2/ibcs2_fcntl.c optional ibcs2 -i386/ibcs2/ibcs2_ioctl.c optional ibcs2 -i386/ibcs2/ibcs2_ipc.c optional ibcs2 -i386/ibcs2/ibcs2_isc.c optional ibcs2 -i386/ibcs2/ibcs2_isc_sysent.c optional ibcs2 -i386/ibcs2/ibcs2_misc.c optional ibcs2 -i386/ibcs2/ibcs2_msg.c optional ibcs2 -i386/ibcs2/ibcs2_other.c optional ibcs2 -i386/ibcs2/ibcs2_signal.c optional ibcs2 -i386/ibcs2/ibcs2_socksys.c optional ibcs2 -i386/ibcs2/ibcs2_stat.c optional ibcs2 -i386/ibcs2/ibcs2_sysent.c optional ibcs2 -i386/ibcs2/ibcs2_sysi86.c optional ibcs2 -i386/ibcs2/ibcs2_sysvec.c optional ibcs2 -i386/ibcs2/ibcs2_util.c optional ibcs2 -i386/ibcs2/ibcs2_xenix.c optional ibcs2 -i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 -i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/asc.c count asc -i386/isa/clock.c standard -i386/isa/cronyx.c optional cx -i386/isa/ctx.c count ctx -i386/isa/cx.c count cx -i386/isa/cy.c count cy -i386/isa/elink.c optional ep -i386/isa/elink.c optional ie -i386/isa/gpib.c optional gp -i386/isa/gsc.c count gsc -i386/isa/if_cx.c optional cx -i386/isa/if_el.c count el -i386/isa/if_le.c count le -i386/isa/if_rdp.c count rdp -i386/isa/intr_machdep.c standard -i386/isa/ithread.c standard -i386/isa/isa.c optional isa -i386/isa/isa_compat.c optional isa compat_oldisa \ - warning "Old ISA driver compatibility shims present." -i386/isa/isa_dma.c optional isa -i386/isa/istallion.c optional stli nowerror -i386/isa/loran.c optional loran -i386/isa/mse.c optional mse -i386/isa/npx.c optional npx -i386/isa/pcaudio.c optional pca -i386/isa/pcf.c optional pcf -i386/isa/pcvt/pcvt_drv.c optional vt -i386/isa/pcvt/pcvt_ext.c optional vt -i386/isa/pcvt/pcvt_kbd.c optional vt -i386/isa/pcvt/pcvt_out.c optional vt -i386/isa/pcvt/pcvt_sup.c optional vt -i386/isa/pcvt/pcvt_vtf.c optional vt -i386/isa/pmtimer.c optional pmtimer -i386/isa/prof_machdep.c optional profiling-routine -i386/isa/spic.c optional spic -i386/isa/spigot.c count spigot -i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl nowerror -i386/isa/vesa.c optional vga vesa -i386/isa/wt.c count wt -i386/linux/imgact_linux.c optional compat_linux -i386/linux/linux_dummy.c optional compat_linux -i386/linux/linux_locore.s optional compat_linux \ - dependency "linux_assym.h" -i386/linux/linux_machdep.c optional compat_linux -i386/linux/linux_ptrace.c optional compat_linux -i386/linux/linux_sysent.c optional compat_linux -i386/linux/linux_sysvec.c optional compat_linux -i386/pci/pci_cfgreg.c optional pci -i386/pci/pci_bus.c optional pci -i386/svr4/svr4_locore.s optional compat_svr4 \ - dependency "svr4_assym.h" \ - warning "COMPAT_SVR4 is broken and should be avoided" -i386/svr4/svr4_machdep.c optional compat_svr4 -# -# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc -# -i4b/layer1/i4b_hdlc.c optional itjc -i4b/layer1/i4b_hdlc.c optional ihfc -i4b/layer1/i4b_l1dmux.c optional isic -i4b/layer1/i4b_l1lib.c optional isic -i4b/layer1/i4b_l1dmux.c optional iwic -i4b/layer1/i4b_l1lib.c optional iwic -i4b/layer1/i4b_l1dmux.c optional ifpi -i4b/layer1/i4b_l1lib.c optional ifpi -i4b/layer1/i4b_l1dmux.c optional ifpi2 -i4b/layer1/i4b_l1lib.c optional ifpi2 -i4b/layer1/i4b_l1dmux.c optional ihfc -i4b/layer1/i4b_l1lib.c optional ihfc -i4b/layer1/i4b_l1dmux.c optional ifpnp -i4b/layer1/i4b_l1lib.c optional ifpnp -i4b/layer1/i4b_l1dmux.c optional itjc -i4b/layer1/i4b_l1lib.c optional itjc -# -# isdn4bsd, isic -# -i4b/layer1/isic/i4b_asuscom_ipac.c optional isic -i4b/layer1/isic/i4b_avm_a1.c optional isic -i4b/layer1/isic/i4b_bchan.c optional isic -i4b/layer1/isic/i4b_ctx_s0P.c optional isic -i4b/layer1/isic/i4b_drn_ngo.c optional isic -i4b/layer1/isic/i4b_dynalink.c optional isic -i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci -i4b/layer1/isic/i4b_elsa_pcc16.c optional isic -i4b/layer1/isic/i4b_hscx.c optional isic -i4b/layer1/isic/i4b_isac.c optional isic -i4b/layer1/isic/i4b_isic.c optional isic -i4b/layer1/isic/i4b_isic_isa.c optional isic -i4b/layer1/isic/i4b_isic_pnp.c optional isic -i4b/layer1/isic/i4b_itk_ix1.c optional isic -i4b/layer1/isic/i4b_l1.c optional isic -i4b/layer1/isic/i4b_l1fsm.c optional isic -i4b/layer1/isic/i4b_siemens_isurf.c optional isic -i4b/layer1/isic/i4b_sws.c optional isic -i4b/layer1/isic/i4b_tel_s016.c optional isic -i4b/layer1/isic/i4b_tel_s0163.c optional isic -i4b/layer1/isic/i4b_tel_s08.c optional isic -i4b/layer1/isic/i4b_usr_sti.c optional isic -i4b/layer1/isic/i4b_diva.c optional isic -# -# isdn4bsd, iwic -# -i4b/layer1/iwic/i4b_iwic_pci.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci -# -# isdn4bsd, ifpi -# -i4b/layer1/ifpi/i4b_ifpi_pci.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci -# -# isdn4bsd, ifpi2 -# -i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci -# -# isdn4bsd, ifpnp -# -i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_l1.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp -# -# isdn4bsd, ihfc -# -i4b/layer1/ihfc/i4b_ihfc_l1if.c optional ihfc -i4b/layer1/ihfc/i4b_ihfc_pnp.c optional ihfc -i4b/layer1/ihfc/i4b_ihfc_drv.c optional ihfc -# -# isdn4bsd, itjc -# -i4b/layer1/itjc/i4b_itjc_pci.c optional itjc -i4b/layer1/itjc/i4b_itjc_isac.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc -# isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/fd.c optional fdc -isa/ppc.c optional ppc -isa/psm.c optional psm -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga -kern/imgact_aout.c optional compat_aout -kern/imgact_gzip.c optional gzip -libkern/divdi3.c standard -libkern/moddi3.c standard -libkern/qdivrem.c standard -libkern/ucmpdi2.c standard -libkern/udivdi3.c standard -libkern/umoddi3.c standard -pci/cy_pci.c optional cy pci -pci/agp_intel.c optional agp -pci/agp_via.c optional agp -pci/agp_sis.c optional agp -pci/agp_ali.c optional agp -pci/agp_amd.c optional agp -pci/agp_i810.c optional agp + +libkern/ffs.c standard + +x86_64/x86_64/autoconf.c standard +x86_64/x86_64/bios.c standard +x86_64/x86_64/bioscall.s standard +x86_64/x86_64/busdma_machdep.c standard +x86_64/x86_64/critical.c standard +x86_64/x86_64/dump_machdep.c standard +x86_64/x86_64/elf_machdep.c standard +x86_64/x86_64/exception.s standard +x86_64/x86_64/i686_mem.c standard +x86_64/x86_64/identcpu.c standard +x86_64/x86_64/initcpu.c standard +x86_64/x86_64/k6_mem.c standard +x86_64/x86_64/locore.s standard no-obj +x86_64/x86_64/machdep.c standard +x86_64/x86_64/mem.c standard +x86_64/x86_64/nexus.c standard +x86_64/x86_64/pmap.c standard +x86_64/x86_64/support.s standard +x86_64/x86_64/swtch.s standard +x86_64/x86_64/sys_machdep.c standard +x86_64/x86_64/trap.c standard +x86_64/x86_64/vm86.c standard +x86_64/x86_64/vm_machdep.c standard + +x86_64/isa/clock.c standard +x86_64/isa/intr_machdep.c standard +x86_64/isa/ithread.c standard ==== //depot/projects/hammer/sys/conf/options.amd64#4 (text+ko) ==== @@ -1,84 +1,15 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.191 2003/04/12 09:40:37 des Exp $ -# Options specific to the i386 platform kernels +# $FreeBSD: src/sys/conf/options.amd64,v 1.5 2003/04/12 09:40:37 des Exp $ +# Options specific to the AMD x86-64 platform kernels -MATH_EMULATE opt_math_emulate.h -GPL_MATH_EMULATE opt_math_emulate.h -DISABLE_PSE opt_pmap.h -PMAP_SHPGPERPROC opt_pmap.h -DISABLE_PG_G opt_pmap.h -LAZY_SWITCH opt_swtch.h -SWTCH_OPTIM_STATS opt_swtch.h -PPC_PROBE_CHIPSET opt_ppc.h -PPC_DEBUG opt_ppc.h MAXMEM PERFMON opt_perfmon.h -POWERFAIL_NMI opt_trap.h -AUTO_EOI_1 opt_auto_eoi.h -AUTO_EOI_2 opt_auto_eoi.h -I586_PMC_GUPROF opt_i586_guprof.h -COMPAT_OLDISA -BROKEN_KEYBOARD_RESET opt_reset.h -# Options for emulators. These should only be used at config time, so -# they are handled like options for static filesystems -# (see src/sys/conf/options), except for broken debugging options. -COMPAT_AOUT opt_dontuse.h -IBCS2 opt_dontuse.h -COMPAT_LINUX opt_dontuse.h -COMPAT_SVR4 opt_dontuse.h -DEBUG_SVR4 opt_svr4.h -PECOFF_SUPPORT opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -# i386 SMP options -APIC_IO opt_global.h - # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h -# Physical address extensions and support for >4G ram. As above. -PAE opt_global.h - -CLK_CALIBRATION_LOOP opt_clock.h -CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h -TIMER_FREQ opt_clock.h - -NO_F00F_HACK opt_cpu.h -CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h -CPU_BLUELIGHTNING_3X opt_cpu.h -CPU_BTB_EN opt_cpu.h -CPU_CYRIX_NO_LOCK opt_cpu.h -CPU_DIRECT_MAPPED_CACHE opt_cpu.h -CPU_DISABLE_5X86_LSSER opt_cpu.h -CPU_ELAN opt_cpu.h -CPU_FASTER_5X86_FPU opt_cpu.h -CPU_I486_ON_386 opt_cpu.h -CPU_IORT opt_cpu.h -CPU_L2_LATENCY opt_cpu.h -CPU_LOOP_EN opt_cpu.h -CPU_PPRO2CELERON opt_cpu.h -CPU_RSTK_EN opt_cpu.h -CPU_SUSP_HLT opt_cpu.h -CPU_UPGRADE_HW_CACHE opt_cpu.h -CPU_WT_ALLOC opt_cpu.h -CYRIX_CACHE_WORKS opt_cpu.h -CYRIX_CACHE_REALLY_WORKS opt_cpu.h -NO_MEMORY_HOLE opt_cpu.h -CPU_ENABLE_SSE opt_cpu.h -CPU_ATHLON_SSE_HACK opt_cpu.h -CPU_DISABLE_SSE opt_cpu.h -CPU_DISABLE_CMPXCHG opt_global.h - -# Options for the AMD Elan CPU -ELAN_PPS opt_cpu.h -ELAN_XTAL opt_cpu.h +CLK_CALIBRATION_LOOP opt_clock.h +TIMER_FREQ opt_clock.h -# The CPU type affects the endian conversion functions all over the kernel. -I386_CPU opt_global.h -I486_CPU opt_global.h -I586_CPU opt_global.h -I686_CPU opt_global.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_CUT_SPACES2TABS opt_syscons.h @@ -112,10 +43,6 @@ VESA VESA_DEBUG opt_vesa.h -PSM_HOOKRESUME opt_psm.h -PSM_RESETAFTERSUSPEND opt_psm.h -PSM_DEBUG opt_psm.h - ATKBD_DFLT_KEYMAP opt_atkbd.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h @@ -125,65 +52,6 @@ KBD_RESETDELAY opt_kbd.h KBDIO_DEBUG opt_kbd.h -EISA_SLOTS opt_eisa.h - -# pcvt(4) has a bunch of options -FAT_CURSOR opt_pcvt.h -XSERVER opt_pcvt.h -PCVT_24LINESDEF opt_pcvt.h -PCVT_CTRL_ALT_DEL opt_pcvt.h -PCVT_META_ESC opt_pcvt.h -PCVT_NSCREENS opt_pcvt.h -PCVT_PRETTYSCRNS opt_pcvt.h -PCVT_SCANSET opt_pcvt.h -PCVT_SCREENSAVER opt_pcvt.h -PCVT_USEKBDSEC opt_pcvt.h -PCVT_VT220KEYB opt_pcvt.h -PCVT_GREENSAVER opt_pcvt.h - -# Video spigot -SPIGOT_UNSECURE opt_spigot.h - -# ------------------------------- -# isdn4bsd: passive ISA cards -# ------------------------------- -TEL_S0_8 opt_i4b.h -TEL_S0_16 opt_i4b.h -TEL_S0_16_3 opt_i4b.h -AVM_A1 opt_i4b.h -USR_STI opt_i4b.h -ITKIX1 opt_i4b.h -ELSA_PCC16 opt_i4b.h -# ------------------------------- -# isdn4bsd: passive ISA PnP cards -# ------------------------------- -CRTX_S0_P opt_i4b.h -DRN_NGO opt_i4b.h -TEL_S0_16_3_P opt_i4b.h -SEDLBAUER opt_i4b.h -DYNALINK opt_i4b.h -ASUSCOM_IPAC opt_i4b.h -ELSA_QS1ISA opt_i4b.h -SIEMENS_ISURF2 opt_i4b.h -EICON_DIVA opt_i4b.h -COMPAQ_M610 opt_i4b.h -# ------------------------------- -# isdn4bsd: passive PCI cards -# ------------------------------- -ELSA_QS1PCI opt_i4b.h -# ------------------------------- -# isdn4bsd: misc options -# ------------------------------- -# temporary workaround for SMP machines -I4B_SMP_WORKAROUND opt_i4b.h -# enable VJ compression code for ipr i/f -IPR_VJ opt_i4b.h -IPR_LOG opt_i4b.h - -# Device options -DEV_NPX opt_npx.h -DEV_SPLASH opt_splash.h - # ------------------------------- # EOF # ------------------------------- ==== //depot/projects/hammer/sys/ia64/include/param.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/param.h,v 1.13 2003/02/17 09:53:29 marcel Exp $ */ +/* $FreeBSD: src/sys/ia64/include/param.h,v 1.14 2003/04/30 23:16:33 marcel Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -85,7 +85,6 @@ #ifndef MACHINE_ARCH #define MACHINE_ARCH "ia64" #endif -#define MID_MACHINE MID_IA64 #ifdef SMP #define MAXCPU 16 From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:21:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69A9A37B401; Wed, 30 Apr 2003 16:21:38 -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 1AA0737B404 for ; Wed, 30 Apr 2003 16:21:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1E0643FA3 for ; Wed, 30 Apr 2003 16:21:37 -0700 (PDT) (envelope-from marcel@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 h3UNLb0U054940 for ; Wed, 30 Apr 2003 16:21:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNLbic054932 for perforce@freebsd.org; Wed, 30 Apr 2003 16:21:37 -0700 (PDT) Date: Wed, 30 Apr 2003 16:21:37 -0700 (PDT) Message-Id: <200304302321.h3UNLbic054932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30182 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 23:21:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30182 Change 30182 by marcel@marcel_nfs on 2003/04/30 16:21:01 Also include machine/pcb.h now. Move all machine includes right beneath the sys includes. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#3 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -52,6 +52,10 @@ #include #include +#include +#include +#include + #include #include #include @@ -64,8 +68,6 @@ #include #include #include -#include -#include static register_t *ia32_copyout_strings(struct image_params *imgp); static void ia32_setregs(struct thread *td, u_long entry, u_long stack, From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:22:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13A3437B404; Wed, 30 Apr 2003 16:22:41 -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 4A0FF37B401 for ; Wed, 30 Apr 2003 16:22:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4D6B43FBD for ; Wed, 30 Apr 2003 16:22:39 -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 h3UNMd0U055781 for ; Wed, 30 Apr 2003 16:22:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNMdwd055772 for perforce@freebsd.org; Wed, 30 Apr 2003 16:22:39 -0700 (PDT) Date: Wed, 30 Apr 2003 16:22:39 -0700 (PDT) Message-Id: <200304302322.h3UNMdwd055772@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 30183 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 23:22:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30183 Change 30183 by peter@peter_daintree on 2003/04/30 16:22:02 merge changes from ldscript.x86_64 Affected files ... .. //depot/projects/hammer/sys/conf/ldscript.amd64#4 integrate Differences ... ==== //depot/projects/hammer/sys/conf/ldscript.amd64#4 (text+ko) ==== @@ -1,109 +1,146 @@ -/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.7 2003/01/06 07:37:15 phk Exp $ */ -OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") -OUTPUT_ARCH(i386) +/* Default linker script, for normal executables */ +OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") +OUTPUT_ARCH(i386:x86-64) ENTRY(btext) -SEARCH_DIR(/usr/lib); +SEARCH_DIR("/usr/lib"); SECTIONS { /* Read-only sections, merged into text segment: */ . = kernbase + 0x00100000 + SIZEOF_HEADERS; - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.text : - { *(.rel.text) *(.rel.gnu.linkonce.t*) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rel.data : - { *(.rel.data) *(.rel.gnu.linkonce.d*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rel.rodata : - { *(.rel.rodata) *(.rel.gnu.linkonce.r*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - .init : { *(.init) } =0x9090 - .plt : { *(.plt) } - .text : + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rel.init : { *(.rel.init) } + .rela.init : { *(.rela.init) } + .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } + .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } + .rel.fini : { *(.rel.fini) } + .rela.fini : { *(.rela.fini) } + .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } + .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } + .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } + .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } + .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } + .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } + .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } + .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } + .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : + { + KEEP (*(.init)) + } =0x90909090 + .plt : { *(.plt) } + .text : { - *(.text) - *(.stub) + *(.text .stub .text.* .gnu.linkonce.t.*) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0x9090 - _etext = .; + } =0x90909090 + .fini : + { + KEEP (*(.fini)) + } =0x90909090 + PROVIDE (__etext = .); + PROVIDE (_etext = .); PROVIDE (etext = .); - .fini : { *(.fini) } =0x9090 - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } + .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } + .rodata1 : { *(.rodata1) } + .eh_frame_hdr : { *(.eh_frame_hdr) } /* Adjust the address for the data segment. We want to adjust up to the same address within the page on the next page up. */ - . = ALIGN(0x1000) + (. & (0x1000 - 1)) ; - .data : + . = DATA_SEGMENT_ALIGN(0x100000, 0x1000); + /* Ensure the __preinit_array_start label is properly aligned. We + could instead move the label definition inside the section, but + the linker would then create the section even if it turns out to + be empty, which isn't pretty. */ + . = ALIGN(64 / 8); + PROVIDE (__preinit_array_start = .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end = .); + PROVIDE (__init_array_start = .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end = .); + PROVIDE (__fini_array_start = .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end = .); + .data : { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS + *(.data .data.* .gnu.linkonce.d.*) + SORT(CONSTRUCTORS) } - .data1 : { *(.data1) } - _start_ctors = .; - PROVIDE (start_ctors = .); - .ctors : + .data1 : { *(.data1) } + .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } + .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + .eh_frame : { KEEP (*(.eh_frame)) } + .gcc_except_table : { *(.gcc_except_table) } + .dynamic : { *(.dynamic) } + .ctors : { - *(.ctors) + /* gcc uses crtbegin.o to find the start of + the constructors, so we make sure it is + first. Because this is a wildcard, it + doesn't matter if the user does not + actually link against crtbegin.o; the + linker won't look for a file to match a + wildcard. The wildcard also means that it + doesn't matter which directory crtbegin.o + is in. */ + KEEP (*crtbegin.o(.ctors)) + /* We don't want to include the .ctor section from + from the crtend.o file until after the sorted ctors. + The .ctor section from the crtend file contains the + end of ctors marker and it must be last */ + KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) } - _stop_ctors = .; - PROVIDE (stop_ctors = .); - .dtors : + .dtors : { - *(.dtors) + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) } - .got : { *(.got.plt) *(.got) } - .dynamic : { *(.dynamic) } - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; + .jcr : { KEEP (*(.jcr)) } + .got : { *(.got.plt) *(.got) } + _edata = .; PROVIDE (edata = .); __bss_start = .; - .sbss : { *(.sbss) *(.scommon) } - .bss : + .bss : { *(.dynbss) - *(.bss) + *(.bss .bss.* .gnu.linkonce.b.*) *(COMMON) + /* Align here to ensure that the .bss section occupies space up to + _end. Align after .bss to ensure correct alignment even if the + .bss section disappears because there are no input sections. */ + . = ALIGN(64 / 8); } - . = ALIGN(32 / 8); - _end = . ; + . = ALIGN(64 / 8); + _end = .; PROVIDE (end = .); + . = DATA_SEGMENT_END (.); /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } + .comment 0 : { *(.comment) } /* DWARF debug sections. Symbols in the DWARF debugging sections are relative to the beginning of the section so we begin them at 0. */ @@ -117,7 +154,7 @@ .debug_aranges 0 : { *(.debug_aranges) } .debug_pubnames 0 : { *(.debug_pubnames) } /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } + .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev 0 : { *(.debug_abbrev) } .debug_line 0 : { *(.debug_line) } .debug_frame 0 : { *(.debug_frame) } @@ -129,5 +166,4 @@ .debug_funcnames 0 : { *(.debug_funcnames) } .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ } From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:27:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DF5E37B404; Wed, 30 Apr 2003 16:27:47 -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 F05B637B401 for ; Wed, 30 Apr 2003 16:27:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C1D043F3F for ; Wed, 30 Apr 2003 16:27:46 -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 h3UNRk0U059911 for ; Wed, 30 Apr 2003 16:27:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNRkek059906 for perforce@freebsd.org; Wed, 30 Apr 2003 16:27:46 -0700 (PDT) Date: Wed, 30 Apr 2003 16:27:46 -0700 (PDT) Message-Id: <200304302327.h3UNRkek059906@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 30184 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 23:27:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=30184 Change 30184 by peter@peter_daintree on 2003/04/30 16:26:51 Oh that was clever. I accidently deleted the master copies of the files/options/etc stuff. :-( Affected files ... .. //depot/projects/hammer/sys/conf/options.amd64#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/options.amd64#5 (text+ko) ==== @@ -32,6 +32,7 @@ SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h SC_NO_SUSPEND_VTYSWITCH opt_syscons.h +DEV_SPLASH opt_splash.h VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h @@ -40,9 +41,6 @@ VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h -VESA -VESA_DEBUG opt_vesa.h - ATKBD_DFLT_KEYMAP opt_atkbd.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h @@ -55,3 +53,9 @@ # ------------------------------- # EOF # ------------------------------- +HAMMER opt_cpu.h +PPC_PROBE_CHIPSET opt_ppc.h +PPC_DEBUG opt_ppc.h +PSM_HOOKRESUME opt_psm.h +PSM_RESETAFTERSUSPEND opt_psm.h +PSM_DEBUG opt_psm.h From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:29:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 714CD37B404; Wed, 30 Apr 2003 16:29:50 -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 20B6637B401 for ; Wed, 30 Apr 2003 16:29:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC0FA43F3F for ; Wed, 30 Apr 2003 16:29:49 -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 h3UNTn0U060830 for ; Wed, 30 Apr 2003 16:29:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNTnF3060824 for perforce@freebsd.org; Wed, 30 Apr 2003 16:29:49 -0700 (PDT) Date: Wed, 30 Apr 2003 16:29:49 -0700 (PDT) Message-Id: <200304302329.h3UNTnF3060824@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 30185 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 23:29:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=30185 Change 30185 by peter@peter_daintree on 2003/04/30 16:28:51 Sync up with pre-moron-deleted-file-event Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.amd64#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.amd64#5 (text+ko) ==== @@ -17,6 +17,21 @@ # after which config should be rerun for all machines. # +# The FSF cross tools don't understand -fformat-extensions +CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ + -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ + -ffreestanding -Wno-format -Wno-sign-compare +CC= x86_64-unknown-freebsd5.0-gcc -D__amd64__ +LD= x86_64-unknown-freebsd5.0-ld +NM= x86_64-unknown-freebsd5.0-nm +SIZE= x86_64-unknown-freebsd5.0-size +OBJCOPY= x86_64-unknown-freebsd5.0-objcopy +OBJDUMP= x86_64-unknown-freebsd5.0-objdump +MACHINE_ARCH= amd64 +#COPTFLAGS= # none, -O crashes the 3.2 cross compiler I have +NO_CPU_COPTFLAGS= true + + # Which version of config(8) is required. %VERSREQ= 500012 @@ -31,7 +46,7 @@ .endif .include "$S/conf/kern.pre.mk" -MKMODULESENV+= MACHINE=x86_64 +MKMODULESENV+= MACHINE=amd64 %BEFORE_DEPEND From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:31:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCA8F37B404; Wed, 30 Apr 2003 16:31:53 -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 53D5637B401 for ; Wed, 30 Apr 2003 16:31:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDE6C43F85 for ; Wed, 30 Apr 2003 16:31:52 -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 h3UNVq0U062396 for ; Wed, 30 Apr 2003 16:31:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNVqnD062388 for perforce@freebsd.org; Wed, 30 Apr 2003 16:31:52 -0700 (PDT) Date: Wed, 30 Apr 2003 16:31:52 -0700 (PDT) Message-Id: <200304302331.h3UNVqnD062388@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 30186 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 23:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30186 Change 30186 by peter@peter_daintree on 2003/04/30 16:30:58 sync up with pre-fat-fingered files.x86_64 Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#5 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#5 (text+ko) ==== @@ -31,32 +31,84 @@ dev/syscons/sysmouse.c optional sc isa/atkbd_isa.c optional atkbd -libkern/ffs.c standard +amd64/amd64/autoconf.c standard +amd64/amd64/busdma_machdep.c standard +amd64/amd64/critical.c standard +amd64/amd64/dump_machdep.c standard +amd64/amd64/elf_machdep.c standard +amd64/amd64/exception.s standard +amd64/amd64/identcpu.c standard +amd64/amd64/initcpu.c standard +amd64/amd64/legacy.c standard +amd64/amd64/locore.s standard no-obj +amd64/amd64/machdep.c standard +amd64/amd64/mem.c standard +amd64/amd64/nexus.c standard +amd64/amd64/pmap.c standard +amd64/amd64/sigtramp.s standard +amd64/amd64/support.s standard +amd64/amd64/swtch.s standard +amd64/amd64/sys_machdep.c standard +amd64/amd64/trap.c standard +amd64/amd64/tsc.c standard +amd64/amd64/vm_machdep.c standard +amd64/amd64/in_cksum.c optional inet + +amd64/isa/clock.c standard +amd64/isa/intr_machdep.c standard +amd64/isa/isa.c standard +amd64/isa/isa_dma.c standard +amd64/isa/ithread.c standard +amd64/isa/npx.c standard + +amd64/pci/pci_cfgreg.c optional pci +amd64/pci/pci_bus.c optional pci + + + +# This file tells config what files go into building a kernel, +# files marked standard are always included. +# +dev/fb/fb.c optional fb +dev/fb/fb.c optional vga +dev/fb/splash.c optional splash +dev/fb/vga.c optional vga + +dev/kbd/atkbd.c optional atkbd +dev/kbd/atkbdc.c optional atkbdc +dev/kbd/kbd.c optional atkbd +dev/kbd/kbd.c optional kbd +dev/kbd/kbd.c optional sc +dev/kbd/kbd.c optional ukbd +dev/kbd/kbd.c optional vt -x86_64/x86_64/autoconf.c standard -x86_64/x86_64/bios.c standard -x86_64/x86_64/bioscall.s standard -x86_64/x86_64/busdma_machdep.c standard -x86_64/x86_64/critical.c standard -x86_64/x86_64/dump_machdep.c standard -x86_64/x86_64/elf_machdep.c standard -x86_64/x86_64/exception.s standard -x86_64/x86_64/i686_mem.c standard -x86_64/x86_64/identcpu.c standard -x86_64/x86_64/initcpu.c standard -x86_64/x86_64/k6_mem.c standard -x86_64/x86_64/locore.s standard no-obj -x86_64/x86_64/machdep.c standard -x86_64/x86_64/mem.c standard -x86_64/x86_64/nexus.c standard -x86_64/x86_64/pmap.c standard -x86_64/x86_64/support.s standard -x86_64/x86_64/swtch.s standard -x86_64/x86_64/sys_machdep.c standard -x86_64/x86_64/trap.c standard -x86_64/x86_64/vm86.c standard -x86_64/x86_64/vm_machdep.c standard +dev/syscons/schistory.c optional sc +dev/syscons/scmouse.c optional sc +dev/syscons/scterm.c optional sc +dev/syscons/scterm-dumb.c optional sc +dev/syscons/scterm-sc.c optional sc +dev/syscons/scvgarndr.c optional sc vga +dev/syscons/scvidctl.c optional sc +dev/syscons/scvtb.c optional sc +dev/syscons/syscons.c optional sc +dev/syscons/sysmouse.c optional sc +geom/geom_bsd.c standard +geom/geom_bsd_enc.c standard +geom/geom_mbr.c standard +geom/geom_mbr_enc.c standard -x86_64/isa/clock.c standard -x86_64/isa/intr_machdep.c standard -x86_64/isa/ithread.c standard +#i386/isa/pmtimer.c optional pmtimer +# +isa/atkbd_isa.c optional atkbd +isa/atkbdc_isa.c optional atkbdc +isa/fd.c optional fdc +isa/ppc.c optional ppc +isa/psm.c optional psm +isa/syscons_isa.c optional sc +isa/vga_isa.c optional vga +pci/agp_intel.c optional agp +pci/agp_via.c optional agp +pci/agp_sis.c optional agp +pci/agp_ali.c optional agp +pci/agp_amd.c optional agp +pci/agp_i810.c optional agp From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:38:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D19A537B404; Wed, 30 Apr 2003 16:38:01 -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 8385E37B401 for ; Wed, 30 Apr 2003 16:38:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06DF643FAF for ; Wed, 30 Apr 2003 16:38:01 -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 h3UNc00U067502 for ; Wed, 30 Apr 2003 16:38:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNc0V3067493 for perforce@freebsd.org; Wed, 30 Apr 2003 16:38:00 -0700 (PDT) Date: Wed, 30 Apr 2003 16:38:00 -0700 (PDT) Message-Id: <200304302338.h3UNc0V3067493@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 30187 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 23:38:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=30187 Change 30187 by peter@peter_daintree on 2003/04/30 16:37:39 Renamed to amd64/... Affected files ... .. //depot/projects/hammer/sys/x86_64/Makefile#2 delete .. //depot/projects/hammer/sys/x86_64/acpica/OsdEnvironment.c#5 delete .. //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#8 delete .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#7 delete .. //depot/projects/hammer/sys/x86_64/compile/.cvsignore#2 delete .. //depot/projects/hammer/sys/x86_64/conf/GENERIC#15 delete .. //depot/projects/hammer/sys/x86_64/conf/GENERIC.hints#6 delete .. //depot/projects/hammer/sys/x86_64/conf/Makefile#3 delete .. //depot/projects/hammer/sys/x86_64/conf/gethints.awk#2 delete .. //depot/projects/hammer/sys/x86_64/include/_inttypes.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/_limits.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/_stdint.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/_types.h#5 delete .. //depot/projects/hammer/sys/x86_64/include/asm.h#7 delete .. //depot/projects/hammer/sys/x86_64/include/asmacros.h#6 delete .. //depot/projects/hammer/sys/x86_64/include/atomic.h#9 delete .. //depot/projects/hammer/sys/x86_64/include/bus.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/bus_at386.h#7 delete .. //depot/projects/hammer/sys/x86_64/include/bus_dma.h#5 delete .. //depot/projects/hammer/sys/x86_64/include/bus_memio.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/bus_pio.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/clock.h#6 delete .. //depot/projects/hammer/sys/x86_64/include/cpu.h#7 delete .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#11 delete .. //depot/projects/hammer/sys/x86_64/include/cputypes.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/critical.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/db_machdep.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/elf.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/endian.h#7 delete .. //depot/projects/hammer/sys/x86_64/include/exec.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/float.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/floatingpoint.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/frame.h#12 delete .. //depot/projects/hammer/sys/x86_64/include/in_cksum.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/kse.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/legacyvar.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/limits.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/md_var.h#18 delete .. //depot/projects/hammer/sys/x86_64/include/mutex.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/npx.h#6 delete .. //depot/projects/hammer/sys/x86_64/include/param.h#13 delete .. //depot/projects/hammer/sys/x86_64/include/pc/display.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/pcb.h#14 delete .. //depot/projects/hammer/sys/x86_64/include/pcb_ext.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/pci_cfgreg.h#5 delete .. //depot/projects/hammer/sys/x86_64/include/pcpu.h#11 delete .. //depot/projects/hammer/sys/x86_64/include/pmap.h#20 delete .. //depot/projects/hammer/sys/x86_64/include/proc.h#8 delete .. //depot/projects/hammer/sys/x86_64/include/profile.h#4 delete .. //depot/projects/hammer/sys/x86_64/include/psl.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/ptrace.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/reg.h#7 delete .. //depot/projects/hammer/sys/x86_64/include/reloc.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/resource.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/runq.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/segments.h#19 delete .. //depot/projects/hammer/sys/x86_64/include/setjmp.h#5 delete .. //depot/projects/hammer/sys/x86_64/include/sigframe.h#6 delete .. //depot/projects/hammer/sys/x86_64/include/signal.h#12 delete .. //depot/projects/hammer/sys/x86_64/include/smp.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/specialreg.h#7 delete .. //depot/projects/hammer/sys/x86_64/include/stdarg.h#5 delete .. //depot/projects/hammer/sys/x86_64/include/sysarch.h#6 delete .. //depot/projects/hammer/sys/x86_64/include/trap.h#2 delete .. //depot/projects/hammer/sys/x86_64/include/tss.h#10 delete .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#11 delete .. //depot/projects/hammer/sys/x86_64/include/varargs.h#3 delete .. //depot/projects/hammer/sys/x86_64/include/vmparam.h#7 delete .. //depot/projects/hammer/sys/x86_64/isa/clock.c#13 delete .. //depot/projects/hammer/sys/x86_64/isa/icu.h#5 delete .. //depot/projects/hammer/sys/x86_64/isa/icu_ipl.s#4 delete .. //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#11 delete .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#15 delete .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#5 delete .. //depot/projects/hammer/sys/x86_64/isa/isa.c#3 delete .. //depot/projects/hammer/sys/x86_64/isa/isa.h#5 delete .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#6 delete .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.h#2 delete .. //depot/projects/hammer/sys/x86_64/isa/ithread.c#6 delete .. //depot/projects/hammer/sys/x86_64/isa/npx.c#21 delete .. //depot/projects/hammer/sys/x86_64/isa/timerreg.h#3 delete .. //depot/projects/hammer/sys/x86_64/isa/vector.s#10 delete .. //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#9 delete .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#11 delete .. //depot/projects/hammer/sys/x86_64/x86_64/atomic.c#2 delete .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#11 delete .. //depot/projects/hammer/sys/x86_64/x86_64/busdma_machdep.c#7 delete .. //depot/projects/hammer/sys/x86_64/x86_64/critical.c#7 delete .. //depot/projects/hammer/sys/x86_64/x86_64/dump_machdep.c#2 delete .. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#7 delete .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#34 delete .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#26 delete .. //depot/projects/hammer/sys/x86_64/x86_64/identcpu.c#11 delete .. //depot/projects/hammer/sys/x86_64/x86_64/in_cksum.c#4 delete .. //depot/projects/hammer/sys/x86_64/x86_64/initcpu.c#4 delete .. //depot/projects/hammer/sys/x86_64/x86_64/legacy.c#4 delete .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#36 delete .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#88 delete .. //depot/projects/hammer/sys/x86_64/x86_64/mem.c#8 delete .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#10 delete .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#26 delete .. //depot/projects/hammer/sys/x86_64/x86_64/sigtramp.s#5 delete .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#21 delete .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#21 delete .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#13 delete .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#33 delete .. //depot/projects/hammer/sys/x86_64/x86_64/tsc.c#4 delete .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#24 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:39:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1598337B404; Wed, 30 Apr 2003 16:39:06 -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 B47B437B401 for ; Wed, 30 Apr 2003 16:39:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4504E43F75 for ; Wed, 30 Apr 2003 16:39:04 -0700 (PDT) (envelope-from marcel@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 h3UNd30U067984 for ; Wed, 30 Apr 2003 16:39:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNd2Qx067968 for perforce@freebsd.org; Wed, 30 Apr 2003 16:39:02 -0700 (PDT) Date: Wed, 30 Apr 2003 16:39:02 -0700 (PDT) Message-Id: <200304302339.h3UNd2Qx067968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30188 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 23:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=30188 Change 30188 by marcel@marcel_pluto1 on 2003/04/30 16:38:45 IFC @30180 Affected files ... .. //depot/projects/ia64/Makefile.inc1#57 integrate .. //depot/projects/ia64/bin/cat/cat.c#8 integrate .. //depot/projects/ia64/bin/ps/ps.1#14 integrate .. //depot/projects/ia64/bin/sh/sh.1#21 integrate .. //depot/projects/ia64/etc/Makefile#27 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#30 integrate .. //depot/projects/ia64/etc/etc.amd64/rc.amd64#1 branch .. //depot/projects/ia64/etc/etc.amd64/ttys#1 branch .. //depot/projects/ia64/etc/pam.d/ftpd#7 integrate .. //depot/projects/ia64/etc/pam.d/gdm#6 integrate .. //depot/projects/ia64/etc/pam.d/kde#5 integrate .. //depot/projects/ia64/etc/pam.d/login#9 integrate .. //depot/projects/ia64/etc/pam.d/other#9 integrate .. //depot/projects/ia64/etc/pam.d/sshd#13 integrate .. //depot/projects/ia64/etc/pam.d/su#9 integrate .. //depot/projects/ia64/etc/pam.d/telnetd#6 integrate .. //depot/projects/ia64/etc/pam.d/xdm#7 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#9 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#7 integrate .. //depot/projects/ia64/etc/rc.d/kpasswdd#1 branch .. //depot/projects/ia64/etc/rc.d/ldconfig#5 integrate .. //depot/projects/ia64/etc/rc.subr#10 integrate .. //depot/projects/ia64/etc/root/dot.k5login#1 branch .. //depot/projects/ia64/etc/root/dot.klogin#2 delete .. //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#4 integrate .. //depot/projects/ia64/lib/Makefile#22 integrate .. //depot/projects/ia64/lib/csu/amd64/Makefile#1 branch .. //depot/projects/ia64/lib/csu/amd64/crt1.c#1 branch .. //depot/projects/ia64/lib/csu/amd64/crti.S#1 branch .. //depot/projects/ia64/lib/csu/amd64/crtn.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/arith.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/frexp.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/isinf.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/ia64/lib/libc/gmon/gmon.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#9 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr_float.c#4 integrate .. //depot/projects/ia64/lib/libdisk/chunk.c#11 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#14 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#18 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#14 integrate .. //depot/projects/ia64/lib/libdisk/rules.c#10 integrate .. //depot/projects/ia64/lib/libdisk/write_amd64_disk.c#1 branch .. //depot/projects/ia64/lib/libkvm/kvm_amd64.c#1 branch .. //depot/projects/ia64/lib/libncurses/Makefile#14 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_chroot/pam_chroot.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#13 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_login_access/pam_login_access.c#4 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#8 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#14 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#10 integrate .. //depot/projects/ia64/lib/msun/src/math_private.h#6 integrate .. //depot/projects/ia64/libexec/Makefile#11 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/elf_rtld.x#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/lockdflt.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/reloc.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/rtld_machdep.h#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/rtld_start.S#1 branch .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/ia64/release/Makefile#48 integrate .. //depot/projects/ia64/release/picobsd/tinyware/passwd/Makefile#3 integrate .. //depot/projects/ia64/release/scripts/crypto-install.sh#2 integrate .. //depot/projects/ia64/secure/lib/Makefile#5 integrate .. //depot/projects/ia64/secure/lib/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/opensslconf-amd64.h#1 branch .. //depot/projects/ia64/secure/libexec/Makefile#4 integrate .. //depot/projects/ia64/secure/libexec/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#5 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#8 integrate .. //depot/projects/ia64/secure/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#13 integrate .. //depot/projects/ia64/share/doc/smm/01.setup/3.t#3 integrate .. //depot/projects/ia64/share/doc/smm/06.nfs/1.t#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#32 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#34 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#26 integrate .. //depot/projects/ia64/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/ia64/sys/amd64/include/_limits.h#1 branch .. //depot/projects/ia64/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/amd64/include/_types.h#1 branch .. //depot/projects/ia64/sys/amd64/include/endian.h#1 branch .. //depot/projects/ia64/sys/amd64/include/limits.h#1 branch .. //depot/projects/ia64/sys/amd64/include/param.h#1 branch .. //depot/projects/ia64/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/ia64/sys/boot/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#5 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/metadata.c#3 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#8 integrate .. //depot/projects/ia64/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#12 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#41 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#1 branch .. //depot/projects/ia64/sys/conf/Makefile.x86_64#5 delete .. //depot/projects/ia64/sys/conf/files.amd64#1 branch .. //depot/projects/ia64/sys/conf/files.x86_64#9 delete .. //depot/projects/ia64/sys/conf/kern.mk#4 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#28 integrate .. //depot/projects/ia64/sys/conf/ldscript.amd64#1 branch .. //depot/projects/ia64/sys/conf/options.amd64#1 branch .. //depot/projects/ia64/sys/conf/options.x86_64#6 delete .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#26 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#28 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#30 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#9 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#6 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#17 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#14 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#41 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/autoconf.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#30 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#49 integrate .. //depot/projects/ia64/sys/ia64/include/param.h#7 integrate .. //depot/projects/ia64/sys/isa/atkbd_isa.c#2 integrate .. //depot/projects/ia64/sys/isa/atkbdc_isa.c#2 integrate .. //depot/projects/ia64/sys/isa/isa_common.c#7 integrate .. //depot/projects/ia64/sys/isa/ppc.c#5 integrate .. //depot/projects/ia64/sys/isa/psm.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#52 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#43 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#21 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#23 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#23 integrate .. //depot/projects/ia64/sys/net/if.c#23 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#25 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#25 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#37 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#25 integrate .. //depot/projects/ia64/sys/sys/cdio.h#3 integrate .. //depot/projects/ia64/sys/sys/proc.h#61 integrate .. //depot/projects/ia64/sys/sys/signalvar.h#11 integrate .. //depot/projects/ia64/sys/sys/user.h#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#28 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#53 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#36 integrate .. //depot/projects/ia64/usr.bin/Makefile#43 integrate .. //depot/projects/ia64/usr.bin/ee/ee.1#3 integrate .. //depot/projects/ia64/usr.bin/mt/mt.1#7 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#8 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#57 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.349 2003/04/16 21:05:06 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -203,13 +203,13 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS + -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ + -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ - BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -640,6 +640,12 @@ _strfile= games/fortune/strfile .endif +.if ${BOOTSTRAPPING} < 500042 +_groff= gnu/usr.bin/groff +.else +_groff= gnu/usr.bin/groff/tmac +.endif + .if ( ${BOOTSTRAPPING} < 450005 || \ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 )) _uudecode= usr.bin/uudecode @@ -664,7 +670,7 @@ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ usr.sbin/config ${_kbdcontrol} \ - gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo + gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/ia64/bin/cat/cat.c#8 (text+ko) ==== @@ -34,11 +34,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#endif #ifndef lint #if 0 @@ -46,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $"); #include #include ==== //depot/projects/ia64/bin/ps/ps.1#14 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -301,9 +301,7 @@ .Pf ( Dv MADV_RANDOM , from .Xr madvise 2 , -for example, -.Xr lisp 1 -in a garbage collect). +for example, lisp in a garbage collect). .It E The process is trying to exit. .It L ==== //depot/projects/ia64/bin/sh/sh.1#21 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.85 2003/04/12 03:20:28 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.86 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -59,8 +59,7 @@ specification for the shell. This version has many features which make it appear similar in some respects to the Korn shell, but it is not a Korn -shell clone like -.Xr pdksh 1 . +shell clone like pdksh. Only features designated by POSIX, plus a few Berkeley extensions, are being incorporated into this shell. ==== //depot/projects/ia64/etc/Makefile#27 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.309 2003/04/18 17:51:53 mtm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.310 2003/04/30 20:58:48 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -99,7 +99,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dot.klogin ${DESTDIR}/root/.klogin; \ + dot.k5login ${DESTDIR}/root/.k5login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ==== //depot/projects/ia64/etc/defaults/rc.conf#30 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.175 2003/04/30 20:58:49 markm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -153,8 +153,9 @@ kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC kadmind5_server_enable="NO" # Run kadmind (or NO) -kadmind5_server="/usr/libexec/k5admind" # path to kerberos 5 admin daemon -kerberos_stash="NO" # Is the kerberos master key stashed? +kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon +kpasswdd_server_enable="NO" # Run kpasswdd (or NO) +kpasswdd_server="/usr/libexec/kpasswdd" # path to kerberos 5 passwd daemon rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod ==== //depot/projects/ia64/etc/pam.d/ftpd#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.17 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "ftpd" service # @@ -17,5 +17,4 @@ account required pam_unix.so # session -#session required pam_krb5.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/gdm#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "gdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/kde#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "kde" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/login#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "login" service # @@ -20,7 +20,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/ia64/etc/pam.d/other#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.9 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "other" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/sshd#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "sshd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/su#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.13 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "su" service # @@ -19,5 +19,4 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so ==== //depot/projects/ia64/etc/pam.d/telnetd#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "telnetd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/ia64/etc/pam.d/xdm#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.7 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.8 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "xdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/ia64/etc/rc.d/ipfilter#9 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.8 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipfilter @@ -42,7 +42,7 @@ # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -79,12 +79,12 @@ echo "Enabling ipfilter." case ${OSTYPE} in FreeBSD) - ${ipfilter_program:-/sbin/ipf} -Fa + ${ipfilter_program:-/sbin/ipf} -EFa if [ -r "${ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} \ -f "${ipfilter_rules}" ${ipfilter_flags} fi - ${ipfilter_program:-/sbin/ipf} -6 -Fa + ${ipfilter_program:-/sbin/ipf} -6 -EFa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} ==== //depot/projects/ia64/etc/rc.d/ipnat#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.7 2003/04/24 18:14:52 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.8 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipnat @@ -44,7 +44,7 @@ # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -55,10 +55,10 @@ ipnat_start() { if [ ! -f ${ipnat_rules} ]; then - echo -n ' NO IPNAT RULES' + warn 'NO IPNAT RULES' return 0 fi - echo -n "Installing NAT rules ... " + echo -n "Installing NAT rules." ${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags} } ==== //depot/projects/ia64/etc/rc.d/ldconfig#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.4 2002/09/17 01:48:48 peter Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $ # # PROVIDE: ldconfig -# REQUIRE: mountall +# REQUIRE: mountall mountcritremote # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64/etc/rc.subr#10 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.10 2003/01/20 19:30:15 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.11 2003/04/30 03:03:47 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -275,7 +275,7 @@ esac done' - debug "in _find_processes: proccheck is ($_proccheck)." +# debug "in _find_processes: proccheck is ($_proccheck)." eval $_proccheck } ==== //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#4 (text+ko) ==== @@ -1,11 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.11 2003/04/30 20:48:03 ru Exp $ -DEVICEDIR?= ${fontdir}/dev${DEV} - -all: ${DEVFILES} - -beforeinstall: ${DEVFILES} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${.ALLSRC} ${DESTDIR}${DEVICEDIR} +FILES= ${DEVFILES} +FILESDIR?= ${fontdir}/dev${DEV} .include ==== //depot/projects/ia64/lib/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $ +# $FreeBSD: src/lib/Makefile,v 1.154 2003/04/30 18:42:25 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ + ${_libstand} ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -40,9 +40,12 @@ _csu=csu .endif +.if ${MACHINE_ARCH} != "amd64" +_libstand= libstand .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -71,7 +74,7 @@ .endif .if ${MACHINE_ARCH} != "powerpc" -_libdisk=libdisk +_libdisk= libdisk .endif .if defined(RELEASEDIR) || \ ==== //depot/projects/ia64/lib/libc/gmon/gmon.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.16 2002/09/17 01:48:50 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.17 2003/04/30 19:29:02 peter Exp $"); #include "namespace.h" #include @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) extern char *minbrk asm (".minbrk"); #else extern char *minbrk asm ("minbrk"); ==== //depot/projects/ia64/lib/libc/stdlib/malloc.c#16 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.74 2003/01/30 15:00:17 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.75 2003/04/30 19:30:34 peter Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related @@ -62,6 +62,10 @@ # define malloc_pageshift 13U # define malloc_minsize 16U # endif +# if defined(__amd64__) +# define malloc_pageshift 12U +# define malloc_minsize 16U +# endif # if !defined(__NETBSD_SYSCALLS) # define HAS_UTRACE # endif ==== //depot/projects/ia64/lib/libc/stdtime/strptime.c#9 (text+ko) ==== @@ -59,7 +59,7 @@ static char sccsid[] __unused = "@(#)strptime.c 0.1 (Powerdog) 94/03/27"; #endif /* !defined NOID */ #endif /* not lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.33 2003/04/05 05:46:43 mtm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.34 2003/04/30 10:25:57 mtm Exp $"); #include "namespace.h" #include @@ -518,14 +518,12 @@ struct tm * __restrict tm) { char *ret; - time_t t; int gmt; gmt = 0; - memset((void*)tm, 0, sizeof(struct tm)); ret = _strptime(buf, fmt, tm, &gmt); - if (ret) { - t = gmt ? timegm(tm) : mktime(tm); + if (ret && gmt) { + time_t t = timegm(tm); localtime_r(&t, tm); } ==== //depot/projects/ia64/lib/libc/xdr/xdr_float.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.11 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.12 2003/04/30 19:32:25 peter Exp $"); /* * xdr_float.c, Generic XDR routines implementation. @@ -64,7 +64,7 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) + defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) #include #define IEEEFP #endif ==== //depot/projects/ia64/lib/libdisk/chunk.c#11 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.47 2003/01/10 19:25:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.48 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -239,6 +239,7 @@ /* PLATFORM POLICY BEGIN ------------------------------------- */ switch(platform) { case p_i386: + case p_amd64: switch (type) { case fat: case mbr: @@ -317,7 +318,8 @@ if (platform == p_sparc64) { offset = Prev_Cyl_Aligned(d, offset); size = Next_Cyl_Aligned(d, size); - } else if (platform == p_i386 || platform == p_pc98) { + } else if (platform == p_i386 || platform == p_pc98 || + platform == p_amd64) { if (type != freebsd) break; if (!(flags & CHUNK_ALIGN)) ==== //depot/projects/ia64/lib/libdisk/create_chunk.c#14 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.80 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.81 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -138,7 +138,7 @@ Fixup_Names(struct disk *d) { struct chunk *c1, *c2; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) struct chunk *c3; int j; #endif @@ -149,7 +149,7 @@ continue; if (strcmp(c2->name, "X")) continue; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) c2->oname = malloc(12); if (!c2->oname) return -1; ==== //depot/projects/ia64/lib/libdisk/disk.c#18 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.114 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.116 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -41,6 +41,28 @@ #define DPRINTX(x) #endif +const enum platform platform = +#if defined (P_DEBUG) + P_DEBUG +#elif defined (PC98) + p_pc98 +#elif defined(__i386__) + p_i386 +#elif defined(__alpha__) + p_alpha +#elif defined(__sparc64__) + p_sparc64 +#elif defined(__ia64__) + p_ia64 +#elif defined(__ppc__) + p_ppc +#elif defined(__amd64__) + p_amd64 +#else + IHAVENOIDEA +#endif + ; + const char * chunk_name(chunk_e type) { @@ -371,7 +393,7 @@ #if defined(PC98) printf(" boot1=%p, boot2=%p, bootipl=%p, bootmenu=%p\n", d->boot1, d->boot2, d->bootipl, d->bootmenu); -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) printf(" boot1=%p, boot2=%p, bootmgr=%p\n", d->boot1, d->boot2, d->bootmgr); #elif defined(__alpha__) @@ -407,7 +429,7 @@ if (d->boot1) free(d->boot1); #endif -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot2) free(d->boot2); #endif @@ -536,7 +558,7 @@ int Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) { -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot1) free(d->boot1); d->boot1 = malloc(512); ==== //depot/projects/ia64/lib/libdisk/libdisk.h#14 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.55 2003/02/04 17:35:23 jhb Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.57 2003/04/30 21:03:16 peter Exp $ * */ @@ -20,33 +20,17 @@ #define MAX_SEC_SIZE 2048 /* maximum sector size that is supported */ #define MIN_SEC_SIZE 512 /* the sector size to end sensing at */ -static const enum platform { +enum platform { p_any, /* for debugging ! */ p_alpha, p_i386, p_pc98, p_sparc64, p_ia64, - p_ppc -} platform = -#if defined (P_DEBUG) - P_DEBUG -#elif defined (PC98) - p_pc98 -#elif defined(__i386__) - p_i386 -#elif defined(__alpha__) - p_alpha -#elif defined(__sparc64__) - p_sparc64 -#elif defined(__ia64__) - p_ia64 -#elif defined(__ppc__) - p_ppc -#else - IHAVENOIDEA -#endif - ; + p_ppc, + p_amd64 +}; +extern const enum platform platform; typedef enum { whole, @@ -86,7 +70,7 @@ #if !defined(__ia64__) u_char *boot1; #endif -#if defined(__i386__) /* the i386 needs extra help... */ +#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */ u_char *boot2; #endif struct chunk *chunks; ==== //depot/projects/ia64/lib/libdisk/rules.c#10 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.30 2003/04/23 12:15:31 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.31 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -242,6 +242,7 @@ switch (platform) { case p_i386: + case p_amd64: Rule_000(d, c, msg); Rule_001(d, c, msg); Rule_002(d, c, msg); ==== //depot/projects/ia64/lib/libncurses/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncurses/Makefile,v 1.68 2003/04/18 13:01:07 ru Exp $ +# $FreeBSD: src/lib/libncurses/Makefile,v 1.69 2003/04/30 15:49:40 obrien Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -410,7 +410,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + ln -sf ${.ALLSRC} ${.TARGET} .endfor MLINKS+=ncurses.3 curses.3 ==== //depot/projects/ia64/lib/libpam/modules/pam_chroot/pam_chroot.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 16:49:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A407A37B404; Wed, 30 Apr 2003 16:49:21 -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 3AB6A37B401 for ; Wed, 30 Apr 2003 16:49:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3E8243FDD for ; Wed, 30 Apr 2003 16:49:19 -0700 (PDT) (envelope-from marcel@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 h3UNnJ0U082435 for ; Wed, 30 Apr 2003 16:49:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3UNnJY4082426 for perforce@freebsd.org; Wed, 30 Apr 2003 16:49:19 -0700 (PDT) Date: Wed, 30 Apr 2003 16:49:19 -0700 (PDT) Message-Id: <200304302349.h3UNnJY4082426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30191 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 23:49:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=30191 Change 30191 by marcel@marcel_pluto1 on 2003/04/30 16:49:07 IFia64 Note: this changes the list of architectures that use the new cpu_switch and cpu_throw prototypes to a list of architectures that don't use the new prototypes (ie alpha and powerpc). Affected files ... .. //depot/projects/ia64_epc/Makefile.inc1#11 integrate .. //depot/projects/ia64_epc/bin/cat/cat.c#2 integrate .. //depot/projects/ia64_epc/bin/ps/ps.1#2 integrate .. //depot/projects/ia64_epc/bin/sh/sh.1#3 integrate .. //depot/projects/ia64_epc/etc/Makefile#6 integrate .. //depot/projects/ia64_epc/etc/defaults/rc.conf#6 integrate .. //depot/projects/ia64_epc/etc/etc.amd64/rc.amd64#1 branch .. //depot/projects/ia64_epc/etc/etc.amd64/ttys#1 branch .. //depot/projects/ia64_epc/etc/pam.d/ftpd#4 integrate .. //depot/projects/ia64_epc/etc/pam.d/gdm#3 integrate .. //depot/projects/ia64_epc/etc/pam.d/kde#3 integrate .. //depot/projects/ia64_epc/etc/pam.d/login#4 integrate .. //depot/projects/ia64_epc/etc/pam.d/other#4 integrate .. //depot/projects/ia64_epc/etc/pam.d/sshd#4 integrate .. //depot/projects/ia64_epc/etc/pam.d/su#4 integrate .. //depot/projects/ia64_epc/etc/pam.d/telnetd#4 integrate .. //depot/projects/ia64_epc/etc/pam.d/xdm#4 integrate .. //depot/projects/ia64_epc/etc/rc.d/ipfilter#5 integrate .. //depot/projects/ia64_epc/etc/rc.d/ipnat#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/kpasswdd#1 branch .. //depot/projects/ia64_epc/etc/rc.d/ldconfig#2 integrate .. //depot/projects/ia64_epc/etc/rc.subr#2 integrate .. //depot/projects/ia64_epc/etc/root/dot.k5login#1 branch .. //depot/projects/ia64_epc/etc/root/dot.klogin#2 delete .. //depot/projects/ia64_epc/gnu/usr.bin/groff/font/Makefile.dev#2 integrate .. //depot/projects/ia64_epc/lib/Makefile#5 integrate .. //depot/projects/ia64_epc/lib/csu/amd64/Makefile#1 branch .. //depot/projects/ia64_epc/lib/csu/amd64/crt1.c#1 branch .. //depot/projects/ia64_epc/lib/csu/amd64/crti.S#1 branch .. //depot/projects/ia64_epc/lib/csu/amd64/crtn.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/arith.h#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/frexp.c#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/isinf.c#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/ia64_epc/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/ia64_epc/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/ia64_epc/lib/libc/stdtime/strptime.c#6 integrate .. //depot/projects/ia64_epc/lib/libc/xdr/xdr_float.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/chunk.c#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/create_chunk.c#3 integrate .. //depot/projects/ia64_epc/lib/libdisk/disk.c#4 integrate .. //depot/projects/ia64_epc/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/ia64_epc/lib/libdisk/rules.c#4 integrate .. //depot/projects/ia64_epc/lib/libdisk/write_amd64_disk.c#1 branch .. //depot/projects/ia64_epc/lib/libkvm/kvm_amd64.c#1 branch .. //depot/projects/ia64_epc/lib/libncurses/Makefile#5 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_chroot/pam_chroot.c#3 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_login_access/pam_login_access.c#2 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#4 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/pam_unix/pam_unix.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_create.c#6 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_init.c#6 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_private.h#8 integrate .. //depot/projects/ia64_epc/lib/msun/src/math_private.h#2 integrate .. //depot/projects/ia64_epc/libexec/Makefile#3 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/amd64/Makefile.inc#1 branch .. //depot/projects/ia64_epc/libexec/rtld-elf/amd64/elf_rtld.x#1 branch .. //depot/projects/ia64_epc/libexec/rtld-elf/amd64/lockdflt.c#1 branch .. //depot/projects/ia64_epc/libexec/rtld-elf/amd64/reloc.c#1 branch .. //depot/projects/ia64_epc/libexec/rtld-elf/amd64/rtld_machdep.h#1 branch .. //depot/projects/ia64_epc/libexec/rtld-elf/amd64/rtld_start.S#1 branch .. //depot/projects/ia64_epc/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/ia64_epc/release/Makefile#10 integrate .. //depot/projects/ia64_epc/release/picobsd/tinyware/passwd/Makefile#2 integrate .. //depot/projects/ia64_epc/release/scripts/crypto-install.sh#2 integrate .. //depot/projects/ia64_epc/secure/lib/Makefile#4 integrate .. //depot/projects/ia64_epc/secure/lib/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/secure/lib/libcrypto/opensslconf-amd64.h#1 branch .. //depot/projects/ia64_epc/secure/libexec/Makefile#3 integrate .. //depot/projects/ia64_epc/secure/libexec/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/secure/usr.bin/Makefile#3 integrate .. //depot/projects/ia64_epc/secure/usr.bin/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/secure/usr.bin/ssh/Makefile#3 integrate .. //depot/projects/ia64_epc/secure/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/ia64_epc/share/doc/smm/01.setup/3.t#2 integrate .. //depot/projects/ia64_epc/share/doc/smm/06.nfs/1.t#2 integrate .. //depot/projects/ia64_epc/share/man/man5/make.conf.5#3 integrate .. //depot/projects/ia64_epc/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/ia64_epc/sys/alpha/alpha/trap.c#7 integrate .. //depot/projects/ia64_epc/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/_limits.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/_types.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/endian.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/limits.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/param.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/ia64_epc/sys/boot/Makefile#3 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/sparc64/loader/metadata.c#2 integrate .. //depot/projects/ia64_epc/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/ia64_epc/sys/conf/Makefile.amd64#1 branch .. //depot/projects/ia64_epc/sys/conf/Makefile.x86_64#4 delete .. //depot/projects/ia64_epc/sys/conf/files.amd64#1 branch .. //depot/projects/ia64_epc/sys/conf/files.ia64#11 integrate .. //depot/projects/ia64_epc/sys/conf/files.x86_64#3 delete .. //depot/projects/ia64_epc/sys/conf/kern.mk#3 integrate .. //depot/projects/ia64_epc/sys/conf/kern.post.mk#4 integrate .. //depot/projects/ia64_epc/sys/conf/ldscript.amd64#1 branch .. //depot/projects/ia64_epc/sys/conf/options.amd64#1 branch .. //depot/projects/ia64_epc/sys/conf/options.x86_64#3 delete .. //depot/projects/ia64_epc/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#12 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/ia64_epc/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/ia64_epc/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/puc/puc.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/sio/sio.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_kern.c#6 integrate .. //depot/projects/ia64_epc/sys/i386/i386/autoconf.c#2 integrate .. //depot/projects/ia64_epc/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/ia64_epc/sys/i386/i386/trap.c#8 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#17 integrate .. //depot/projects/ia64_epc/sys/ia64/include/param.h#3 integrate .. //depot/projects/ia64_epc/sys/isa/atkbd_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/isa/atkbdc_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/isa/isa_common.c#3 integrate .. //depot/projects/ia64_epc/sys/isa/ppc.c#3 integrate .. //depot/projects/ia64_epc/sys/isa/psm.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_fork.c#8 integrate .. //depot/projects/ia64_epc/sys/kern/kern_mib.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/kern_sig.c#12 integrate .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#10 integrate .. //depot/projects/ia64_epc/sys/kern/kern_thr.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_thread.c#16 integrate .. //depot/projects/ia64_epc/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/subr_bus.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/subr_mbuf.c#7 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/ia64_epc/sys/net/if.c#6 integrate .. //depot/projects/ia64_epc/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#9 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/ia64_epc/sys/sys/cdio.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/proc.h#13 integrate .. //depot/projects/ia64_epc/sys/sys/signalvar.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/user.h#2 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/ia64_epc/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/ia64_epc/sys/vm/vm_map.c#11 integrate .. //depot/projects/ia64_epc/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/ia64_epc/usr.bin/Makefile#5 integrate .. //depot/projects/ia64_epc/usr.bin/ee/ee.1#2 integrate .. //depot/projects/ia64_epc/usr.bin/mt/mt.1#2 integrate .. //depot/projects/ia64_epc/usr.sbin/fwcontrol/Makefile#3 integrate .. //depot/projects/ia64_epc/usr.sbin/fwcontrol/fwcontrol.c#4 integrate Differences ... ==== //depot/projects/ia64_epc/Makefile.inc1#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.349 2003/04/16 21:05:06 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -203,13 +203,13 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS + -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ + -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ - BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -640,6 +640,12 @@ _strfile= games/fortune/strfile .endif +.if ${BOOTSTRAPPING} < 500042 +_groff= gnu/usr.bin/groff +.else +_groff= gnu/usr.bin/groff/tmac +.endif + .if ( ${BOOTSTRAPPING} < 450005 || \ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 )) _uudecode= usr.bin/uudecode @@ -664,7 +670,7 @@ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ usr.sbin/config ${_kbdcontrol} \ - gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo + gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/ia64_epc/bin/cat/cat.c#2 (text+ko) ==== @@ -34,11 +34,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#endif #ifndef lint #if 0 @@ -46,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/bin/ps/ps.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -301,9 +301,7 @@ .Pf ( Dv MADV_RANDOM , from .Xr madvise 2 , -for example, -.Xr lisp 1 -in a garbage collect). +for example, lisp in a garbage collect). .It E The process is trying to exit. .It L ==== //depot/projects/ia64_epc/bin/sh/sh.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.85 2003/04/12 03:20:28 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.86 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -59,8 +59,7 @@ specification for the shell. This version has many features which make it appear similar in some respects to the Korn shell, but it is not a Korn -shell clone like -.Xr pdksh 1 . +shell clone like pdksh. Only features designated by POSIX, plus a few Berkeley extensions, are being incorporated into this shell. ==== //depot/projects/ia64_epc/etc/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.309 2003/04/18 17:51:53 mtm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.310 2003/04/30 20:58:48 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -99,7 +99,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dot.klogin ${DESTDIR}/root/.klogin; \ + dot.k5login ${DESTDIR}/root/.k5login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ==== //depot/projects/ia64_epc/etc/defaults/rc.conf#6 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.175 2003/04/30 20:58:49 markm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -153,8 +153,9 @@ kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC kadmind5_server_enable="NO" # Run kadmind (or NO) -kadmind5_server="/usr/libexec/k5admind" # path to kerberos 5 admin daemon -kerberos_stash="NO" # Is the kerberos master key stashed? +kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon +kpasswdd_server_enable="NO" # Run kpasswdd (or NO) +kpasswdd_server="/usr/libexec/kpasswdd" # path to kerberos 5 passwd daemon rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod ==== //depot/projects/ia64_epc/etc/pam.d/ftpd#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.17 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "ftpd" service # @@ -17,5 +17,4 @@ account required pam_unix.so # session -#session required pam_krb5.so session required pam_permit.so ==== //depot/projects/ia64_epc/etc/pam.d/gdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "gdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64_epc/etc/pam.d/kde#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "kde" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64_epc/etc/pam.d/login#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "login" service # @@ -20,7 +20,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/ia64_epc/etc/pam.d/other#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.9 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "other" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64_epc/etc/pam.d/sshd#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "sshd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64_epc/etc/pam.d/su#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.13 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "su" service # @@ -19,5 +19,4 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so ==== //depot/projects/ia64_epc/etc/pam.d/telnetd#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "telnetd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/ia64_epc/etc/pam.d/xdm#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.7 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.8 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "xdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/ia64_epc/etc/rc.d/ipfilter#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.8 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipfilter @@ -42,7 +42,7 @@ # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -79,12 +79,12 @@ echo "Enabling ipfilter." case ${OSTYPE} in FreeBSD) - ${ipfilter_program:-/sbin/ipf} -Fa + ${ipfilter_program:-/sbin/ipf} -EFa if [ -r "${ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} \ -f "${ipfilter_rules}" ${ipfilter_flags} fi - ${ipfilter_program:-/sbin/ipf} -6 -Fa + ${ipfilter_program:-/sbin/ipf} -6 -EFa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} ==== //depot/projects/ia64_epc/etc/rc.d/ipnat#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.7 2003/04/24 18:14:52 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.8 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipnat @@ -44,7 +44,7 @@ # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -55,10 +55,10 @@ ipnat_start() { if [ ! -f ${ipnat_rules} ]; then - echo -n ' NO IPNAT RULES' + warn 'NO IPNAT RULES' return 0 fi - echo -n "Installing NAT rules ... " + echo -n "Installing NAT rules." ${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags} } ==== //depot/projects/ia64_epc/etc/rc.d/ldconfig#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.4 2002/09/17 01:48:48 peter Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $ # # PROVIDE: ldconfig -# REQUIRE: mountall +# REQUIRE: mountall mountcritremote # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64_epc/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.10 2003/01/20 19:30:15 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.11 2003/04/30 03:03:47 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -275,7 +275,7 @@ esac done' - debug "in _find_processes: proccheck is ($_proccheck)." +# debug "in _find_processes: proccheck is ($_proccheck)." eval $_proccheck } ==== //depot/projects/ia64_epc/gnu/usr.bin/groff/font/Makefile.dev#2 (text+ko) ==== @@ -1,11 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.11 2003/04/30 20:48:03 ru Exp $ -DEVICEDIR?= ${fontdir}/dev${DEV} - -all: ${DEVFILES} - -beforeinstall: ${DEVFILES} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${.ALLSRC} ${DESTDIR}${DEVICEDIR} +FILES= ${DEVFILES} +FILESDIR?= ${fontdir}/dev${DEV} .include ==== //depot/projects/ia64_epc/lib/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $ +# $FreeBSD: src/lib/Makefile,v 1.154 2003/04/30 18:42:25 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ + ${_libstand} ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -40,9 +40,12 @@ _csu=csu .endif +.if ${MACHINE_ARCH} != "amd64" +_libstand= libstand .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -71,7 +74,7 @@ .endif .if ${MACHINE_ARCH} != "powerpc" -_libdisk=libdisk +_libdisk= libdisk .endif .if defined(RELEASEDIR) || \ ==== //depot/projects/ia64_epc/lib/libc/gmon/gmon.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.16 2002/09/17 01:48:50 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.17 2003/04/30 19:29:02 peter Exp $"); #include "namespace.h" #include @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) extern char *minbrk asm (".minbrk"); #else extern char *minbrk asm ("minbrk"); ==== //depot/projects/ia64_epc/lib/libc/stdlib/malloc.c#2 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.74 2003/01/30 15:00:17 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.75 2003/04/30 19:30:34 peter Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related @@ -62,6 +62,10 @@ # define malloc_pageshift 13U # define malloc_minsize 16U # endif +# if defined(__amd64__) +# define malloc_pageshift 12U +# define malloc_minsize 16U +# endif # if !defined(__NETBSD_SYSCALLS) # define HAS_UTRACE # endif ==== //depot/projects/ia64_epc/lib/libc/stdtime/strptime.c#6 (text+ko) ==== @@ -59,7 +59,7 @@ static char sccsid[] __unused = "@(#)strptime.c 0.1 (Powerdog) 94/03/27"; #endif /* !defined NOID */ #endif /* not lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.33 2003/04/05 05:46:43 mtm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.34 2003/04/30 10:25:57 mtm Exp $"); #include "namespace.h" #include @@ -518,14 +518,12 @@ struct tm * __restrict tm) { char *ret; - time_t t; int gmt; gmt = 0; - memset((void*)tm, 0, sizeof(struct tm)); ret = _strptime(buf, fmt, tm, &gmt); - if (ret) { - t = gmt ? timegm(tm) : mktime(tm); + if (ret && gmt) { + time_t t = timegm(tm); localtime_r(&t, tm); } ==== //depot/projects/ia64_epc/lib/libc/xdr/xdr_float.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.11 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.12 2003/04/30 19:32:25 peter Exp $"); /* * xdr_float.c, Generic XDR routines implementation. @@ -64,7 +64,7 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) + defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) #include #define IEEEFP #endif ==== //depot/projects/ia64_epc/lib/libdisk/chunk.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.47 2003/01/10 19:25:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.48 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -239,6 +239,7 @@ /* PLATFORM POLICY BEGIN ------------------------------------- */ switch(platform) { case p_i386: + case p_amd64: switch (type) { case fat: case mbr: @@ -317,7 +318,8 @@ if (platform == p_sparc64) { offset = Prev_Cyl_Aligned(d, offset); size = Next_Cyl_Aligned(d, size); - } else if (platform == p_i386 || platform == p_pc98) { + } else if (platform == p_i386 || platform == p_pc98 || + platform == p_amd64) { if (type != freebsd) break; if (!(flags & CHUNK_ALIGN)) ==== //depot/projects/ia64_epc/lib/libdisk/create_chunk.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.80 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.81 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -138,7 +138,7 @@ Fixup_Names(struct disk *d) { struct chunk *c1, *c2; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) struct chunk *c3; int j; #endif @@ -149,7 +149,7 @@ continue; if (strcmp(c2->name, "X")) continue; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) c2->oname = malloc(12); if (!c2->oname) return -1; ==== //depot/projects/ia64_epc/lib/libdisk/disk.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.114 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.116 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -41,6 +41,28 @@ #define DPRINTX(x) #endif +const enum platform platform = +#if defined (P_DEBUG) + P_DEBUG +#elif defined (PC98) + p_pc98 +#elif defined(__i386__) + p_i386 +#elif defined(__alpha__) + p_alpha +#elif defined(__sparc64__) + p_sparc64 +#elif defined(__ia64__) + p_ia64 +#elif defined(__ppc__) + p_ppc +#elif defined(__amd64__) + p_amd64 +#else + IHAVENOIDEA +#endif + ; + const char * chunk_name(chunk_e type) { @@ -371,7 +393,7 @@ #if defined(PC98) printf(" boot1=%p, boot2=%p, bootipl=%p, bootmenu=%p\n", d->boot1, d->boot2, d->bootipl, d->bootmenu); -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) printf(" boot1=%p, boot2=%p, bootmgr=%p\n", d->boot1, d->boot2, d->bootmgr); #elif defined(__alpha__) @@ -407,7 +429,7 @@ if (d->boot1) free(d->boot1); #endif -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot2) free(d->boot2); #endif @@ -536,7 +558,7 @@ int Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) { -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot1) free(d->boot1); d->boot1 = malloc(512); ==== //depot/projects/ia64_epc/lib/libdisk/libdisk.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.55 2003/02/04 17:35:23 jhb Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.57 2003/04/30 21:03:16 peter Exp $ * */ @@ -20,33 +20,17 @@ #define MAX_SEC_SIZE 2048 /* maximum sector size that is supported */ #define MIN_SEC_SIZE 512 /* the sector size to end sensing at */ -static const enum platform { +enum platform { p_any, /* for debugging ! */ p_alpha, p_i386, p_pc98, p_sparc64, p_ia64, - p_ppc -} platform = -#if defined (P_DEBUG) - P_DEBUG -#elif defined (PC98) - p_pc98 -#elif defined(__i386__) - p_i386 -#elif defined(__alpha__) - p_alpha -#elif defined(__sparc64__) - p_sparc64 -#elif defined(__ia64__) - p_ia64 -#elif defined(__ppc__) - p_ppc -#else - IHAVENOIDEA -#endif - ; + p_ppc, + p_amd64 +}; +extern const enum platform platform; typedef enum { whole, @@ -86,7 +70,7 @@ #if !defined(__ia64__) u_char *boot1; #endif -#if defined(__i386__) /* the i386 needs extra help... */ +#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */ u_char *boot2; #endif struct chunk *chunks; ==== //depot/projects/ia64_epc/lib/libdisk/rules.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.30 2003/04/23 12:15:31 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.31 2003/04/30 21:03:16 peter Exp $"); #include #include @@ -242,6 +242,7 @@ switch (platform) { case p_i386: + case p_amd64: Rule_000(d, c, msg); Rule_001(d, c, msg); Rule_002(d, c, msg); ==== //depot/projects/ia64_epc/lib/libncurses/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncurses/Makefile,v 1.68 2003/04/18 13:01:07 ru Exp $ +# $FreeBSD: src/lib/libncurses/Makefile,v 1.69 2003/04/30 15:49:40 obrien Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -410,7 +410,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + ln -sf ${.ALLSRC} ${.TARGET} .endfor MLINKS+=ncurses.3 curses.3 ==== //depot/projects/ia64_epc/lib/libpam/modules/pam_chroot/pam_chroot.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:04:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0743D37B404; Wed, 30 Apr 2003 17:04:43 -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 A7BF437B401 for ; Wed, 30 Apr 2003 17:04:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0FED43F85 for ; Wed, 30 Apr 2003 17:04:41 -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 h4104f0U008614 for ; Wed, 30 Apr 2003 17:04:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4104fnT008602 for perforce@freebsd.org; Wed, 30 Apr 2003 17:04:41 -0700 (PDT) Date: Wed, 30 Apr 2003 17:04:41 -0700 (PDT) Message-Id: <200305010004.h4104fnT008602@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 30195 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 00:04:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=30195 Change 30195 by peter@peter_daintree on 2003/04/30 17:03:59 IFC @30194 (syncup) Affected files ... .. //depot/projects/hammer/sys/amd64/Makefile#3 integrate .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/atomic.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/critical.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/exception.s#3 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/locore.s#3 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#2 edit .. //depot/projects/hammer/sys/amd64/amd64/support.s#3 edit .. //depot/projects/hammer/sys/amd64/amd64/swtch.s#3 edit .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#3 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#3 edit .. //depot/projects/hammer/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/hammer/sys/amd64/conf/Makefile#3 integrate .. //depot/projects/hammer/sys/amd64/conf/gethints.awk#3 integrate .. //depot/projects/hammer/sys/amd64/include/_inttypes.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/bus_at386.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/kse.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/mutex.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/npx.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pc/display.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/psl.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/reloc.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/resource.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/runq.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/setjmp.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/sigframe.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/trap.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/tss.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/ucontext.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#3 integrate .. //depot/projects/hammer/sys/amd64/isa/icu_vector.s#3 integrate .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/ithread.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/npx.c#3 integrate .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#3 integrate .. //depot/projects/hammer/sys/amd64/isa/vector.s#3 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#3 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/Makefile#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/atomic.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/locore.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/swtch.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#2 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/Makefile#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/gethints.awk#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/_inttypes.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asm.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/atomic.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_at386.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_memio.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_pio.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/clock.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpu.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/critical.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/elf.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/exec.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/float.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/floatingpoint.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/frame.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/kse.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/md_var.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/mutex.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/npx.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pc/display.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb_ext.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/proc.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/profile.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/psl.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ptrace.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reg.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/reloc.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/resource.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/runq.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/segments.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/setjmp.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sigframe.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/signal.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/smp.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/trap.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/tss.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ucontext.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/varargs.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/icu_vector.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/ithread.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/npx.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/timerreg.h#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/vector.s#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:15:58 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64B5937B405; Wed, 30 Apr 2003 17:15:58 -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 1333737B401 for ; Wed, 30 Apr 2003 17:15:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 722FE43F75 for ; Wed, 30 Apr 2003 17:15:57 -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 h410Fv0U016718 for ; Wed, 30 Apr 2003 17:15:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410Fuhd016707 for perforce@freebsd.org; Wed, 30 Apr 2003 17:15:56 -0700 (PDT) Date: Wed, 30 Apr 2003 17:15:56 -0700 (PDT) Message-Id: <200305010015.h410Fuhd016707@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 30197 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 00:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=30197 Change 30197 by peter@peter_daintree on 2003/04/30 17:15:09 sync rcsid Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#4 edit .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/acpica/OsdEnvironment.c,v 1.7 2002/12/18 08:47:07 marcel Exp $ + * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.7 2002/12/18 08:47:07 marcel Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.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/i386/acpica/acpi_machdep.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.18 2003/03/25 00:07:01 jake Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.18 2003/03/25 00:07:01 jake Exp $ */ #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:20:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E704737B404; Wed, 30 Apr 2003 17:20:03 -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 8600F37B401 for ; Wed, 30 Apr 2003 17:20:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E51443F75 for ; Wed, 30 Apr 2003 17:20:03 -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 h410K20U018894 for ; Wed, 30 Apr 2003 17:20:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410K2rM018889 for perforce@freebsd.org; Wed, 30 Apr 2003 17:20:02 -0700 (PDT) Date: Wed, 30 Apr 2003 17:20:02 -0700 (PDT) Message-Id: <200305010020.h410K2rM018889@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 30198 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 00:20:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=30198 Change 30198 by peter@peter_daintree on 2003/04/30 17:19:59 This isn't locore.s Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#3 (text+ko) ==== @@ -1,10 +1,7 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 2003, Peter Wemm * All rights reserved. * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,18 +10,11 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * 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 REGENTS OR CONTRIBUTORS BE LIABLE + * 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) @@ -33,14 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.159 2002/09/17 01:48:57 peter Exp $ - * - * originally from: locore.s, by William F. Jolitz - * - * Substantially rewritten by David Greenman, Rod Grimes, - * Bruce Evans, Wolfgang Solfrank, Poul-Henning Kamp - * and many others. + * $FreeBSD$ */ #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:21:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17E9337B404; Wed, 30 Apr 2003 17:21:06 -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 BB7AB37B401 for ; Wed, 30 Apr 2003 17:21:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AF4043F85 for ; Wed, 30 Apr 2003 17:21:05 -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 h410L50U019597 for ; Wed, 30 Apr 2003 17:21:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410L43x019587 for perforce@freebsd.org; Wed, 30 Apr 2003 17:21:04 -0700 (PDT) Date: Wed, 30 Apr 2003 17:21:04 -0700 (PDT) Message-Id: <200305010021.h410L43x019587@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 30199 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 00:21:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=30199 Change 30199 by peter@peter_daintree on 2003/04/30 17:20:33 Sync rcsid's Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/atomic.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/critical.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/exception.s#4 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/locore.s#4 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/mem.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/support.s#4 edit .. //depot/projects/hammer/sys/amd64/amd64/swtch.s#4 edit .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#4 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/atomic.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/i386/i386/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $ + * $FreeBSD: src/sys/amd64/amd64/atomic.c,v 1.4 2000/09/06 11:21:14 phk Exp $ */ /* This file creates publically callable functions to perform various ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.172 2003/04/30 12:57:39 markm Exp $ + * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.172 2003/04/30 12:57:39 markm Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.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/i386/i386/busdma_machdep.c,v 1.43 2003/04/15 03:11:03 mux Exp $ + * $FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.43 2003/04/15 03:11:03 mux Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. * - * $FreeBSD: src/sys/i386/i386/critical.c,v 1.8 2003/03/08 03:58:50 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.8 2003/03/08 03:58:50 davidxu Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.7 2002/12/16 23:25:12 julian Exp $ + * $FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.7 2002/12/16 23:25:12 julian Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (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/i386/i386/elf_machdep.c,v 1.13 2003/01/21 02:42:43 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.13 2003/01/21 02:42:43 jake Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/exception.s#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.103 2003/02/17 09:55:08 julian Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.s,v 1.103 2003/02/17 09:55:08 julian Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.140 2003/04/17 22:17:28 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.140 2003/04/17 22:17:28 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/i386/i386/identcpu.c,v 1.122 2003/04/30 12:23:58 markm Exp $ + * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.122 2003/04/30 12:23:58 markm Exp $ */ #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * (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/i386/i386/initcpu.c,v 1.44 2003/03/20 20:50:22 dwmalone Exp $ + * $FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.44 2003/03/20 20:50:22 dwmalone Exp $ */ #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/legacy.c,v 1.49 2002/09/30 18:47:11 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.49 2002/09/30 18:47:11 jhb Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/locore.s#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.171 2003/04/03 23:44:34 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/locore.s,v 1.171 2003/04/03 23:44:34 jake Exp $ * * originally from: locore.s, by William F. Jolitz * ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.563 2003/04/25 01:50:28 deischen Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.563 2003/04/25 01:50:28 deischen Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/mem.c,v 1.106 2003/04/03 23:44:35 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.106 2003/04/03 23:44:35 jake Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.49 2002/09/30 18:47:11 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.49 2002/09/30 18:47:11 jhb Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.405 2003/04/28 20:35:36 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.405 2003/04/28 20:35:36 jake Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. ==== //depot/projects/hammer/sys/amd64/amd64/support.s#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.96 2003/04/04 17:29:54 des Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.s,v 1.96 2003/04/04 17:29:54 des Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/swtch.s#4 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.137 2003/04/05 22:18:14 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/swtch.s,v 1.137 2003/04/05 22:18:14 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.81 2003/04/25 20:04:02 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.81 2003/04/25 20:04:02 jhb Exp $ * */ ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.251 2003/04/30 17:59:27 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.251 2003/04/30 17:59:27 jhb Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/tsc.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/i386/i386/tsc.c,v 1.199 2003/04/10 23:07:24 des Exp $ + * $FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.199 2003/04/10 23:07:24 des Exp $ */ #include "opt_clock.h" ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.206 2003/04/21 15:05:05 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.206 2003/04/21 15:05:05 davidxu Exp $ */ #include "opt_isa.h" From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:22:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3BE837B404; Wed, 30 Apr 2003 17:22:07 -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 A388B37B401 for ; Wed, 30 Apr 2003 17:22:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EC2543F85 for ; Wed, 30 Apr 2003 17:22:07 -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 h410M70U020526 for ; Wed, 30 Apr 2003 17:22:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410M6Lo020518 for perforce@freebsd.org; Wed, 30 Apr 2003 17:22:06 -0700 (PDT) Date: Wed, 30 Apr 2003 17:22:06 -0700 (PDT) Message-Id: <200305010022.h410M6Lo020518@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 30200 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 00:22:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=30200 Change 30200 by peter@peter_daintree on 2003/04/30 17:21:26 sync rcsid's (and a cosmetic s/i386/amd64/) Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#3 edit .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#4 edit .. //depot/projects/hammer/sys/amd64/conf/Makefile#4 edit .. //depot/projects/hammer/sys/amd64/conf/gethints.awk#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -1,5 +1,5 @@ # ex:ts=8 -# GENERIC -- Generic kernel configuration file for FreeBSD/i386 +# GENERIC -- Generic kernel configuration file for FreeBSD/amd64 # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ machine amd64 cpu HAMMER ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/GENERIC.hints,v 1.11 2002/12/05 22:49:47 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.11 2002/12/05 22:49:47 jhb Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" ==== //depot/projects/hammer/sys/amd64/conf/Makefile#4 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/sys/i386/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/Makefile,v 1.9 2003/02/26 23:36:58 ru Exp $ .include "${.CURDIR}/../../conf/makeLINT.mk" ==== //depot/projects/hammer/sys/amd64/conf/gethints.awk#4 (text+ko) ==== @@ -6,7 +6,7 @@ # 'hints' directive. See how GENERIC and GENERIC.hints fit together for # a static example. You should use loader(8) if at all possible. # -# $FreeBSD: src/sys/i386/conf/gethints.awk,v 1.2 2002/07/26 03:52:30 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/gethints.awk,v 1.2 2002/07/26 03:52:30 peter Exp $ # skip commented lines, empty lines and not "device" lines /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; } From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:26:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2249237B404; Wed, 30 Apr 2003 17:26:14 -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 ACD9537B401 for ; Wed, 30 Apr 2003 17:26:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB5F043F85 for ; Wed, 30 Apr 2003 17:26:12 -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 h410QC0U024151 for ; Wed, 30 Apr 2003 17:26:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410QCBk024142 for perforce@freebsd.org; Wed, 30 Apr 2003 17:26:12 -0700 (PDT) Date: Wed, 30 Apr 2003 17:26:12 -0700 (PDT) Message-Id: <200305010026.h410QCBk024142@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 30201 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 00:26:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30201 Change 30201 by peter@peter_daintree on 2003/04/30 17:25:37 mostly sync rcsid's Affected files ... .. //depot/projects/hammer/sys/amd64/include/_inttypes.h#4 edit .. //depot/projects/hammer/sys/amd64/include/asm.h#4 edit .. //depot/projects/hammer/sys/amd64/include/asmacros.h#4 edit .. //depot/projects/hammer/sys/amd64/include/atomic.h#4 edit .. //depot/projects/hammer/sys/amd64/include/bus.h#4 edit .. //depot/projects/hammer/sys/amd64/include/bus_at386.h#4 edit .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#4 edit .. //depot/projects/hammer/sys/amd64/include/bus_memio.h#4 edit .. //depot/projects/hammer/sys/amd64/include/bus_pio.h#4 edit .. //depot/projects/hammer/sys/amd64/include/clock.h#4 edit .. //depot/projects/hammer/sys/amd64/include/cpu.h#4 edit .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#4 edit .. //depot/projects/hammer/sys/amd64/include/cputypes.h#4 edit .. //depot/projects/hammer/sys/amd64/include/critical.h#4 edit .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#4 edit .. //depot/projects/hammer/sys/amd64/include/elf.h#4 edit .. //depot/projects/hammer/sys/amd64/include/exec.h#4 edit .. //depot/projects/hammer/sys/amd64/include/float.h#4 edit .. //depot/projects/hammer/sys/amd64/include/floatingpoint.h#4 edit .. //depot/projects/hammer/sys/amd64/include/frame.h#4 edit .. //depot/projects/hammer/sys/amd64/include/kse.h#4 edit .. //depot/projects/hammer/sys/amd64/include/legacyvar.h#4 edit .. //depot/projects/hammer/sys/amd64/include/md_var.h#4 edit .. //depot/projects/hammer/sys/amd64/include/mutex.h#4 edit .. //depot/projects/hammer/sys/amd64/include/npx.h#4 edit .. //depot/projects/hammer/sys/amd64/include/pcb.h#4 edit .. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#4 edit .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#4 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#4 edit .. //depot/projects/hammer/sys/amd64/include/pmap.h#4 edit .. //depot/projects/hammer/sys/amd64/include/proc.h#4 edit .. //depot/projects/hammer/sys/amd64/include/profile.h#4 edit .. //depot/projects/hammer/sys/amd64/include/psl.h#4 edit .. //depot/projects/hammer/sys/amd64/include/ptrace.h#4 edit .. //depot/projects/hammer/sys/amd64/include/reg.h#4 edit .. //depot/projects/hammer/sys/amd64/include/reloc.h#4 edit .. //depot/projects/hammer/sys/amd64/include/resource.h#4 edit .. //depot/projects/hammer/sys/amd64/include/runq.h#4 edit .. //depot/projects/hammer/sys/amd64/include/segments.h#4 edit .. //depot/projects/hammer/sys/amd64/include/setjmp.h#4 edit .. //depot/projects/hammer/sys/amd64/include/sigframe.h#4 edit .. //depot/projects/hammer/sys/amd64/include/signal.h#4 edit .. //depot/projects/hammer/sys/amd64/include/smp.h#4 edit .. //depot/projects/hammer/sys/amd64/include/specialreg.h#4 edit .. //depot/projects/hammer/sys/amd64/include/sysarch.h#4 edit .. //depot/projects/hammer/sys/amd64/include/trap.h#4 edit .. //depot/projects/hammer/sys/amd64/include/tss.h#4 edit .. //depot/projects/hammer/sys/amd64/include/ucontext.h#4 edit .. //depot/projects/hammer/sys/amd64/include/varargs.h#4 edit .. //depot/projects/hammer/sys/amd64/include/vmparam.h#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/_inttypes.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ - * $FreeBSD: src/sys/i386/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $ + * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $ */ #ifndef _MACHINE_INTTYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/asm.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/i386/include/asm.h,v 1.10 2002/09/23 07:27:45 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.10 2002/09/23 07:27:45 peter Exp $ */ #ifndef _MACHINE_ASM_H_ ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/asmacros.h,v 1.24 2002/06/01 20:22:33 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.24 2002/06/01 20:22:33 alfred Exp $ */ #ifndef _MACHINE_ASMACROS_H_ ==== //depot/projects/hammer/sys/amd64/include/atomic.h#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/i386/include/atomic.h,v 1.29 2002/10/14 19:33:12 pirzyk Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.29 2002/10/14 19:33:12 pirzyk Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ ==== //depot/projects/hammer/sys/amd64/include/bus.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * (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/i386/include/bus.h,v 1.10 2002/02/27 17:15:45 tmm Exp $ + * $FreeBSD: src/sys/amd64/include/bus.h,v 1.10 2002/02/27 17:15:45 tmm Exp $ */ #ifndef _I386_BUS_H_ ==== //depot/projects/hammer/sys/amd64/include/bus_at386.h#4 (text+ko) ==== @@ -67,7 +67,7 @@ * (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/i386/include/bus_at386.h,v 1.22 2003/03/30 05:24:52 jake Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_at386.h,v 1.22 2003/03/30 05:24:52 jake Exp $ */ #ifndef _I386_BUS_AT386_H_ #define _I386_BUS_AT386_H_ ==== //depot/projects/hammer/sys/amd64/include/bus_dma.h#4 (text+ko) ==== @@ -67,7 +67,7 @@ * (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/i386/include/bus_dma.h,v 1.18 2003/04/10 23:03:33 mux Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.18 2003/04/10 23:03:33 mux Exp $ */ #ifndef _I386_BUS_DMA_H_ #define _I386_BUS_DMA_H_ ==== //depot/projects/hammer/sys/amd64/include/bus_memio.h#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/i386/include/bus_memio.h,v 1.2 1999/08/28 00:44:08 peter Exp $ + * $FreeBSD: src/sys/amd64/include/bus_memio.h,v 1.2 1999/08/28 00:44:08 peter Exp $ */ #ifndef _I386_BUS_MEMIO_H_ ==== //depot/projects/hammer/sys/amd64/include/bus_pio.h#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/i386/include/bus_pio.h,v 1.2 1999/08/28 00:44:08 peter Exp $ + * $FreeBSD: src/sys/amd64/include/bus_pio.h,v 1.2 1999/08/28 00:44:08 peter Exp $ */ #ifndef _I386_BUS_PIO_H_ ==== //depot/projects/hammer/sys/amd64/include/clock.h#4 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/i386/include/clock.h,v 1.44 2003/02/05 09:20:40 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.44 2003/02/05 09:20:40 phk Exp $ */ #ifndef _MACHINE_CLOCK_H_ ==== //depot/projects/hammer/sys/amd64/include/cpu.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/cpu.h,v 1.67 2003/02/05 08:55:10 phk Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.67 2003/02/05 08:55:10 phk Exp $ */ #ifndef _MACHINE_CPU_H_ ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.133 2003/04/20 02:59:13 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.133 2003/04/20 02:59:13 obrien Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * (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/i386/include/cputypes.h,v 1.16 2002/08/02 18:45:39 phk Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.16 2002/08/02 18:45:39 phk Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/critical.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/i386/include/critical.h,v 1.2 2002/07/10 20:15:58 dillon Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.2 2002/07/10 20:15:58 dillon Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.17 2001/09/15 11:06:07 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.17 2001/09/15 11:06:07 dfr Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ ==== //depot/projects/hammer/sys/amd64/include/elf.h#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/i386/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/hammer/sys/amd64/include/exec.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/exec.h,v 1.8 1999/08/28 00:44:11 peter Exp $ + * $FreeBSD: src/sys/amd64/include/exec.h,v 1.8 1999/08/28 00:44:11 peter Exp $ */ #ifndef _EXEC_H_ ==== //depot/projects/hammer/sys/amd64/include/float.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.10 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.10 2003/02/08 20:37:54 mike Exp $ */ #ifndef _MACHINE_FLOAT_H_ ==== //depot/projects/hammer/sys/amd64/include/floatingpoint.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/i386/include/floatingpoint.h,v 1.13 2003/01/19 06:01:33 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/floatingpoint.h,v 1.13 2003/01/19 06:01:33 marcel Exp $ */ #ifndef _FLOATINGPOINT_H_ ==== //depot/projects/hammer/sys/amd64/include/frame.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/frame.h,v 1.22 2002/03/20 05:48:58 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/frame.h,v 1.22 2002/03/20 05:48:58 alfred Exp $ */ #ifndef _MACHINE_FRAME_H_ ==== //depot/projects/hammer/sys/amd64/include/kse.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/i386/include/kse.h,v 1.2 2002/06/29 17:26:16 julian Exp $ + * $FreeBSD: src/sys/amd64/include/kse.h,v 1.2 2002/06/29 17:26:16 julian Exp $ */ #ifndef MACHINE_KSE_H ==== //depot/projects/hammer/sys/amd64/include/legacyvar.h#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/i386/include/legacyvar.h,v 1.3 2002/09/23 15:50:06 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.3 2002/09/23 15:50:06 jhb Exp $ */ #ifndef _MACHINE_LEGACYVAR_H_ ==== //depot/projects/hammer/sys/amd64/include/md_var.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/md_var.h,v 1.62 2003/04/04 17:29:54 des Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.62 2003/04/04 17:29:54 des Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/hammer/sys/amd64/include/mutex.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/i386/include/mutex.h,v 1.36 2002/03/28 15:14:23 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.36 2002/03/28 15:14:23 jhb Exp $ */ #ifndef _MACHINE_MUTEX_H_ ==== //depot/projects/hammer/sys/amd64/include/npx.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/npx.h,v 1.26 2002/09/23 05:55:10 peter Exp $ + * $FreeBSD: src/sys/amd64/include/npx.h,v 1.26 2002/09/23 05:55:10 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/pcb.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pcb.h,v 1.49 2002/11/07 01:34:23 davidxu Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.49 2002/11/07 01:34:23 davidxu Exp $ */ #ifndef _I386_PCB_H_ ==== //depot/projects/hammer/sys/amd64/include/pcb_ext.h#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/i386/include/pcb_ext.h,v 1.9 2002/03/20 05:48:58 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/pcb_ext.h,v 1.9 2002/03/20 05:48:58 alfred Exp $ */ #ifndef _I386_PCB_EXT_H_ ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/i386/include/pci_cfgreg.h,v 1.9 2003/02/18 03:36:48 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.9 2003/02/18 03:36:48 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#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/i386/include/pcpu.h,v 1.35 2002/10/01 14:01:58 phk Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.35 2002/10/01 14:01:58 phk Exp $ */ #ifndef _MACHINE_PCPU_H_ ==== //depot/projects/hammer/sys/amd64/include/pmap.h#4 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.99 2003/04/28 20:35:36 jake Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.99 2003/04/28 20:35:36 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/include/proc.h#4 (text+ko) ==== @@ -31,14 +31,14 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/i386/include/proc.h,v 1.19 2002/10/25 20:06:16 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.19 2002/10/25 20:06:16 jhb Exp $ */ #ifndef _MACHINE_PROC_H_ #define _MACHINE_PROC_H_ /* - * Machine-dependent part of the proc structure for i386. + * Machine-dependent part of the proc structure for AMD64. */ struct mdthread { register_t md_savecrit; ==== //depot/projects/hammer/sys/amd64/include/profile.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/profile.h,v 1.30 2002/09/25 13:46:23 markm Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.30 2002/09/25 13:46:23 markm Exp $ */ #ifndef _MACHINE_PROFILE_H_ ==== //depot/projects/hammer/sys/amd64/include/psl.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)psl.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/psl.h,v 1.11 2001/11/15 23:01:29 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/psl.h,v 1.11 2001/11/15 23:01:29 sobomax Exp $ */ #ifndef _MACHINE_PSL_H_ ==== //depot/projects/hammer/sys/amd64/include/ptrace.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/ptrace.h,v 1.11 2002/03/16 00:25:50 des Exp $ + * $FreeBSD: src/sys/amd64/include/ptrace.h,v 1.11 2002/03/16 00:25:50 des Exp $ */ #ifndef _MACHINE_PTRACE_H_ ==== //depot/projects/hammer/sys/amd64/include/reg.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/reg.h,v 1.29 2002/11/07 22:42:31 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/reg.h,v 1.29 2002/11/07 22:42:31 alfred Exp $ */ #ifndef _MACHINE_REG_H_ ==== //depot/projects/hammer/sys/amd64/include/reloc.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)reloc.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/i386/include/reloc.h,v 1.7 1999/08/28 00:44:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/reloc.h,v 1.7 1999/08/28 00:44:23 peter Exp $ */ #ifndef _I386_MACHINE_RELOC_H_ ==== //depot/projects/hammer/sys/amd64/include/resource.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/i386/include/resource.h,v 1.3 1999/10/14 21:38:30 dfr Exp $ */ +/* $FreeBSD: src/sys/amd64/include/resource.h,v 1.3 1999/10/14 21:38:30 dfr Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology * ==== //depot/projects/hammer/sys/amd64/include/runq.h#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/i386/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ ==== //depot/projects/hammer/sys/amd64/include/segments.h#4 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/segments.h,v 1.33 2003/01/28 19:05:44 jake Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.33 2003/01/28 19:05:44 jake Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ ==== //depot/projects/hammer/sys/amd64/include/setjmp.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/setjmp.h,v 1.7 2002/10/05 05:47:55 mike Exp $ + * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.7 2002/10/05 05:47:55 mike Exp $ */ #ifndef _MACHINE_SETJMP_H_ ==== //depot/projects/hammer/sys/amd64/include/sigframe.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/i386/include/sigframe.h,v 1.8 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sigframe.h,v 1.8 2002/10/25 19:10:56 peter Exp $ */ #ifndef _MACHINE_SIGFRAME_H_ ==== //depot/projects/hammer/sys/amd64/include/signal.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/signal.h,v 1.20 2002/12/02 19:58:55 deischen Exp $ + * $FreeBSD: src/sys/amd64/include/signal.h,v 1.20 2002/12/02 19:58:55 deischen Exp $ */ #ifndef _MACHINE_SIGNAL_H_ ==== //depot/projects/hammer/sys/amd64/include/smp.h#4 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/i386/include/smp.h,v 1.76 2003/04/02 23:53:29 peter Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.76 2003/04/02 23:53:29 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.23 2003/01/22 17:26:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.23 2003/01/22 17:26:18 jhb Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/sysarch.h,v 1.17 2002/09/28 20:42:04 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.17 2002/09/28 20:42:04 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/trap.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/trap.h,v 1.13 2001/07/12 06:32:51 peter Exp $ + * $FreeBSD: src/sys/amd64/include/trap.h,v 1.13 2001/07/12 06:32:51 peter Exp $ */ #ifndef _MACHINE_TRAP_H_ ==== //depot/projects/hammer/sys/amd64/include/tss.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/tss.h,v 1.13 2002/09/23 05:04:05 peter Exp $ + * $FreeBSD: src/sys/amd64/include/tss.h,v 1.13 2002/09/23 05:04:05 peter Exp $ */ #ifndef _MACHINE_TSS_H_ ==== //depot/projects/hammer/sys/amd64/include/ucontext.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/i386/include/ucontext.h,v 1.10 2002/12/02 19:58:55 deischen Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.10 2002/12/02 19:58:55 deischen Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ ==== //depot/projects/hammer/sys/amd64/include/varargs.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $FreeBSD: src/sys/i386/include/varargs.h,v 1.11 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.11 2002/10/06 22:02:06 mike Exp $ */ #ifndef _VARARGS_H_ ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/vmparam.h,v 1.35 2003/04/07 14:27:19 jake Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.35 2003/04/07 14:27:19 jake Exp $ */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:27:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8B5537B405; Wed, 30 Apr 2003 17:27:15 -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 8882E37B401 for ; Wed, 30 Apr 2003 17:27:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 312FE43FD7 for ; Wed, 30 Apr 2003 17:27:15 -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 h410RF0U024974 for ; Wed, 30 Apr 2003 17:27:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410REqw024969 for perforce@freebsd.org; Wed, 30 Apr 2003 17:27:14 -0700 (PDT) Date: Wed, 30 Apr 2003 17:27:14 -0700 (PDT) Message-Id: <200305010027.h410REqw024969@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 30203 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 00:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=30203 Change 30203 by peter@peter_daintree on 2003/04/30 17:27:03 sync rcsid Affected files ... .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#4 edit .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/i386/pci/pci_bus.c,v 1.98 2003/02/18 03:36:48 peter Exp $ + * $FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.98 2003/02/18 03:36:48 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/i386/pci/pci_cfgreg.c,v 1.101 2003/02/18 03:36:48 peter Exp $ + * $FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.101 2003/02/18 03:36:48 peter Exp $ * */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:27:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B19D37B40A; Wed, 30 Apr 2003 17:27:16 -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 C9C1437B404 for ; Wed, 30 Apr 2003 17:27:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3D7B43FCB for ; Wed, 30 Apr 2003 17:27:14 -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 h410RE0U024964 for ; Wed, 30 Apr 2003 17:27:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410REjH024956 for perforce@freebsd.org; Wed, 30 Apr 2003 17:27:14 -0700 (PDT) Date: Wed, 30 Apr 2003 17:27:14 -0700 (PDT) Message-Id: <200305010027.h410REjH024956@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 30202 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 00:27:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30202 Change 30202 by peter@peter_daintree on 2003/04/30 17:26:36 s/i386/amd64/ in rcsids Affected files ... .. //depot/projects/hammer/sys/amd64/isa/clock.c#4 edit .. //depot/projects/hammer/sys/amd64/isa/icu.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#4 edit .. //depot/projects/hammer/sys/amd64/isa/icu_vector.s#4 edit .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#4 edit .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/isa.c#4 edit .. //depot/projects/hammer/sys/amd64/isa/isa.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#4 edit .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/ithread.c#4 edit .. //depot/projects/hammer/sys/amd64/isa/npx.c#4 edit .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/vector.s#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/clock.c,v 1.198 2003/04/29 13:36:02 kan Exp $ + * $FreeBSD: src/sys/amd64/isa/clock.c,v 1.198 2003/04/29 13:36:02 kan Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/icu.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/isa/icu.h,v 1.27 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.27 2002/04/06 08:25:05 nyan Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#4 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/icu_ipl.s,v 1.11 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/icu_ipl.s,v 1.11 2002/04/06 08:25:05 nyan Exp $ */ .data ==== //depot/projects/hammer/sys/amd64/isa/icu_vector.s#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/icu_vector.s,v 1.37 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/icu_vector.s,v 1.37 2002/04/06 08:25:05 nyan Exp $ */ #define IRQ_BIT(irq_num) (1 << ((irq_num) % 8)) ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ + * $FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ */ #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.43 2003/04/02 23:53:29 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/intr_machdep.h,v 1.43 2003/04/02 23:53:29 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ ==== //depot/projects/hammer/sys/amd64/isa/isa.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/i386/isa/isa.c,v 1.142 2002/02/17 09:16:45 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/isa.c,v 1.142 2002/02/17 09:16:45 nyan Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/isa.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/isa/isa.h,v 1.23 1999/08/28 00:44:54 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/isa.h,v 1.23 1999/08/28 00:44:54 peter Exp $ */ #ifndef _I386_ISA_ISA_H_ ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.13 2003/03/25 00:07:03 jake Exp $ + * $FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.13 2003/03/25 00:07:03 jake Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/isa_dma.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/isa/isa_dma.h,v 1.5 2002/03/20 07:39:48 alfred Exp $ + * $FreeBSD: src/sys/amd64/isa/isa_dma.h,v 1.5 2002/03/20 07:39:48 alfred Exp $ */ #ifndef _I386_ISA_ISA_DMA_H_ ==== //depot/projects/hammer/sys/amd64/isa/ithread.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * From BSDI: intr.c,v 1.6.2.5 1999/07/06 19:16:52 cp Exp - * $FreeBSD: src/sys/i386/isa/ithread.c,v 1.20 2002/01/30 12:23:49 bde Exp $ + * $FreeBSD: src/sys/amd64/isa/ithread.c,v 1.20 2002/01/30 12:23:49 bde Exp $ */ /* Interrupt thread code. */ ==== //depot/projects/hammer/sys/amd64/isa/npx.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/npx.c,v 1.140 2003/04/04 17:29:55 des Exp $ + * $FreeBSD: src/sys/amd64/isa/npx.c,v 1.140 2003/04/04 17:29:55 des Exp $ */ #include "opt_debug_npx.h" ==== //depot/projects/hammer/sys/amd64/isa/timerreg.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp - * $FreeBSD: src/sys/i386/isa/timerreg.h,v 1.6 1999/08/28 00:45:04 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/timerreg.h,v 1.6 1999/08/28 00:45:04 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/vector.s#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:29:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C5F937B404; Wed, 30 Apr 2003 17:29:19 -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 BC03C37B401 for ; Wed, 30 Apr 2003 17:29:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5082043F85 for ; Wed, 30 Apr 2003 17:29:18 -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 h410TI0U025942 for ; Wed, 30 Apr 2003 17:29:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410THeV025938 for perforce@freebsd.org; Wed, 30 Apr 2003 17:29:17 -0700 (PDT) Date: Wed, 30 Apr 2003 17:29:17 -0700 (PDT) Message-Id: <200305010029.h410THeV025938@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 30204 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 00:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30204 Change 30204 by peter@peter_daintree on 2003/04/30 17:28:30 Use the correct machine name in the crashdumps Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -63,7 +63,7 @@ /* Fill in the kernel dump header */ strcpy(kdh.magic, KERNELDUMPMAGIC); - strcpy(kdh.architecture, "i386"); + strcpy(kdh.architecture, "amd64"); kdh.version = htod32(KERNELDUMPVERSION); kdh.architectureversion = htod32(KERNELDUMP_I386_VERSION); kdh.dumplength = htod64(Maxmem * (off_t)PAGE_SIZE); From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:30:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3406037B404; Wed, 30 Apr 2003 17:30:21 -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 D26D837B401 for ; Wed, 30 Apr 2003 17:30:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F1DE43FA3 for ; Wed, 30 Apr 2003 17:30:20 -0700 (PDT) (envelope-from marcel@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 h410UK0U026464 for ; Wed, 30 Apr 2003 17:30:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410UJxX026452 for perforce@freebsd.org; Wed, 30 Apr 2003 17:30:19 -0700 (PDT) Date: Wed, 30 Apr 2003 17:30:19 -0700 (PDT) Message-Id: <200305010030.h410UJxX026452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30205 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 00:30:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30205 Change 30205 by marcel@marcel_nfs on 2003/04/30 17:30:06 Unstaticize comdefaultrclk and comdefaultrate. We need those from sio_cons.c Affected files ... .. //depot/projects/ia64_epc/sys/dev/sio/sio.c#7 edit Differences ... ==== //depot/projects/ia64_epc/sys/dev/sio/sio.c#7 (text+ko) ==== @@ -186,9 +186,9 @@ .d_kqfilter = ttykqfilter, }; -static speed_t comdefaultrate = CONSPEED; +speed_t comdefaultrate = CONSPEED; -static u_long comdefaultrclk = DEFAULT_RCLK; +u_long comdefaultrclk = DEFAULT_RCLK; SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, ""); static speed_t gdbdefaultrate = GDBSPEED; From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:33:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A4A537B404; Wed, 30 Apr 2003 17:33:26 -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 E53A637B401 for ; Wed, 30 Apr 2003 17:33:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9218043F85 for ; Wed, 30 Apr 2003 17:33:25 -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 h410XP0U029275 for ; Wed, 30 Apr 2003 17:33:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410XPvp029267 for perforce@freebsd.org; Wed, 30 Apr 2003 17:33:25 -0700 (PDT) Date: Wed, 30 Apr 2003 17:33:25 -0700 (PDT) Message-Id: <200305010033.h410XPvp029267@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 30207 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 00:33:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30207 Change 30207 by peter@peter_daintree on 2003/04/30 17:33:14 IFC @30206 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#4 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#4 edit .. //depot/projects/hammer/sys/i386/include/vmparam.h#5 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#4 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#4 (text+ko) ==== ==== //depot/projects/hammer/sys/i386/include/vmparam.h#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/vmparam.h,v 1.35 2003/04/07 14:27:19 jake Exp $ + * $FreeBSD: src/sys/i386/include/vmparam.h,v 1.36 2003/05/01 00:10:38 peter Exp $ */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:36:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC68E37B407; Wed, 30 Apr 2003 17:36: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 8D7A537B404 for ; Wed, 30 Apr 2003 17:36:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35E6D43F3F for ; Wed, 30 Apr 2003 17:36:30 -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 h410aT0U031970 for ; Wed, 30 Apr 2003 17:36:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410aT0b031965 for perforce@freebsd.org; Wed, 30 Apr 2003 17:36:29 -0700 (PDT) Date: Wed, 30 Apr 2003 17:36:29 -0700 (PDT) Message-Id: <200305010036.h410aT0b031965@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 30208 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 00:36:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30208 Change 30208 by peter@peter_daintree on 2003/04/30 17:35:34 sync rcsid (these came from ia64/powerpc, not i386) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#5 edit .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */ +/* $FreeBSD: src/sys/amd64/amd64/in_cksum.c,v 1.3 2001/10/05 18:58:22 dfr Exp $ */ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/powerpc/include/in_cksum.h,v 1.1 2002/06/29 09:49:24 benno Exp $ + * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.1 2002/06/29 09:49:24 benno Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:36:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0567A37B41A; Wed, 30 Apr 2003 17:36:32 -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 6382A37B431 for ; Wed, 30 Apr 2003 17:36:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE16B43F3F for ; Wed, 30 Apr 2003 17:36:30 -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 h410aU0U031983 for ; Wed, 30 Apr 2003 17:36:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410aUHQ031976 for perforce@freebsd.org; Wed, 30 Apr 2003 17:36:30 -0700 (PDT) Date: Wed, 30 Apr 2003 17:36:30 -0700 (PDT) Message-Id: <200305010036.h410aUHQ031976@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 30209 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 00:36:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=30209 Change 30209 by peter@peter_daintree on 2003/04/30 17:36:05 rcsid sync Affected files ... .. //depot/projects/hammer/sys/amd64/include/pc/display.h#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pc/display.h#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* * IBM PC display definitions * - * $FreeBSD: src/sys/i386/include/pc/display.h,v 1.6 2001/12/14 15:27:15 nyan Exp $ + * $FreeBSD: src/sys/amd64/include/pc/display.h,v 1.6 2001/12/14 15:27:15 nyan Exp $ */ /* Color attributes for foreground text */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:38:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2E3A37B401; Wed, 30 Apr 2003 17:38:34 -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 9957C37B404 for ; Wed, 30 Apr 2003 17:38:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BED643F3F for ; Wed, 30 Apr 2003 17:38:34 -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 h410cX0U032845 for ; Wed, 30 Apr 2003 17:38:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410cXLl032842 for perforce@freebsd.org; Wed, 30 Apr 2003 17:38:33 -0700 (PDT) Date: Wed, 30 Apr 2003 17:38:33 -0700 (PDT) Message-Id: <200305010038.h410cXLl032842@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 30210 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 00:38:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30210 Change 30210 by peter@peter_daintree on 2003/04/30 17:38:13 Catch some more x86-64 references Affected files ... .. //depot/projects/hammer/sys/amd64/include/cputypes.h#5 edit .. //depot/projects/hammer/sys/amd64/include/elf.h#5 edit .. //depot/projects/hammer/sys/amd64/include/segments.h#5 edit .. //depot/projects/hammer/sys/amd64/include/specialreg.h#5 edit .. //depot/projects/hammer/sys/amd64/include/vmparam.h#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * Classes of processor. */ #define CPUCLASS_X86 0 /* X86 */ -#define CPUCLASS_K8 1 /* K8 X86-64 class */ +#define CPUCLASS_K8 1 /* K8 AMD64 class */ /* * Kinds of processor. ==== //depot/projects/hammer/sys/amd64/include/elf.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ #define _MACHINE_ELF_H_ 1 /* - * ELF definitions for the x86-64 architecture. + * ELF definitions for the AMD64 architecture. */ #include /* Definitions common to all 64 bit architectures. */ ==== //depot/projects/hammer/sys/amd64/include/segments.h#5 (text+ko) ==== @@ -42,7 +42,7 @@ #define _MACHINE_SEGMENTS_H_ /* - * x86-64 Segmentation Data Structures and definitions + * AMD64 Segmentation Data Structures and definitions * William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989 */ ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#5 (text+ko) ==== @@ -75,7 +75,7 @@ #define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */ /* - * Bits in x86-64 special registers. EFER is 64 bits wide. + * Bits in AMD64 special registers. EFER is 64 bits wide. */ #define EFER_SCE 0x000000001 /* System Call Extensions (R/W) */ #define EFER_LME 0x000000100 /* Long mode enable (R/W) */ ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#5 (text+ko) ==== @@ -44,7 +44,7 @@ #define _MACHINE_VMPARAM_H_ 1 /* - * Machine dependent constants for x86-64. + * Machine dependent constants for AMD64. */ /* From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:42:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA2AD37B404; Wed, 30 Apr 2003 17:42:40 -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 7089F37B401 for ; Wed, 30 Apr 2003 17:42:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06A0743FA3 for ; Wed, 30 Apr 2003 17:42:40 -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 h410gd0U035633 for ; Wed, 30 Apr 2003 17:42:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410gdW9035622 for perforce@freebsd.org; Wed, 30 Apr 2003 17:42:39 -0700 (PDT) Date: Wed, 30 Apr 2003 17:42:39 -0700 (PDT) Message-Id: <200305010042.h410gdW9035622@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 30211 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 00:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30211 Change 30211 by peter@peter_daintree on 2003/04/30 17:41:43 De-hammer-ify Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -156,7 +156,7 @@ printf("%jd.%02d-MHz ", (intmax_t)(tsc_freq + 4999) / 1000000, (u_int)((tsc_freq + 4999) / 10000) % 100); - printf("Hammer"); + printf("K8"); break; default: printf("Unknown"); /* will panic below... */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 17:45:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4365037B404; Wed, 30 Apr 2003 17:45:45 -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 CC23537B401 for ; Wed, 30 Apr 2003 17:45:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6339943FBD for ; Wed, 30 Apr 2003 17:45:44 -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 h410ji0U038212 for ; Wed, 30 Apr 2003 17:45:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h410jhYP038199 for perforce@freebsd.org; Wed, 30 Apr 2003 17:45:43 -0700 (PDT) Date: Wed, 30 Apr 2003 17:45:43 -0700 (PDT) Message-Id: <200305010045.h410jhYP038199@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 30212 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 00:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30212 Change 30212 by peter@peter_daintree on 2003/04/30 17:44:53 sync rcsid Affected files ... .. //depot/projects/hammer/sys/amd64/Makefile#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $ +# $FreeBSD: src/sys/amd64/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 # Makefile for i386 links, tags file From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:11:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0FCC37B404; Wed, 30 Apr 2003 18:11:18 -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 6896D37B401 for ; Wed, 30 Apr 2003 18:11:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 146A043FAF for ; Wed, 30 Apr 2003 18:11:18 -0700 (PDT) (envelope-from marcel@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 h411BH0U056520 for ; Wed, 30 Apr 2003 18:11:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411BHpe056512 for perforce@freebsd.org; Wed, 30 Apr 2003 18:11:17 -0700 (PDT) Date: Wed, 30 Apr 2003 18:11:17 -0700 (PDT) Message-Id: <200305010111.h411BHpe056512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30215 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 01:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=30215 Change 30215 by marcel@marcel_nfs on 2003/04/30 18:10:57 Diff reduction: do not allow the _* targets in the top-level makefile. I don't think it's used anymore, but gladly accept and pointy objects (like hats) for making this assumption and it turns out to be false. Affected files ... .. //depot/projects/ia64/Makefile#25 edit Differences ... ==== //depot/projects/ia64/Makefile#25 (text+ko) ==== @@ -62,9 +62,7 @@ cleandepend cleandir depend distribute distributeworld everything \ hierarchy install installcheck installkernel \ reinstallkernel installmost installworld libraries lint maninstall \ - mk most obj objlink regress rerelease tags update \ - _worldtmp _bootstrap-tools _cleanobj _obj _build-tools \ - _cross-tools _includes _libraries _depend + mk most obj objlink regress rerelease tags update BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:16:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B540137B404; Wed, 30 Apr 2003 18:16:26 -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 4DB8937B401 for ; Wed, 30 Apr 2003 18:16:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03C3443F93 for ; Wed, 30 Apr 2003 18:16:25 -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 h411GO0U060889 for ; Wed, 30 Apr 2003 18:16:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411GOEu060880 for perforce@freebsd.org; Wed, 30 Apr 2003 18:16:24 -0700 (PDT) Date: Wed, 30 Apr 2003 18:16:24 -0700 (PDT) Message-Id: <200305010116.h411GOEu060880@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 30216 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 01:16:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=30216 Change 30216 by peter@peter_daintree on 2003/04/30 18:16:02 IFC @30214 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/critical.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.s#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.s#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.s#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/swtch.s#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/tsc.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#5 integrate .. //depot/projects/hammer/sys/amd64/include/_inttypes.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/bus_at386.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/db_machdep.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/kse.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/mutex.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/npx.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/pcb_ext.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/psl.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/setjmp.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/sigframe.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/tss.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/ucontext.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#5 integrate .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#5 integrate .. //depot/projects/hammer/sys/amd64/isa/icu_vector.s#5 integrate .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#5 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#5 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/ithread.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/npx.c#5 integrate .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#5 integrate .. //depot/projects/hammer/sys/amd64/isa/vector.s#5 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#5 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.7 2002/12/18 08:47:07 marcel Exp $ + * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.8 2003/05/01 01:05:21 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#5 (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/amd64/acpica/acpi_machdep.c,v 1.8 2003/03/24 19:14:45 mdodd Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.18 2003/03/25 00:07:01 jake Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.19 2003/05/01 01:05:21 peter Exp $ */ #include #include ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.172 2003/04/30 12:57:39 markm Exp $ + * $FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.173 2003/05/01 01:05:21 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. * - * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.8 2003/03/08 03:58:50 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/critical.c,v 1.9 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.7 2002/12/16 23:25:12 julian Exp $ + * $FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.8 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * (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/amd64/amd64/elf_machdep.c,v 1.13 2003/01/21 02:42:43 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.14 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/exception.s#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.s,v 1.103 2003/02/17 09:55:08 julian Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.s,v 1.104 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.140 2003/04/17 22:17:28 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.141 2003/05/01 01:05:21 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.122 2003/04/30 12:23:58 markm Exp $ + * $FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.123 2003/05/01 01:05:21 peter Exp $ */ #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * (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/amd64/amd64/initcpu.c,v 1.44 2003/03/20 20:50:22 dwmalone Exp $ + * $FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.45 2003/05/01 01:05:21 peter Exp $ */ #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/amd64/legacy.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.49 2002/09/30 18:47:11 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.50 2003/05/01 01:05:21 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/locore.s#5 (text+ko) ==== @@ -1,10 +1,7 @@ /*- - * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 2003 Peter Wemm * All rights reserved. * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -13,18 +10,11 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * 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 REGENTS OR CONTRIBUTORS BE LIABLE + * 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) @@ -33,14 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/locore.s,v 1.171 2003/04/03 23:44:34 jake Exp $ - * - * originally from: locore.s, by William F. Jolitz - * - * Substantially rewritten by David Greenman, Rod Grimes, - * Bruce Evans, Wolfgang Solfrank, Poul-Henning Kamp - * and many others. + * $FreeBSD: src/sys/amd64/amd64/locore.s,v 1.172 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.563 2003/04/25 01:50:28 deischen Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.564 2003/05/01 01:05:21 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.106 2003/04/03 23:44:35 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/mem.c,v 1.107 2003/05/01 01:05:21 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.49 2002/09/30 18:47:11 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.50 2003/05/01 01:05:21 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.405 2003/04/28 20:35:36 jake Exp $ + * $FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.406 2003/05/01 01:05:21 peter Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. ==== //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#4 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/support.s#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.s,v 1.96 2003/04/04 17:29:54 des Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.s,v 1.97 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/swtch.s#5 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/swtch.s,v 1.137 2003/04/05 22:18:14 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/swtch.s,v 1.138 2003/05/01 01:05:21 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.81 2003/04/25 20:04:02 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.82 2003/05/01 01:05:21 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.251 2003/04/30 17:59:27 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.252 2003/05/01 01:05:21 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/tsc.c#5 (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/amd64/amd64/tsc.c,v 1.199 2003/04/10 23:07:24 des Exp $ + * $FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.200 2003/05/01 01:05:22 peter Exp $ */ #include "opt_clock.h" ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.206 2003/04/21 15:05:05 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.207 2003/05/01 01:05:22 peter Exp $ */ #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.383 2003/05/01 01:05:22 peter Exp $ machine amd64 cpu HAMMER ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.11 2002/12/05 22:49:47 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.12 2003/05/01 01:05:22 peter Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" ==== //depot/projects/hammer/sys/amd64/include/_inttypes.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ - * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $ + * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.3 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_INTTYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.3 2003/03/25 00:07:06 jake Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.4 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/asm.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.10 2002/09/23 07:27:45 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.11 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_ASM_H_ ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.24 2002/06/01 20:22:33 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.25 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_ASMACROS_H_ ==== //depot/projects/hammer/sys/amd64/include/atomic.h#5 (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/amd64/include/atomic.h,v 1.29 2002/10/14 19:33:12 pirzyk Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.30 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ ==== //depot/projects/hammer/sys/amd64/include/bus.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * (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/amd64/include/bus.h,v 1.10 2002/02/27 17:15:45 tmm Exp $ + * $FreeBSD: src/sys/amd64/include/bus.h,v 1.11 2003/05/01 01:05:23 peter Exp $ */ #ifndef _I386_BUS_H_ ==== //depot/projects/hammer/sys/amd64/include/bus_at386.h#5 (text+ko) ==== @@ -67,7 +67,7 @@ * (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/amd64/include/bus_at386.h,v 1.22 2003/03/30 05:24:52 jake Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_at386.h,v 1.23 2003/05/01 01:05:23 peter Exp $ */ #ifndef _I386_BUS_AT386_H_ #define _I386_BUS_AT386_H_ ==== //depot/projects/hammer/sys/amd64/include/clock.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.44 2003/02/05 09:20:40 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.45 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_CLOCK_H_ ==== //depot/projects/hammer/sys/amd64/include/cpu.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.67 2003/02/05 08:55:10 phk Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.68 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_CPU_H_ ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.133 2003/04/20 02:59:13 obrien Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.134 2003/05/01 01:05:23 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/cputypes.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * (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/amd64/include/cputypes.h,v 1.16 2002/08/02 18:45:39 phk Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.17 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/critical.h#5 (text+ko) ==== @@ -12,7 +12,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.2 2002/07/10 20:15:58 dillon Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.3 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/hammer/sys/amd64/include/db_machdep.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.17 2001/09/15 11:06:07 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.18 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ ==== //depot/projects/hammer/sys/amd64/include/elf.h#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/amd64/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.14 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/hammer/sys/amd64/include/endian.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/amd64/include/endian.h,v 1.3 2002/09/23 04:32:17 mike Exp $ + * $FreeBSD: src/sys/amd64/include/endian.h,v 1.4 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_ENDIAN_H_ ==== //depot/projects/hammer/sys/amd64/include/frame.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/frame.h,v 1.22 2002/03/20 05:48:58 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/frame.h,v 1.23 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_FRAME_H_ ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.1 2002/06/29 09:49:24 benno Exp $ + * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.2 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ ==== //depot/projects/hammer/sys/amd64/include/kse.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/amd64/include/kse.h,v 1.2 2002/06/29 17:26:16 julian Exp $ + * $FreeBSD: src/sys/amd64/include/kse.h,v 1.3 2003/05/01 01:05:23 peter Exp $ */ #ifndef MACHINE_KSE_H ==== //depot/projects/hammer/sys/amd64/include/md_var.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.62 2003/04/04 17:29:54 des Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.63 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/hammer/sys/amd64/include/mutex.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.36 2002/03/28 15:14:23 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.37 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_MUTEX_H_ ==== //depot/projects/hammer/sys/amd64/include/npx.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/npx.h,v 1.26 2002/09/23 05:55:10 peter Exp $ + * $FreeBSD: src/sys/amd64/include/npx.h,v 1.27 2003/05/01 01:05:23 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/param.h#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.3 2003/04/30 22:51:59 peter Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.4 2003/05/01 01:05:23 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/pcb.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.49 2002/11/07 01:34:23 davidxu Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.50 2003/05/01 01:05:23 peter Exp $ */ #ifndef _I386_PCB_H_ ==== //depot/projects/hammer/sys/amd64/include/pcb_ext.h#5 (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/amd64/include/pcb_ext.h,v 1.9 2002/03/20 05:48:58 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/pcb_ext.h,v 1.10 2003/05/01 01:05:23 peter Exp $ */ #ifndef _I386_PCB_EXT_H_ ==== //depot/projects/hammer/sys/amd64/include/pci_cfgreg.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/amd64/include/pci_cfgreg.h,v 1.9 2003/02/18 03:36:48 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.10 2003/05/01 01:05:23 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#5 (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/amd64/include/pcpu.h,v 1.35 2002/10/01 14:01:58 phk Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.36 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_PCPU_H_ ==== //depot/projects/hammer/sys/amd64/include/pmap.h#5 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.99 2003/04/28 20:35:36 jake Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.100 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/hammer/sys/amd64/include/proc.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD: src/sys/amd64/include/proc.h,v 1.19 2002/10/25 20:06:16 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/proc.h,v 1.20 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_PROC_H_ ==== //depot/projects/hammer/sys/amd64/include/profile.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.30 2002/09/25 13:46:23 markm Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.31 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ ==== //depot/projects/hammer/sys/amd64/include/psl.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)psl.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/psl.h,v 1.11 2001/11/15 23:01:29 sobomax Exp $ + * $FreeBSD: src/sys/amd64/include/psl.h,v 1.12 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_PSL_H_ ==== //depot/projects/hammer/sys/amd64/include/reg.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/reg.h,v 1.29 2002/11/07 22:42:31 alfred Exp $ + * $FreeBSD: src/sys/amd64/include/reg.h,v 1.30 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_REG_H_ ==== //depot/projects/hammer/sys/amd64/include/segments.h#6 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/segments.h,v 1.33 2003/01/28 19:05:44 jake Exp $ + * $FreeBSD: src/sys/amd64/include/segments.h,v 1.34 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -43,7 +43,6 @@ /* * AMD64 Segmentation Data Structures and definitions - * William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989 */ /* ==== //depot/projects/hammer/sys/amd64/include/setjmp.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.7 2002/10/05 05:47:55 mike Exp $ + * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.8 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_SETJMP_H_ ==== //depot/projects/hammer/sys/amd64/include/sigframe.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/amd64/include/sigframe.h,v 1.8 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sigframe.h,v 1.9 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_SIGFRAME_H_ ==== //depot/projects/hammer/sys/amd64/include/signal.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/signal.h,v 1.20 2002/12/02 19:58:55 deischen Exp $ + * $FreeBSD: src/sys/amd64/include/signal.h,v 1.21 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_SIGNAL_H_ ==== //depot/projects/hammer/sys/amd64/include/smp.h#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.76 2003/04/02 23:53:29 peter Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.77 2003/05/01 01:05:23 peter Exp $ * */ ==== //depot/projects/hammer/sys/amd64/include/specialreg.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.23 2003/01/22 17:26:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.24 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ ==== //depot/projects/hammer/sys/amd64/include/sysarch.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.17 2002/09/28 20:42:04 peter Exp $ + * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.18 2003/05/01 01:05:23 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/tss.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/tss.h,v 1.13 2002/09/23 05:04:05 peter Exp $ + * $FreeBSD: src/sys/amd64/include/tss.h,v 1.14 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_TSS_H_ ==== //depot/projects/hammer/sys/amd64/include/ucontext.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/amd64/include/ucontext.h,v 1.10 2002/12/02 19:58:55 deischen Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.11 2003/05/01 01:05:23 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ ==== //depot/projects/hammer/sys/amd64/include/vmparam.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.35 2003/04/07 14:27:19 jake Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.36 2003/05/01 01:05:23 peter Exp $ */ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/isa/clock.c,v 1.198 2003/04/29 13:36:02 kan Exp $ + * $FreeBSD: src/sys/amd64/isa/clock.c,v 1.199 2003/05/01 01:05:24 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/icu.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.27 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/icu.h,v 1.28 2003/05/01 01:05:24 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#5 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/isa/icu_ipl.s,v 1.11 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/icu_ipl.s,v 1.12 2003/05/01 01:05:24 peter Exp $ */ .data ==== //depot/projects/hammer/sys/amd64/isa/icu_vector.s#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/icu_vector.s,v 1.37 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/amd64/isa/icu_vector.s,v 1.38 2003/05/01 01:05:24 peter Exp $ */ #define IRQ_BIT(irq_num) (1 << ((irq_num) % 8)) ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ + * $FreeBSD: src/sys/amd64/isa/intr_machdep.c,v 1.75 2003/05/01 01:05:24 peter Exp $ */ #include "opt_isa.h" ==== //depot/projects/hammer/sys/amd64/isa/intr_machdep.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/isa/intr_machdep.h,v 1.43 2003/04/02 23:53:29 peter Exp $ + * $FreeBSD: src/sys/amd64/isa/intr_machdep.h,v 1.44 2003/05/01 01:05:24 peter Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:18:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E397837B401; Wed, 30 Apr 2003 18:18:28 -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 79CDA37B405 for ; Wed, 30 Apr 2003 18:18:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2663643FBF for ; Wed, 30 Apr 2003 18:18:28 -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 h411IR0U061896 for ; Wed, 30 Apr 2003 18:18:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411IROG061891 for perforce@freebsd.org; Wed, 30 Apr 2003 18:18:27 -0700 (PDT) Date: Wed, 30 Apr 2003 18:18:27 -0700 (PDT) Message-Id: <200305010118.h411IROG061891@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 30217 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 01:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30217 Change 30217 by peter@peter_daintree on 2003/04/30 18:18:07 fix mismerge Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#5 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003, Peter Wemm + * Copyright (c) 2003 Peter Wemm * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/amd64/amd64/sigtramp.s,v 1.1 2003/05/01 01:05:21 peter Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:19:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E827537B401; Wed, 30 Apr 2003 18:19: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 9A60537B404 for ; Wed, 30 Apr 2003 18:19:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1911443F93 for ; Wed, 30 Apr 2003 18:19:30 -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 h411JT0U062314 for ; Wed, 30 Apr 2003 18:19:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411JTdA062309 for perforce@freebsd.org; Wed, 30 Apr 2003 18:19:29 -0700 (PDT) Date: Wed, 30 Apr 2003 18:19:29 -0700 (PDT) Message-Id: <200305010119.h411JTdA062309@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 30218 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 01:19:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30218 Change 30218 by peter@peter_daintree on 2003/04/30 18:19:03 fix mismerge Affected files ... .. //depot/projects/hammer/sys/boot/Makefile#5 edit Differences ... ==== //depot/projects/hammer/sys/boot/Makefile#5 (text+ko) ==== @@ -5,11 +5,6 @@ MACHINE=i386 .endif -.if ${MACHINE_ARCH} == "amd64" -MACHINE_ARCH=i386 -MACHINE=i386 -.endif - .if !defined(NOFORTH) # Build the add-in FORTH interpreter SUBDIR+= ficl From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:26:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 065A837B404; Wed, 30 Apr 2003 18:26:41 -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 93C7D37B401 for ; Wed, 30 Apr 2003 18:26:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C57743FCB for ; Wed, 30 Apr 2003 18:26:40 -0700 (PDT) (envelope-from marcel@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 h411Qd0U068651 for ; Wed, 30 Apr 2003 18:26:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411Qdff068646 for perforce@freebsd.org; Wed, 30 Apr 2003 18:26:39 -0700 (PDT) Date: Wed, 30 Apr 2003 18:26:39 -0700 (PDT) Message-Id: <200305010126.h411Qdff068646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30220 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 01:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30220 Change 30220 by marcel@marcel_nfs on 2003/04/30 18:26:12 Diff reduction: revert renaming in0 to r32 for EPC. Affected files ... .. //depot/projects/ia64/lib/libc/ia64/sys/brk.S#4 edit .. //depot/projects/ia64/lib/libc/ia64/sys/sbrk.S#5 edit Differences ... ==== //depot/projects/ia64/lib/libc/ia64/sys/brk.S#4 (text+ko) ==== @@ -44,12 +44,12 @@ add r14=@ltoff(minbrk),gp ;; ld8 r14=[r14] ;; ld8 r14=[r14] ;; - cmp.ltu p6,p0=r32,r14 ;; -(p6) mov r32=r14 + cmp.ltu p6,p0=in0,r14 ;; +(p6) mov in0=r14 CALLSYS_ERROR(break) add r14=@ltoff(curbrk),gp ;; ld8 r14=[r14] ;; - st8 [r14]=r32 + st8 [r14]=in0 mov ret0=0 br.ret.sptk.few rp END(brk) ==== //depot/projects/ia64/lib/libc/ia64/sys/sbrk.S#5 (text+ko) ==== @@ -43,18 +43,18 @@ add r14 = @ltoff(curbrk), gp ;; ld8 r14 = [r14] - cmp.eq p6, p0 = r32, r0 + cmp.eq p6, p0 = in0, r0 ;; ld8 ret0 = [r14] (p6) br.ret.sptk.few rp ;; - add r32 = ret0, r32 + add in0 = ret0, in0 CALLSYS_ERROR(break) add r14 = @ltoff(curbrk), gp ;; ld8 r14 = [r14] ;; ld8 ret0 = [r14] - st8 [r14] = r32 + st8 [r14] = in0 br.ret.sptk.few rp END(sbrk) From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:28:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7BE437B405; Wed, 30 Apr 2003 18:28:43 -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 8C41637B404 for ; Wed, 30 Apr 2003 18:28:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2389F43FB1 for ; Wed, 30 Apr 2003 18:28:43 -0700 (PDT) (envelope-from jmallett@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 h411Sg0U069639 for ; Wed, 30 Apr 2003 18:28:42 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411Sgg7069634 for perforce@freebsd.org; Wed, 30 Apr 2003 18:28:42 -0700 (PDT) Date: Wed, 30 Apr 2003 18:28:42 -0700 (PDT) Message-Id: <200305010128.h411Sgg7069634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30221 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 01:28:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=30221 Change 30221 by jmallett@jmallett_dalek on 2003/04/30 18:27:49 Take a hint from Peter. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/param.h#6 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/param.h#6 (text+ko) ==== @@ -44,7 +44,6 @@ #define _SGIMIPS_PARAM_H_ #define MACHINE "sgimips" -#define MID_MACHINE MID_MIPS /* * Yes we have no SMP. From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:31:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 056CD37B405; Wed, 30 Apr 2003 18:31:49 -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 ABA6637B401 for ; Wed, 30 Apr 2003 18:31:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20A0E43FB1 for ; Wed, 30 Apr 2003 18:31:48 -0700 (PDT) (envelope-from jmallett@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 h411Vl0U071857 for ; Wed, 30 Apr 2003 18:31:47 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411VlJt071849 for perforce@freebsd.org; Wed, 30 Apr 2003 18:31:47 -0700 (PDT) Date: Wed, 30 Apr 2003 18:31:47 -0700 (PDT) Message-Id: <200305010131.h411VlJt071849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30223 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 01:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30223 Change 30223 by jmallett@jmallett_dalek on 2003/04/30 18:31:10 Zero-extend PHYS_MASK (bogus..), add KSEG2 conversion macros. Affected files ... .. //depot/projects/mips/sys/mips/include/cpuregs.h#6 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpuregs.h#6 (text+ko) ==== @@ -82,12 +82,14 @@ #define MIPS_MAX_MEM_ADDR 0xbe000000 #define MIPS_RESERVED_ADDR 0xbfc80000 -#define MIPS_PHYS_MASK 0x1fffffff +#define MIPS_PHYS_MASK 0x000000001fffffff #define MIPS_KSEG0_TO_PHYS(x) ((unsigned)(x) & MIPS_PHYS_MASK) #define MIPS_PHYS_TO_KSEG0(x) ((unsigned)(x) | MIPS_KSEG0_START) #define MIPS_KSEG1_TO_PHYS(x) ((unsigned)(x) & MIPS_PHYS_MASK) #define MIPS_PHYS_TO_KSEG1(x) ((unsigned)(x) | MIPS_KSEG1_START) +#define MIPS_KSEG2_TO_PHYS(x) ((unsigned)(x) & MIPS_PHYS_MASK) +#define MIPS_PHYS_TO_KSEG2(x) ((unsigned)(x) | MIPS_KSEG2_START) /* Map virtual address to index in mips3 r4k virtually-indexed cache */ #define MIPS3_VA_TO_CINDEX(x) \ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:34:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A03E37B404; Wed, 30 Apr 2003 18:34:54 -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 5A99237B401 for ; Wed, 30 Apr 2003 18:34:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFF5443FE1 for ; Wed, 30 Apr 2003 18:34:52 -0700 (PDT) (envelope-from marcel@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 h411Yq0U074765 for ; Wed, 30 Apr 2003 18:34:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411YquA074758 for perforce@freebsd.org; Wed, 30 Apr 2003 18:34:52 -0700 (PDT) Date: Wed, 30 Apr 2003 18:34:52 -0700 (PDT) Message-Id: <200305010134.h411YquA074758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30224 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 01:34:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30224 Change 30224 by marcel@marcel_nfs on 2003/04/30 18:34:33 Diff reduction: sync rcsid Affected files ... .. //depot/projects/ia64/lib/libthr/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libthr/arch/ia64/ia64/_curthread.c#3 integrate Differences ... ==== //depot/projects/ia64/lib/libthr/arch/ia64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.1 2003/04/20 03:06:42 marcel Exp $ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/ia64/lib/libthr/arch/ia64/ia64/_curthread.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthr/arch/ia64/ia64/_curthread.c,v 1.1 2003/04/20 03:06:42 marcel Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Wed Apr 30 18:55:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 284DF37B404; Wed, 30 Apr 2003 18:55:20 -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 D15C037B401 for ; Wed, 30 Apr 2003 18:55:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B2AA43FBD for ; Wed, 30 Apr 2003 18:55:19 -0700 (PDT) (envelope-from marcel@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 h411tJ0U089285 for ; Wed, 30 Apr 2003 18:55:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411tI5l089278 for perforce@freebsd.org; Wed, 30 Apr 2003 18:55:18 -0700 (PDT) Date: Wed, 30 Apr 2003 18:55:18 -0700 (PDT) Message-Id: <200305010155.h411tI5l089278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30227 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 01:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=30227 Change 30227 by marcel@marcel_nfs on 2003/04/30 18:54:42 Diff reduction: revert EPC specific change on this branch Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/exception.s#20 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/exception.s#20 (text+ko) ==== @@ -31,7 +31,7 @@ #include /* - * ar.k7 = address of gateway page + * ar.k7 = curthread * ar.k6 = ksp * ar.k5 = kbsp * ar.k4 = pcpup From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:01:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DD1237B404; Wed, 30 Apr 2003 19:01: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 CF93A37B401 for ; Wed, 30 Apr 2003 19:01:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA6143FCB for ; Wed, 30 Apr 2003 19:01:28 -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 h4121S0U092678 for ; Wed, 30 Apr 2003 19:01:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4121Rkk092670 for perforce@freebsd.org; Wed, 30 Apr 2003 19:01:27 -0700 (PDT) Date: Wed, 30 Apr 2003 19:01:27 -0700 (PDT) Message-Id: <200305010201.h4121Rkk092670@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 30229 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 02:01:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30229 Change 30229 by peter@peter_daintree on 2003/04/30 19:00:59 IFC @30228 Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#4 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#12 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumkw.h#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumlock.c#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinummemory.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumparser.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumraid5.c#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumutil.c#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#11 integrate Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#4 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#5 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/dev/vinum/vinum.c#3 (text+ko) ==== @@ -35,8 +35,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinum.c,v 1.34 2001/05/22 04:07:22 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.55 2003/03/08 08:01:30 phk Exp $ + * $Id: vinum.c,v 1.41 2003/04/28 06:15:36 grog Exp grog $ + * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.56 2003/05/01 01:28:42 grog Exp $ */ #define STATIC static /* nothing while we're testing XXX */ @@ -54,23 +54,21 @@ struct cdevsw vinum_cdevsw = { - .d_open = vinumopen, - .d_close = vinumclose, - .d_read = physread, - .d_write = physwrite, - .d_ioctl = vinumioctl, - .d_strategy = vinumstrategy, - .d_name = "vinum", - .d_maj = VINUM_CDEV_MAJOR, - .d_flags = D_DISK + .d_open = vinumopen, + .d_close = vinumclose, + .d_read = physread, + .d_write = physwrite, + .d_ioctl = vinumioctl, + .d_strategy = vinumstrategy, + .d_name = "vinum", + .d_maj = VINUM_CDEV_MAJOR, + .d_flags = D_DISK }; /* Called by main() during pseudo-device attachment. */ -STATIC void vinumattach(void *); - +void vinumattach(void *); STATIC int vinum_modevent(module_t mod, modeventtype_t type, void *unused); - -STATIC void vinum_clone(void *arg, char *name, int namelen, dev_t *dev); +STATIC void vinum_clone(void *arg, char *name, int namelen, dev_t * dev); struct _vinum_conf vinum_conf; /* configuration information */ @@ -90,8 +88,7 @@ int i, rv; char *cp, *cp1, *cp2, **drives, *drivep; size_t alloclen; - - /* modload should prevent multiple loads, so this is worth a panic */ +/* modload should prevent multiple loads, so this is worth a panic */ if ((vinum_conf.flags & VF_LOADED) != 0) panic("vinum: already loaded"); @@ -106,13 +103,13 @@ dqend = NULL; vinum_daemon_dev = make_dev(&vinum_cdevsw, - VINUM_DAEMON_DEV, + VINUM_DAEMON_MINOR, UID_ROOT, GID_WHEEL, S_IRUSR | S_IWUSR, "vinum/controld"); vinum_super_dev = make_dev(&vinum_cdevsw, - VINUM_SUPERDEV, + VINUM_SUPERDEV_MINOR, UID_ROOT, GID_WHEEL, S_IRUSR | S_IWUSR, @@ -147,12 +144,11 @@ bzero(SD, sizeof(struct sd) * INITIAL_SUBDISKS); vinum_conf.subdisks_allocated = INITIAL_SUBDISKS; /* number of sd slots allocated */ vinum_conf.subdisks_used = 0; /* and number in use */ - dev_clone_tag = EVENTHANDLER_REGISTER(dev_clone, vinum_clone, 0, 1000); /* - * See if the loader has passed us any of the - * autostart options. + * See if the loader has passed us any of the autostart + * options. */ cp = drivep = NULL; #ifndef VINUM_AUTOSTART @@ -160,50 +156,47 @@ freeenv(cp); cp = NULL; #endif - rv = kernel_sysctlbyname(&thread0, "kern.disks", - NULL, NULL, - NULL, 0, - &alloclen); + + rv = kernel_sysctlbyname(&thread0, "kern.disks", NULL, + NULL, NULL, 0, &alloclen); if (rv) log(LOG_NOTICE, - "sysctlbyname(\"kern.disks\") failed, rv = %d\n", + "sysctlbyname (\"kern.disks\") failed, rv = %d\n", rv); else { - drivep = malloc(alloclen, M_TEMP, 0 /* M_WAITOK */); - (void)kernel_sysctlbyname(&thread0, "kern.disks", - drivep, &alloclen, - NULL, 0, - NULL); + drivep = malloc(alloclen, M_TEMP, M_WAITOK); + kernel_sysctlbyname(&thread0, "kern.disks", drivep, + &alloclen, NULL, 0, NULL); goto start; } #ifndef VINUM_AUTOSTART } else #endif - if ((cp = getenv("vinum.drives")) != NULL) { - start: - for (cp1 = cp? cp: drivep, i = 0, drives = 0; - *cp1 != '\0'; - i++) { - cp2 = cp1; - while (*cp1 != '\0' && *cp1 != ',' && *cp1 != ' ') - cp1++; - if (*cp1 != '\0') - *cp1++ = '\0'; - drives = realloc(drives, - (unsigned long)((i + 1) * sizeof(char *)), - M_TEMP, 0 /* M_WAITOK */); - drives[i] = cp2; - } - if (i == 0) - goto bailout; + if ((cp = getenv("vinum.drives")) != NULL) { + start: + for (cp1 = cp ? cp : drivep, i = 0, drives = 0; + *cp1 != '\0'; + i++) { + cp2 = cp1; + while (*cp1 != '\0' && *cp1 != ',' && *cp1 != ' ') + cp1++; + if (*cp1 != '\0') + *cp1++ = '\0'; + + drives = realloc(drives, + (unsigned long) ((i + 1) * sizeof(char *)), + M_TEMP, M_WAITOK); + drives[i] = cp2; + } + if (i != 0) { rv = vinum_scandisk(drives, i); if (rv) log(LOG_NOTICE, "vinum_scandisk() returned %d\n", rv); - bailout: - freeenv(cp); - free(drives, M_TEMP); - free(drivep, M_TEMP); } + freeenv(cp); + free(drives, M_TEMP); + free(drivep, M_TEMP); + } } /* @@ -291,6 +284,7 @@ Free(VOL); } bzero(&vinum_conf, sizeof(vinum_conf)); + vinum_conf.version = VINUMVERSION; /* reinstate version number */ } STATIC int @@ -375,6 +369,23 @@ /* First, decide what we're looking at */ switch (DEVTYPE(dev)) { case VINUM_VOLUME_TYPE: + /* + * The super device and daemon device are the last two + * volume numbers, so check for them first. + */ + if ((devminor == VINUM_DAEMON_MINOR) /* daemon device */ + ||(devminor == VINUM_SUPERDEV_MINOR)) { /* or normal super device */ + error = suser(td); /* are we root? */ + + if (error == 0) { /* yes, can do */ + if (devminor == VINUM_DAEMON_MINOR) /* daemon device */ + vinum_conf.flags |= VF_DAEMONOPEN; /* we're open */ + else /* superdev */ + vinum_conf.flags |= VF_OPEN; /* we're open */ + } + return error; + } + /* Must be a real volume. Check. */ index = Volno(dev); if (index >= vinum_conf.volumes_allocated) return ENXIO; /* no such device */ @@ -397,19 +408,16 @@ } case VINUM_PLEX_TYPE: - if (Volno(dev) >= vinum_conf.volumes_allocated) - return ENXIO; - /* FALLTHROUGH */ - - case VINUM_RAWPLEX_TYPE: index = Plexno(dev); /* get plex index in vinum_conf */ if (index >= vinum_conf.plexes_allocated) return ENXIO; /* no such device */ plex = &PLEX[index]; switch (plex->state) { + case plex_unallocated: + return ENXIO; + case plex_referenced: - case plex_unallocated: return EINVAL; default: @@ -418,51 +426,31 @@ } case VINUM_SD_TYPE: - if ((Volno(dev) >= vinum_conf.volumes_allocated) /* no such volume */ - ||(Plexno(dev) >= vinum_conf.plexes_allocated)) /* or no such plex */ - return ENXIO; /* no such device */ - - /* FALLTHROUGH */ - - case VINUM_RAWSD_TYPE: + case VINUM_SD2_TYPE: index = Sdno(dev); /* get the subdisk number */ - if ((index >= vinum_conf.subdisks_allocated) /* not a valid SD entry */ - ||(SD[index].state < sd_init)) /* or SD is not real */ + if (index >= vinum_conf.subdisks_allocated) /* not a valid SD entry */ return ENXIO; /* no such device */ sd = &SD[index]; /* - * Opening a subdisk is always a special operation, so we - * ignore the state as long as it represents a real subdisk + * Opening a subdisk is always a special operation, so + * we ignore the state as long as it represents a real + * subdisk. */ switch (sd->state) { case sd_unallocated: + return ENXIO; + case sd_uninit: + case sd_referenced: return EINVAL; default: sd->flags |= VF_OPEN; /* note we're open */ return 0; } - - case VINUM_SUPERDEV_TYPE: - error = suser(td); /* are we root? */ - if (error == 0) { /* yes, can do */ - if (devminor == VINUM_DAEMON_DEV) /* daemon device */ - vinum_conf.flags |= VF_DAEMONOPEN; /* we're open */ - else if (devminor == VINUM_SUPERDEV) - vinum_conf.flags |= VF_OPEN; /* we're open */ - else - error = ENODEV; /* nothing, maybe a debug mismatch */ - } - return error; - - /* Vinum drives are disks. We already have a disk - * driver, so don't handle them here */ - case VINUM_DRIVE_TYPE: - default: - return ENODEV; /* don't know what to do with these */ } + return 0; /* to keep the compiler happy */ } /* ARGSUSED */ @@ -477,10 +465,30 @@ int devminor; devminor = minor(dev); - index = Volno(dev); /* First, decide what we're looking at */ switch (DEVTYPE(dev)) { case VINUM_VOLUME_TYPE: + /* + * The super device and daemon device are the last two + * volume numbers, so check for them first. + */ + if ((devminor == VINUM_DAEMON_MINOR) /* daemon device */ + ||(devminor == VINUM_SUPERDEV_MINOR)) { /* or normal super device */ + /* + * don't worry about whether we're root: + * nobody else would get this far. + */ + if (devminor == VINUM_SUPERDEV_MINOR) /* normal superdev */ + vinum_conf.flags &= ~VF_OPEN; /* no longer open */ + else { /* the daemon device */ + vinum_conf.flags &= ~VF_DAEMONOPEN; /* no longer open */ + if (vinum_conf.flags & VF_STOPPING) /* we're trying to stop, */ + wakeup(&vinumclose); /* we can continue now */ + } + return 0; + } + /* Real volume */ + index = Volno(dev); if (index >= vinum_conf.volumes_allocated) return ENXIO; /* no such device */ vol = &VOL[index]; @@ -506,65 +514,37 @@ return ENXIO; /* FALLTHROUGH */ - case VINUM_RAWPLEX_TYPE: - index = Plexno(dev); /* get plex index in vinum_conf */ - if (index >= vinum_conf.plexes_allocated) - return ENXIO; /* no such device */ - PLEX[index].flags &= ~VF_OPEN; /* reset our flags */ - return 0; - case VINUM_SD_TYPE: if ((Volno(dev) >= vinum_conf.volumes_allocated) || /* no such volume */ (Plexno(dev) >= vinum_conf.plexes_allocated)) /* or no such plex */ return ENXIO; /* no such device */ /* FALLTHROUGH */ - case VINUM_RAWSD_TYPE: - index = Sdno(dev); /* get the subdisk number */ - if (index >= vinum_conf.subdisks_allocated) - return ENXIO; /* no such device */ - SD[index].flags &= ~VF_OPEN; /* reset our flags */ - return 0; - - case VINUM_SUPERDEV_TYPE: - /* - * don't worry about whether we're root: - * nobody else would get this far. - */ - if (devminor == VINUM_SUPERDEV) /* normal superdev */ - vinum_conf.flags &= ~VF_OPEN; /* no longer open */ - else if (devminor == VINUM_DAEMON_DEV) { /* the daemon device */ - vinum_conf.flags &= ~VF_DAEMONOPEN; /* no longer open */ - if (vinum_conf.flags & VF_STOPPING) /* we're stopping, */ - wakeup(&vinumclose); /* we can continue stopping now */ - } - return 0; - - case VINUM_DRIVE_TYPE: default: return ENODEV; /* don't know what to do with these */ } } void -vinum_clone(void *arg, char *name, int namelen, dev_t *dev) +vinum_clone(void *arg, char *name, int namelen, dev_t * dev) { - struct volume *vol; - int i; + struct volume *vol; + int i; - if (*dev != NODEV) - return; - if (strncmp(name, "vinum/", sizeof("vinum/") - 1) != 0) - return; + if (*dev != NODEV) + return; + if (strncmp(name, "vinum/", sizeof("vinum/") - 1) != 0) + return; - name += sizeof("vinum/") - 1; - if ((i = find_volume(name, 0)) == -1) - return; + name += sizeof("vinum/") - 1; + if ((i = find_volume(name, 0)) == -1) + return; - vol = &VOL[i]; - *dev = vol->dev; + vol = &VOL[i]; + *dev = vol->dev; } + /* Local Variables: */ -/* fill-column: 50 */ +/* fill-column: 60 */ /* End: */ ==== //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#4 (text+ko) ==== @@ -1,15 +1,3 @@ -/* - * To do: - * - * Don't store drive configuration on the config DB: read each drive's header - * to decide where it is. - * - * Accept any old crap in the config_ functions, and complain when - * we try to bring it up. - * - * When trying to bring volumes up, check that the complete address range - * is covered. - */ /*- * Copyright (c) 1997, 1998 * Nan Yang Computer Services Limited. All rights reserved. @@ -45,8 +33,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumconfig.c,v 1.30 2000/05/01 09:45:50 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.53 2003/01/16 23:47:04 joerg Exp $ + * $Id: vinumconfig.c,v 1.38 2003/04/28 02:54:07 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.54 2003/05/01 01:29:24 grog Exp $ */ #define STATIC static @@ -85,10 +73,11 @@ #define MSG_MAX 1024 /* maximum length of a formatted message */ /* - * Format an error message and return to the user in the reply. - * CARE: This routine is designed to be called only from the - * configuration routines, so it assumes it's the owner of - * the configuration lock, and unlocks it on exit + * Format an error message and return to the user + * in the reply. CARE: This routine is designed + * to be called only from the configuration + * routines, so it assumes it's the owner of the + * configuration lock, and unlocks it on exit. */ void throw_rude_remark(int error, char *msg,...) @@ -99,8 +88,8 @@ static int finishing; /* don't recurse */ int was_finishing; - if ((vinum_conf.flags & VF_LOCKED) == 0) /* bug catcher */ - panic ("throw_rude_remark: called without config lock"); + if ((vinum_conf.flags & VF_LOCKED) == 0) /* bug catcher */ + panic("throw_rude_remark: called without config lock"); va_start(ap, msg); if ((ioctl_reply != NULL) /* we're called from the user */ &&(!(vinum_conf.flags & VF_READING_CONFIG))) { /* and not reading from disk: return msg */ @@ -139,9 +128,9 @@ /* * We have a problem here: we want to unlock the * configuration, which implies tidying up, but - * if we find an error while tidying up, we could - * recurse for ever. Use this kludge to only try - * once + * if we find an error while tidying up, we + * could recurse for ever. Use this kludge to + * only try once. */ was_finishing = finishing; finishing = 1; @@ -472,7 +461,7 @@ bzero(drive, sizeof(struct drive)); drive->driveno = driveno; /* put number in structure */ drive->flags |= VF_NEWBORN; /* newly born drive */ - strcpy("unknown", drive->devicename); /* and make the name ``unknown'' */ + strcpy(drive->devicename, "unknown"); /* and make the name ``unknown'' */ return driveno; /* return the index */ } @@ -519,7 +508,7 @@ * Otherwise the same as find_drive above */ int -find_drive_by_dev(const char *devname, int create) +find_drive_by_name(const char *devname, int create) { int driveno; struct drive *drive; @@ -562,6 +551,11 @@ * We've run out of space. sdno is pointing * where we want it, but at the moment we * don't have the space. Get it. + * + * XXX We should check for overflow here. We + * shouldn't allocate more than VINUM_MAXSD + * subdisks (currently at least a quarter of a + * million). */ EXPAND(SD, struct sd, vinum_conf.subdisks_allocated, INITIAL_SUBDISKS); @@ -814,7 +808,7 @@ Free(plex->sdnos); if (plex->lock) Free(plex->lock); - if (isstriped (plex)) + if (isstriped(plex)) mtx_destroy(&plex->lockmtx); destroy_dev(plex->dev); bzero(plex, sizeof(struct plex)); /* and clear it out */ @@ -927,7 +921,7 @@ switch (get_keyword(token[parameter], &keyword_set)) { case kw_device: parameter++; - otherdriveno = find_drive_by_dev(token[parameter], 0); /* see if it exists already */ + otherdriveno = find_drive_by_name(token[parameter], 0); /* see if it exists already */ if (otherdriveno >= 0) { /* yup, */ drive->state = drive_unallocated; /* deallocate the drive */ throw_rude_remark(EEXIST, /* and complain */ @@ -1231,10 +1225,18 @@ throw_rude_remark(EINVAL, "sd %s has no length spec", sd->name); if (sd->dev == NULL) - sd->dev = make_dev(&vinum_cdevsw, VINUMRMINOR(sdno, VINUM_RAWSD_TYPE), + /* + * sdno can (at least theoretically) overflow + * into the low order bit of the type field. + * This gives rise to a subdisk with type + * VINUM_SD2_TYPE. This is a feature, not a + * bug. + */ + sd->dev = make_dev(&vinum_cdevsw, + VINUMMINOR(sdno, VINUM_SD_TYPE), UID_ROOT, GID_OPERATOR, - S_IRUSR | S_IWUSR | S_IRGRP, + S_IRUSR | S_IWUSR | S_IRGRP, "vinum/sd/%s", sd->name); if (state != sd_unallocated) /* we had a specific state to set */ @@ -1425,14 +1427,14 @@ plex->state = state; /* set whatever state we chose */ vinum_conf.plexes_used++; /* one more in use */ if (plex->dev == NULL) - plex->dev = make_dev(&vinum_cdevsw, - VINUMRMINOR(plexno, VINUM_RAWPLEX_TYPE), + plex->dev = make_dev(&vinum_cdevsw, + VINUMMINOR(plexno, VINUM_PLEX_TYPE), UID_ROOT, GID_OPERATOR, - S_IRUSR | S_IWUSR | S_IRGRP, - "vinum/plex/%s", - plex->name); - } + S_IRUSR | S_IWUSR | S_IRGRP, + "vinum/plex/%s", + plex->name); +} /* * Handle a volume definition. @@ -1561,13 +1563,13 @@ vol->size = max(vol->size, PLEX[vol->plex[i]].length); vinum_conf.volumes_used++; /* one more in use */ if (vol->dev == NULL) - vol->dev = make_dev(&vinum_cdevsw, - VINUMRMINOR(volno, VINUM_VOLUME_TYPE), - UID_ROOT, - GID_OPERATOR, - S_IRUSR | S_IWUSR | S_IRGRP, - "vinum/%s", - vol->name); + vol->dev = make_dev(&vinum_cdevsw, + VINUMMINOR(volno, VINUM_VOLUME_TYPE), + UID_ROOT, + GID_OPERATOR, + S_IRUSR | S_IWUSR | S_IRGRP, + "vinum/%s", + vol->name); } /* ==== //depot/projects/hammer/sys/dev/vinum/vinumext.h#4 (text+ko) ==== @@ -33,8 +33,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumext.h,v 1.27 2001/05/22 04:07:22 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.36 2003/03/02 14:42:52 phk Exp $ + * $Id: vinumext.h,v 1.31 2003/04/25 08:01:37 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumext.h,v 1.37 2003/05/01 01:29:52 grog Exp $ */ /* vinumext.h: external definitions */ @@ -84,7 +84,7 @@ int my_sd(int plexno, int sdno); int get_empty_drive(void); int find_drive(const char *name, int create); -int find_drive_by_dev(const char *devname, int create); +int find_drive_by_name(const char *devname, int create); int get_empty_sd(void); int find_subdisk(const char *name, int create); void return_drive_space(int driveno, int64_t offset, int length); @@ -126,7 +126,6 @@ /* void throw_rude_remark (int, struct _ioctl_reply *, char *, ...); XXX */ void throw_rude_remark(int, char *,...); -/* XXX die die */ void format_config(char *config, int len); void checkkernel(char *op); void free_drive(struct drive *drive); @@ -141,6 +140,7 @@ d_strategy_t vinumstrategy; d_ioctl_t vinumioctl; +int vinum_super_ioctl(dev_t, u_long, caddr_t); int vinumstart(struct buf *bp, int reviveok); int launch_requests(struct request *rq, int reviveok); void sdio(struct buf *bp); ==== //depot/projects/hammer/sys/dev/vinum/vinumio.c#5 (text+ko) ==== @@ -33,8 +33,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumio.c,v 1.32 2001/05/23 23:03:45 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.81 2003/02/22 09:36:40 phk Exp $ + * $Id: vinumio.c,v 1.36 2003/04/28 02:54:07 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.82 2003/05/01 01:30:31 grog Exp $ */ #include @@ -44,8 +44,8 @@ static int drivecmp(const void *va, const void *vb); /* - * Open the device associated with the drive, and set drive's vp. - * Return an error number + * Open the device associated with the drive, and + * set drive's vp. Return an error number. */ int open_drive(struct drive *drive, struct thread *td, int verbose) @@ -81,8 +81,8 @@ } /* - * Set some variables in the drive struct - * in more convenient form. Return error indication + * Set some variables in the drive struct in more + * convenient form. Return error indication. */ int set_drive_parms(struct drive *drive) @@ -93,8 +93,8 @@ /* Now update the label part */ bcopy(hostname, drive->label.sysname, VINUMHOSTNAMELEN); /* put in host name */ - getmicrotime(&drive->label.date_of_birth); /* and current time */ - drive->label.drive_size = drive->mediasize; + microtime(&drive->label.date_of_birth); /* and current time */ + drive->label.drive_size = drive->mediasize; /* size of the drive in bytes */ #ifdef VINUMDEBUG if (debug & DEBUG_BIGDRIVE) /* pretend we're 100 times as big */ drive->label.drive_size *= 100; @@ -128,8 +128,8 @@ } /* - * Initialize a drive: open the device and add device - * information + * Initialize a drive: open the device and add + * device information. */ int init_drive(struct drive *drive, int verbose) @@ -145,35 +145,20 @@ FREAD, curthread); if (drive->lasterror == 0) - drive->lasterror = (*devsw(drive->dev)->d_ioctl) (drive->dev, - DIOCGMEDIASIZE, - (caddr_t) & drive->mediasize, - FREAD, - curthread); + drive->lasterror = (*devsw(drive->dev)->d_ioctl) (drive->dev, + DIOCGMEDIASIZE, + (caddr_t) & drive->mediasize, + FREAD, + curthread); if (drive->lasterror) { if (verbose) - log(LOG_WARNING, - "vinum open_drive %s: Can't get partition information, drive->lasterror %d\n", + log(LOG_ERR, + "vinum: Can't get partition information for %s: error %d\n", drive->devicename, drive->lasterror); close_drive(drive); return drive->lasterror; } -#if 0 - /* - * XXX: this check is bogus and needs to be rewitten, we cannot guarantee - * XXX: that there will be a label with a typefield on all platforms. - */ - if (drive->partinfo.part->p_fstype != FS_VINUM) { /* not Vinum */ - drive->lasterror = EFTYPE; - if (verbose) - log(LOG_WARNING, - "vinum open_drive %s: Wrong partition type for vinum\n", - drive->devicename); - close_drive(drive); - return EFTYPE; - } -#endif return set_drive_parms(drive); /* set various odds and ends */ } @@ -246,7 +231,7 @@ * length and offset are in bytes, but must be multiples of sector * size. The function *does not check* for this condition, and * truncates ruthlessly. - * Return error number + * Return error number. */ int driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag) @@ -262,7 +247,7 @@ bp->b_flags = 0; bp->b_iocmd = flag; bp->b_dev = drive->dev; /* device */ - bp->b_blkno = offset / drive->sectorsize; /* block number */ + bp->b_blkno = offset / drive->sectorsize; /* block number */ bp->b_saveaddr = bp->b_data; bp->b_data = buf; bp->b_bcount = len; @@ -348,7 +333,7 @@ int i; struct drive *drive; - driveno = find_drive_by_dev(devicename, 1); /* if entry doesn't exist, create it */ + driveno = find_drive_by_name(devicename, 1); /* if entry doesn't exist, create it */ drive = &vinum_conf.drive[driveno]; /* and get a pointer */ if (read_drive_label(drive, 0) == DL_OURS) { /* one of ours */ @@ -528,7 +513,7 @@ /* * issue a save config request to the dæmon. The actual work - * is done in process context by daemon_save_config + * is done in process context by daemon_save_config. */ void save_config(void) @@ -538,7 +523,7 @@ /* * Write the configuration to all vinum slices. This - * is performed by the dæmon only + * is performed by the daemon only. */ void daemon_save_config(void) @@ -573,7 +558,7 @@ /* * First, do some drive consistency checks. Some * of these are kludges, others require a process - * context and couldn't be done before + * context and couldn't be done before. */ if ((drive->devicename[0] == '\0') || (drive->label.name[0] == '\0')) { @@ -592,17 +577,26 @@ unlockdrive(drive); close_drive(drive); /* close it */ } else if (drive->state > drive_down) { - getmicrotime(&drive->label.last_update); /* time of last update is now */ + microtime(&drive->label.last_update); /* time of last update is now */ bcopy((char *) &drive->label, /* and the label info from the drive structure */ (char *) &vhdr->label, sizeof(vhdr->label)); if ((drive->state != drive_unallocated) && (drive->state != drive_referenced)) { /* and it's a real drive */ - error = write_drive(drive, (char *) vhdr, VINUMHEADERLEN, VINUM_LABEL_OFFSET); + error = write_drive(drive, + (char *) vhdr, + VINUMHEADERLEN, + VINUM_LABEL_OFFSET); + if (error == 0) /* first config copy */ + error = write_drive(drive, + config, + MAXCONFIG, + VINUM_CONFIG_OFFSET); if (error == 0) - error = write_drive(drive, config, MAXCONFIG, VINUM_CONFIG_OFFSET); /* first config copy */ - if (error == 0) - error = write_drive(drive, config, MAXCONFIG, VINUM_CONFIG_OFFSET + MAXCONFIG); /* second copy */ + error = write_drive(drive, /* second copy */ + config, + MAXCONFIG, + VINUM_CONFIG_OFFSET + MAXCONFIG); unlockdrive(drive); if (error) { log(LOG_ERR, @@ -632,8 +626,8 @@ */ /* - * get_volume_label returns a label structure to lp, which - * is allocated by the caller + * get_volume_label returns a label structure to + * lp, which is allocated by the caller. */ void get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp) @@ -659,8 +653,7 @@ lp->d_secperunit = size; /* data sectors per unit */ lp->d_bbsize = BBSIZE; - lp->d_sbsize = 0; - + lp->d_sbsize = 0; /* no longer used? */ lp->d_magic = DISKMAGIC; lp->d_magic2 = DISKMAGIC; @@ -722,14 +715,6 @@ *dlp = *lp; bp->b_flags &= ~B_INVAL; bp->b_iocmd = BIO_WRITE; - - /* - * This should read: - * - * vinumstrategy (bp); - * - * Negotiate with phk to get it fixed. - */ DEV_STRATEGY(bp); error = bufwait(bp); bp->b_flags |= B_INVAL | B_AGE; @@ -739,7 +724,7 @@ return error; } -/* Look at all disks on the system for vinum slices */ +/* Look at all disks on the system for vinum slices. */ int vinum_scandisk(char *devicename[], int drives) { @@ -836,10 +821,9 @@ return ENOENT; } /* - * We now have at least one drive - * open. Sort them in order of config time - * and merge the config info with what we - * have already. + * We now have at least one drive open. Sort + * them in order of config time and merge the + * config info with what we have already. */ qsort(drivelist, gooddrives, sizeof(int), drivecmp); config_text = (char *) Malloc(MAXCONFIG * 2); /* allocate buffers */ @@ -887,10 +871,12 @@ parse_status = parse_config(config_line, &keyword_set, 1); /* parse the config line */ if (parse_status < 0) { /* error in config */ /* - * This config should have been parsed in user - * space. If we run into problems here, something - * serious is afoot. Complain and let the user - * snarf the config to see what's wrong. + * This config should have been parsed + * in user space. If we run into + * problems here, something serious is + * afoot. Complain and let the user + * snarf the config to see what's + * wrong. */ log(LOG_ERR, "vinum: Config error on %s, aborting integration\n", ==== //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#5 (text+ko) ==== @@ -41,8 +41,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumioctl.c,v 1.14 2000/10/27 03:07:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.41 2003/02/22 09:36:40 phk Exp $ + * $Id: vinumioctl.c,v 1.20 2003/04/28 02:54:43 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.42 2003/05/01 01:30:59 grog Exp $ */ #include @@ -69,345 +69,344 @@ struct thread *td) { unsigned int objno; - int error = 0; struct sd *sd; struct plex *plex; struct volume *vol; - unsigned int index; /* for transferring config info */ - unsigned int sdno; /* for transferring config info */ - int fe; /* free list element number */ - struct _ioctl_reply *ioctl_reply = (struct _ioctl_reply *) data; /* struct to return */ /* First, decide what we're looking at */ - switch (DEVTYPE(dev)) { - case VINUM_SUPERDEV_TYPE: /* ordinary super device */ - ioctl_reply = (struct _ioctl_reply *) data; /* save the address to reply to */ - switch (cmd) { -#ifdef VINUMDEBUG - case VINUM_DEBUG: - if (((struct debuginfo *) data)->changeit) /* change debug settings */ - debug = (((struct debuginfo *) data)->param); - else { - if (debug & DEBUG_REMOTEGDB) - boothowto |= RB_GDB; /* serial debug line */ - else - boothowto &= ~RB_GDB; /* local ddb */ - Debugger("vinum debug"); - } - ioctl_reply = (struct _ioctl_reply *) data; /* reinstate the address to reply to */ - ioctl_reply->error = 0; - return 0; -#endif + if ((minor(dev) == VINUM_SUPERDEV_MINOR) + || (minor(dev) == VINUM_DAEMON_MINOR)) + return vinum_super_ioctl(dev, cmd, data); + else /* real device */ + switch (DEVTYPE(dev)) { + case VINUM_SD_TYPE: + case VINUM_SD2_TYPE: /* second half of sd namespace */ + objno = Sdno(dev); + + sd = &SD[objno]; + + switch (cmd) { + case DIOCGDINFO: /* get disk label */ + get_volume_label(sd->name, 1, sd->sectors, (struct disklabel *) data); + break; + + /* + * We don't have this stuff on hardware, + * so just pretend to do it so that + * utilities don't get upset. + */ + case DIOCWDINFO: /* write partition info */ + case DIOCSDINFO: /* set partition info */ + return 0; /* not a titty */ - case VINUM_CREATE: /* create a vinum object */ - error = lock_config(); /* get the config for us alone */ - if (error) /* can't do it, */ - return error; /* give up */ - error = setjmp(command_fail); /* come back here on error */ - if (error == 0) /* first time, */ - ioctl_reply->error = parse_user_config((char *) data, /* update the config */ - &keyword_set); - else if (ioctl_reply->error == 0) { /* longjmp, but no error status */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:04:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 473F137B404; Wed, 30 Apr 2003 19:04: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 DCA4C37B401 for ; Wed, 30 Apr 2003 19:04:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8442C43FAF for ; Wed, 30 Apr 2003 19:04:32 -0700 (PDT) (envelope-from marcel@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 h4124W0U095652 for ; Wed, 30 Apr 2003 19:04:32 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4124WDE095649 for perforce@freebsd.org; Wed, 30 Apr 2003 19:04:32 -0700 (PDT) Date: Wed, 30 Apr 2003 19:04:32 -0700 (PDT) Message-Id: <200305010204.h4124WDE095649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30230 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 02:04:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30230 Change 30230 by marcel@marcel_nfs on 2003/04/30 19:03:36 Diff reduction: Remove EPC related code from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#65 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#65 (text+ko) ==== @@ -103,8 +103,6 @@ extern u_int64_t kernel_text[], _end[]; -extern u_int64_t ia64_gateway_page[]; - FPSWA_INTERFACE *fpswa_interface; u_int64_t ia64_pal_base; @@ -329,39 +327,6 @@ __asm __volatile("srlz.d"); } -void -map_gateway_page(void) -{ - struct ia64_pte pte; - u_int64_t psr; - - bzero(&pte, sizeof(pte)); - pte.pte_p = 1; - pte.pte_ma = PTE_MA_WB; - pte.pte_a = 1; - pte.pte_d = 1; - pte.pte_pl = PTE_PL_KERN; - pte.pte_ar = PTE_AR_X_RX; - pte.pte_ppn = IA64_RR_MASK((u_int64_t)ia64_gateway_page) >> 12; - - __asm __volatile("ptr.d %0,%1; ptr.i %0,%1" :: - "r"(VM_MAX_ADDRESS), "r"(PAGE_SHIFT << 2)); - - __asm __volatile("mov %0=psr" : "=r"(psr)); - __asm __volatile("rsm psr.ic|psr.i"); - __asm __volatile("srlz.i"); - __asm __volatile("mov cr.ifa=%0" :: "r"(VM_MAX_ADDRESS)); - __asm __volatile("mov cr.itir=%0" :: "r"(PAGE_SHIFT << 2)); - __asm __volatile("itr.d dtr[%0]=%1" :: "r"(3), "r"(*(u_int64_t*)&pte)); - __asm __volatile("srlz.d"); /* XXX not needed. */ - __asm __volatile("itr.i itr[%0]=%1" :: "r"(3), "r"(*(u_int64_t*)&pte)); - __asm __volatile("mov psr.l=%0" :: "r" (psr)); - __asm __volatile("srlz.i"); - - /* Expose the mapping to userland in ar.k7 */ - ia64_set_k7(VM_MAX_ADDRESS); -} - static void calculate_frequencies(void) { From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:05:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B445837B404; Wed, 30 Apr 2003 19:05:35 -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 3BCEA37B401 for ; Wed, 30 Apr 2003 19:05:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C904C43F3F for ; Wed, 30 Apr 2003 19:05:34 -0700 (PDT) (envelope-from marcel@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 h4125Y0U095768 for ; Wed, 30 Apr 2003 19:05:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4125XWt095765 for perforce@freebsd.org; Wed, 30 Apr 2003 19:05:33 -0700 (PDT) Date: Wed, 30 Apr 2003 19:05:33 -0700 (PDT) Message-Id: <200305010205.h4125XWt095765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30231 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 02:05:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30231 Change 30231 by marcel@marcel_nfs on 2003/04/30 19:04:54 Diff reduction: remove EPC related code from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#31 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#31 (text+ko) ==== @@ -89,7 +89,6 @@ map_pal_code(); map_port_space(); - map_gateway_page(); ia64_set_fpsr(IA64_FPSR_DEFAULT); From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:09:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25BF737B404; Wed, 30 Apr 2003 19:09:41 -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 CF1DC37B401 for ; Wed, 30 Apr 2003 19:09:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6546343FAF for ; Wed, 30 Apr 2003 19:09:40 -0700 (PDT) (envelope-from marcel@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 h4129e0U095879 for ; Wed, 30 Apr 2003 19:09:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4129dc0095876 for perforce@freebsd.org; Wed, 30 Apr 2003 19:09:39 -0700 (PDT) Date: Wed, 30 Apr 2003 19:09:39 -0700 (PDT) Message-Id: <200305010209.h4129dc0095876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30232 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 02:09:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30232 Change 30232 by marcel@marcel_nfs on 2003/04/30 19:08:50 Diff reduction: remove EPC related change from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/swtch.s#13 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/swtch.s#13 (text+ko) ==== @@ -417,6 +417,8 @@ add r14=PC_CURTHREAD,r13 ;; st8 [r14]=r4 // set r13->pc_curthread + mov ar.k7=r4 + ;; add r15=TD_PCB,r4 ;; ld8 r15=[r15] From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:12:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7972637B404; Wed, 30 Apr 2003 19:12:45 -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 31D1137B401 for ; Wed, 30 Apr 2003 19:12:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBE1D43F93 for ; Wed, 30 Apr 2003 19:12:44 -0700 (PDT) (envelope-from marcel@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 h412Ci0U096084 for ; Wed, 30 Apr 2003 19:12:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412CibR096081 for perforce@freebsd.org; Wed, 30 Apr 2003 19:12:44 -0700 (PDT) Date: Wed, 30 Apr 2003 19:12:44 -0700 (PDT) Message-Id: <200305010212.h412CibR096081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30233 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 02:12:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30233 Change 30233 by marcel@marcel_nfs on 2003/04/30 19:12:34 Diff reduction: remove EPC related change from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/include/cpu.h#11 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/cpu.h#11 (text+ko) ==== @@ -135,7 +135,6 @@ void trap(int vector, int imm, struct trapframe *framep); void ia64_probe_sapics(void); int ia64_count_cpus(void); -void map_gateway_page(void); void map_pal_code(void); void map_port_space(void); void cpu_mp_add(uint, uint, uint); From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:34:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0C8937B404; Wed, 30 Apr 2003 19:34:12 -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 62FD437B401 for ; Wed, 30 Apr 2003 19:34:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE1CE43F3F for ; Wed, 30 Apr 2003 19:34:11 -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 h412YB0U096838 for ; Wed, 30 Apr 2003 19:34:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412YBn3096835 for perforce@freebsd.org; Wed, 30 Apr 2003 19:34:11 -0700 (PDT) Date: Wed, 30 Apr 2003 19:34:11 -0700 (PDT) Message-Id: <200305010234.h412YBn3096835@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 30235 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 02:34:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=30235 Change 30235 by peter@peter_daintree on 2003/04/30 19:33:11 Try and avoid blowing the sparc64 and powerpc folks out of the water. Affected files ... .. //depot/projects/hammer/sys/amd64/include/metadata.h#1 add .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#3 edit .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#5 edit .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#6 edit .. //depot/projects/hammer/sys/i386/include/metadata.h#1 add .. //depot/projects/hammer/sys/powerpc/include/metadata.h#2 edit .. //depot/projects/hammer/sys/sparc64/include/metadata.h#2 edit .. //depot/projects/hammer/sys/sys/linker.h#8 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include "bootstrap.h" #include "libi386.h" #include "btxv86.h" ==== //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#5 (text+ko) ==== @@ -302,6 +302,10 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); + /* Compatability with older kernels */ + file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto); + file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp); + file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend); *modulep = addr; size = md_copymodules(0); @@ -309,6 +313,8 @@ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); + md = file_findmetadata(kfp, MODINFOMD_OKERNEND); /* Compat */ + bcopy(&kernend, md->md_data, sizeof kernend); (void)md_copymodules(addr); ==== //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#6 (text+ko) ==== @@ -304,6 +304,10 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); + /* The next three are for compatability with older kernels */ + file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto); + file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp); + file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend); file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slot, &dtlb_slot); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slot, &itlb_slot); file_addmetadata(kfp, MODINFOMD_DTLB, @@ -317,6 +321,8 @@ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); + md = file_findmetadata(kfp, MODINFOMD_OKERNEND); /* Compat */ + bcopy(&kernend, md->md_data, sizeof kernend); (void)md_copymodules(addr); ==== //depot/projects/hammer/sys/powerpc/include/metadata.h#2 (text+ko) ==== @@ -29,14 +29,9 @@ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ -#define MODINFOMD_ENVP 0x1001 -#define MODINFOMD_HOWTO 0x1002 -#define MODINFOMD_KERNEND 0x1003 - -#define MD_FETCH(mdp, info, type) ({ \ - type *__p; \ - __p = (type *)preload_search_info((mdp), MODINFO_METADATA | (info)); \ - __p ? *__p : 0; \ -}) +/* These three have been moved to MI */ +#define MODINFOMD_OENVP 0x1001 +#define MODINFOMD_OHOWTO 0x1002 +#define MODINFOMD_OKERNEND 0x1003 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/hammer/sys/sparc64/include/metadata.h#2 (text+ko) ==== @@ -29,9 +29,10 @@ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ -#define MODINFOMD_ENVP 0x1001 -#define MODINFOMD_HOWTO 0x1002 -#define MODINFOMD_KERNEND 0x1003 +/* The first three have been promoted to MI */ +#define MODINFOMD_OENVP 0x1001 +#define MODINFOMD_OHOWTO 0x1002 +#define MODINFOMD_OKERNEND 0x1003 #define MODINFOMD_DTLB_SLOTS 0x1004 #define MODINFOMD_ITLB_SLOTS 0x1005 #define MODINFOMD_DTLB 0x1006 @@ -42,10 +43,4 @@ vm_offset_t te_va; }; -#define MD_FETCH(mdp, info, type) ({ \ - type *__p; \ - __p = (type *)preload_search_info((mdp), MODINFO_METADATA | (info)); \ - __p ? *__p : 0; \ -}) - #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/hammer/sys/sys/linker.h#8 (text+ko) ==== @@ -194,7 +194,6 @@ #define MODINFOMD_ENVP 0x0006 /* envp[] */ #define MODINFOMD_HOWTO 0x0007 /* boothowto */ #define MODINFOMD_KERNEND 0x0008 /* kernend */ -#define MODINFOMD_SMAP 0x0009 /* i386 bios smap */ #define MODINFOMD_NOCOPY 0x8000 /* don't copy this metadata to the kernel */ #define MODINFOMD_DEPLIST (0x4001 | MODINFOMD_NOCOPY) /* depends on */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:37:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6266F37B404; Wed, 30 Apr 2003 19:37:17 -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 F256237B401 for ; Wed, 30 Apr 2003 19:37:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89DD943FB1 for ; Wed, 30 Apr 2003 19:37:16 -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 h412bG0U097003 for ; Wed, 30 Apr 2003 19:37:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412bFLq097000 for perforce@freebsd.org; Wed, 30 Apr 2003 19:37:15 -0700 (PDT) Date: Wed, 30 Apr 2003 19:37:15 -0700 (PDT) Message-Id: <200305010237.h412bFLq097000@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 30236 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 02:37:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30236 Change 30236 by peter@peter_daintree on 2003/04/30 19:36:50 add the SMAP table in under the old number as well. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#4 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#4 (text+ko) ==== @@ -102,4 +102,6 @@ return; len = smaplen * sizeof(*smapbase); file_addmetadata(kfp, MODINFOMD_SMAP, len, smapbase); + /* Temporary compatability with older development kernels */ + file_addmetadata(kfp, 0x0009, len, smapbase); } From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:40:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7001C37B404; Wed, 30 Apr 2003 19:40:22 -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 0AC4837B405 for ; Wed, 30 Apr 2003 19:40:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACB4843F93 for ; Wed, 30 Apr 2003 19:40:21 -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 h412eL0U097185 for ; Wed, 30 Apr 2003 19:40:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412eLqX097182 for perforce@freebsd.org; Wed, 30 Apr 2003 19:40:21 -0700 (PDT) Date: Wed, 30 Apr 2003 19:40:21 -0700 (PDT) Message-Id: <200305010240.h412eLqX097182@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 30238 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 02:40:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=30238 Change 30238 by peter@peter_daintree on 2003/04/30 19:39:40 add hack to find bios SMAP tables under old type number. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -751,6 +751,8 @@ * ie: an int32_t immediately precedes smap. */ smapbase = (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP); + if (smapbase == 0) + smapbase = (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | 0x0009); /* Old value for MODINFOMD_SMAP */ if (smapbase == 0) { panic("No BIOS smap info from loader!"); goto deep_shit; From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:45:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D14F37B404; Wed, 30 Apr 2003 19:45: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 ACB8237B401 for ; Wed, 30 Apr 2003 19:45:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3493A43F75 for ; Wed, 30 Apr 2003 19:45:29 -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 h412jT0U097507 for ; Wed, 30 Apr 2003 19:45:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412jSlu097504 for perforce@freebsd.org; Wed, 30 Apr 2003 19:45:28 -0700 (PDT) Date: Wed, 30 Apr 2003 19:45:28 -0700 (PDT) Message-Id: <200305010245.h412jSlu097504@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 30240 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 02:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30240 Change 30240 by peter@peter_daintree on 2003/04/30 19:45:16 go back to calling it just an 'elf kernel' etc Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#7 edit .. //depot/projects/hammer/sys/boot/common/load_elf.c#10 edit .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#12 edit .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#16 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -1156,9 +1156,9 @@ preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE); preload_bootstrap_relocate(KERNBASE); - kmdp = preload_search_by_type("elf64 kernel"); + kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) - kmdp = preload_search_by_type("elf kernel"); + kmdp = preload_search_by_type("elf64 kernel"); boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *) + KERNBASE; ==== //depot/projects/hammer/sys/boot/common/load_elf.c#10 (text+ko) ==== @@ -77,8 +77,8 @@ static int __elfN(parse_modmetadata)(struct preloaded_file *mp, elf_file_t ef); static char *fake_modname(const char *name); -const char *__elfN(kerneltype) = "elf" __XSTRING(__ELF_WORD_SIZE) " kernel"; -const char *__elfN(moduletype) = "elf" __XSTRING(__ELF_WORD_SIZE) " module"; +const char *__elfN(kerneltype) = "elf kernel"; +const char *__elfN(moduletype) = "elf module"; /* * Attempt to load the file (file) as an ELF module. It will be stored at ==== //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#12 (text+ko) ==== @@ -267,9 +267,9 @@ */ if (mdp != NULL) { preload_metadata = mdp; - kmdp = preload_search_by_type("elf32 kernel"); + kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) - kmdp = preload_search_by_type("elf kernel"); + kmdp = preload_search_by_type("elf32 kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); ==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#16 (text+ko) ==== @@ -242,9 +242,9 @@ */ if (mdp != NULL) { preload_metadata = mdp; - kmdp = preload_search_by_type("elf64 kernel"); + kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) - kmdp = preload_search_by_type("elf kernel"); + kmdp = preload_search_by_type("elf32 kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:50:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFB3137B404; Wed, 30 Apr 2003 19:50:36 -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 9C05C37B401 for ; Wed, 30 Apr 2003 19:50:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 471B743F3F for ; Wed, 30 Apr 2003 19:50:36 -0700 (PDT) (envelope-from jmallett@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 h412oa0U097737 for ; Wed, 30 Apr 2003 19:50:36 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412oZuS097734 for perforce@freebsd.org; Wed, 30 Apr 2003 19:50:35 -0700 (PDT) Date: Wed, 30 Apr 2003 19:50:35 -0700 (PDT) Message-Id: <200305010250.h412oZuS097734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30241 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 02:50:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=30241 Change 30241 by jmallett@jmallett_dalek on 2003/04/30 19:49:53 Add the SR_IE bit, and dfine the INT_IE bit to it, to make this more greppable in a predictable way. Affected files ... .. //depot/projects/mips/sys/mips/include/cpuregs.h#7 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpuregs.h#7 (text+ko) ==== @@ -151,7 +151,7 @@ /* r4k and r3k differences, see below */ -#define MIPS_SR_INT_IE 0x00000001 +#define MIPS_SR_INT_IE MIPS_SR_IE /*#define MIPS_SR_MBZ 0x0f8000c0*/ /* Never used, true for r3k */ /*#define MIPS_SR_INT_MASK 0x0000ff00*/ @@ -224,6 +224,7 @@ #define MIPS3_SR_KSU_KERNEL 0x00000000 #define MIPS3_SR_ERL 0x00000004 #define MIPS3_SR_EXL 0x00000002 +#define MIPS3_SR_IE 0x00000001 #ifdef MIPS3_5900 #undef MIPS_SR_INT_IE @@ -244,6 +245,7 @@ #define MIPS_SR_KSU_KERNEL MIPS3_SR_KSU_KERNEL #define MIPS_SR_ERL MIPS3_SR_ERL #define MIPS_SR_EXL MIPS3_SR_EXL +#define MIPS_SR_IE MIPS3_SR_IE /* From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:51:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5997F37B404; Wed, 30 Apr 2003 19:51:39 -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 E75D437B401 for ; Wed, 30 Apr 2003 19:51:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7470143FAF for ; Wed, 30 Apr 2003 19:51:38 -0700 (PDT) (envelope-from jmallett@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 h412pc0U097771 for ; Wed, 30 Apr 2003 19:51:38 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412pbjm097768 for perforce@freebsd.org; Wed, 30 Apr 2003 19:51:37 -0700 (PDT) Date: Wed, 30 Apr 2003 19:51:37 -0700 (PDT) Message-Id: <200305010251.h412pbjm097768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30242 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 02:51:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=30242 Change 30242 by jmallett@jmallett_dalek on 2003/04/30 19:50:52 We want offsets relative to the value in pcpup not relative to pcpup. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#7 edit .. //depot/projects/mips/sys/mips/mips/mips_subr.S#3 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#7 (text+ko) ==== @@ -388,7 +388,7 @@ * if t1 is non-zero. */ LEAF(mips_maybewait_idle) - la t0, pcpup + ld t0, pcpup sd zero, PC_CURTHREAD(t0) # set curthread NULL #if defined(LOCKDEBUG) jal sched_unlock_idle # release sched_lock ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#3 (text+ko) ==== @@ -586,7 +586,7 @@ /* * Save all of the registers except for the kernel temporaries in u_pcb. */ - la k1, pcpup + ld k1, pcpup ld k1, PC_CURPCB(k1) #nop # -slip- addu k1, k1, USPACE - FRAME_SIZ @@ -655,7 +655,7 @@ /* * Check pending asynchronous traps. */ - la t0, pcpup + ld t0, pcpup ld t0, PC_CURTHREAD(t0) lw t0, TD_FLAGS(t0) and t0, TDF_ASTPENDING @@ -750,7 +750,7 @@ NESTED_NOPROFILE(MIPSX(SystemCall), CALLFRAME_SIZ, ra) .set noat .mask 0x80000000, -4 - la k1, pcpup + ld k1, pcpup ld k1, PC_CURPCB(k1) #nop # -slip- addu k1, k1, USPACE - FRAME_SIZ @@ -762,7 +762,7 @@ REG_S a1, FRAME_A1(k1) REG_S a2, FRAME_A2(k1) REG_S a3, FRAME_A3(k1) - la a0, pcpup + ld a0, pcpup ld a0, PC_CURTHREAD(a0) mfhi v1 #REG_S t0, FRAME_T0(k1) # no need to save temp regs @@ -825,7 +825,7 @@ /* * Check pending asynchronous traps. */ - la t0, pcpup + ld t0, pcpup ld t0, PC_CURTHREAD(t0) lw t0, TD_FLAGS(t0) and t0, TDF_ASTPENDING @@ -1090,7 +1090,7 @@ * Save the relevant user registers into the u_pcb. * We don't need to save s0 - s8 because the compiler does it for us. */ - la k1, pcpup + ld k1, pcpup ld k1, PC_CURPCB(k1) #nop # -slip- addu k1, k1, USPACE - FRAME_SIZ @@ -1165,7 +1165,7 @@ nop # 3 nop hazard nop nop - la v0, pcpup + ld v0, pcpup ld v0, PC_CURTHREAD(v0) addu a1, sp, CALLFRAME_SIZ lw v0, TD_FLAGS From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:51:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B78737B404; Wed, 30 Apr 2003 19:51:40 -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 A290337B415 for ; Wed, 30 Apr 2003 19:51:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3812C43F75 for ; Wed, 30 Apr 2003 19:51:39 -0700 (PDT) (envelope-from jmallett@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 h412pc0U097777 for ; Wed, 30 Apr 2003 19:51:38 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412pc91097774 for perforce@freebsd.org; Wed, 30 Apr 2003 19:51:38 -0700 (PDT) Date: Wed, 30 Apr 2003 19:51:38 -0700 (PDT) Message-Id: <200305010251.h412pc91097774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30243 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 02:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30243 Change 30243 by jmallett@jmallett_dalek on 2003/04/30 19:51:22 Update callframe for 64-bit registers. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#9 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#9 (text+ko) ==== @@ -142,9 +142,9 @@ * register_t cf_ra; return address * }; */ -#define CALLFRAME_SIZ (4 * (4 + 2)) -#define CALLFRAME_SP (4 * 4) -#define CALLFRAME_RA (4 * 5) +#define CALLFRAME_SIZ (8 * (4 + 2)) +#define CALLFRAME_SP (8 * 4) +#define CALLFRAME_RA (8 * 5) /* * While it would be nice to be compatible with the SGI From owner-p4-projects@FreeBSD.ORG Wed Apr 30 19:56:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0BCC37B404; Wed, 30 Apr 2003 19:56:46 -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 6061D37B401 for ; Wed, 30 Apr 2003 19:56:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DDDD43F93 for ; Wed, 30 Apr 2003 19:56:46 -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 h412uj0U097974 for ; Wed, 30 Apr 2003 19:56:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h412ujHc097971 for perforce@freebsd.org; Wed, 30 Apr 2003 19:56:45 -0700 (PDT) Date: Wed, 30 Apr 2003 19:56:45 -0700 (PDT) Message-Id: <200305010256.h412ujHc097971@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 30244 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 02:56:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=30244 Change 30244 by peter@peter_daintree on 2003/04/30 19:56:15 Only add the elf64 contamination if it is explicitly wanted Affected files ... .. //depot/projects/hammer/sys/i386/include/elf.h#3 edit Differences ... ==== //depot/projects/hammer/sys/i386/include/elf.h#3 (text+ko) ==== @@ -34,7 +34,9 @@ */ #include /* Definitions common to all 32 bit architectures. */ +#if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64 #include /* Definitions common to all 64 bit architectures. */ +#endif #ifndef __ELF_WORD_SIZE #define __ELF_WORD_SIZE 32 /* Used by */ @@ -62,10 +64,12 @@ } a_un; } Elf32_Auxinfo; +#if __ELF_WORD_SIZE == 64 /* Fake for x86-64 loader support */ typedef struct { int fake; } Elf64_Auxinfo; +#endif __ElfType(Auxinfo); From owner-p4-projects@FreeBSD.ORG Wed Apr 30 20:01:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 869D037B404; Wed, 30 Apr 2003 20:01:54 -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 20AB737B401 for ; Wed, 30 Apr 2003 20:01:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB0FE43F85 for ; Wed, 30 Apr 2003 20:01:53 -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 h4131r0U098290 for ; Wed, 30 Apr 2003 20:01:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4131rL6098287 for perforce@freebsd.org; Wed, 30 Apr 2003 20:01:53 -0700 (PDT) Date: Wed, 30 Apr 2003 20:01:53 -0700 (PDT) Message-Id: <200305010301.h4131rL6098287@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 30246 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 03:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=30246 Change 30246 by peter@peter_daintree on 2003/04/30 20:00:55 Attempt to make this not hammer-specific Affected files ... .. //depot/projects/hammer/sys/dev/fb/vga.c#9 edit Differences ... ==== //depot/projects/hammer/sys/dev/fb/vga.c#9 (text+ko) ==== @@ -60,7 +60,10 @@ #define VGA_DEBUG 0 #endif +/* machine/pc/bios.h has got too much i386-specific stuff in it */ +#ifndef BIOS_PADDRTOVADDR #define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase) +#endif int vga_probe_unit(int unit, video_adapter_t *buf, int flags) { From owner-p4-projects@FreeBSD.ORG Wed Apr 30 20:03:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 788C137B404; Wed, 30 Apr 2003 20:03:58 -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 7381637B401 for ; Wed, 30 Apr 2003 20:03:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D262243FBD for ; Wed, 30 Apr 2003 20:03:56 -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 h4133u0U099263 for ; Wed, 30 Apr 2003 20:03:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4133uvO099260 for perforce@freebsd.org; Wed, 30 Apr 2003 20:03:56 -0700 (PDT) Date: Wed, 30 Apr 2003 20:03:56 -0700 (PDT) Message-Id: <200305010303.h4133uvO099260@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 30247 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 03:03:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=30247 Change 30247 by peter@peter_daintree on 2003/04/30 20:03:03 rcsid sync Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#5 edit .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#6 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#4 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#13 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#5 (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/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo32.c,v 1.33 2002/06/20 06:29:42 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.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/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.33 2002/06/20 06:29:42 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.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/elf_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#13 (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/elf_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ */ #define __ELF_WORD_SIZE 64 From owner-p4-projects@FreeBSD.ORG Wed Apr 30 20:09:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2453437B404; Wed, 30 Apr 2003 20:09:05 -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 C89D237B401 for ; Wed, 30 Apr 2003 20:09:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B77FF43F3F for ; Wed, 30 Apr 2003 20:09:03 -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 h413930U099460 for ; Wed, 30 Apr 2003 20:09:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h413937r099457 for perforce@freebsd.org; Wed, 30 Apr 2003 20:09:03 -0700 (PDT) Date: Wed, 30 Apr 2003 20:09:03 -0700 (PDT) Message-Id: <200305010309.h413937r099457@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 30248 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 03:09:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=30248 Change 30248 by peter@peter_daintree on 2003/04/30 20:08:44 IFC @30247 Affected files ... .. //depot/projects/hammer/sbin/vinum/commands.c#4 integrate .. //depot/projects/hammer/sbin/vinum/list.c#4 integrate .. //depot/projects/hammer/sbin/vinum/v.c#4 integrate .. //depot/projects/hammer/sbin/vinum/vext.h#3 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#6 integrate .. //depot/projects/hammer/sys/conf/files.amd64#6 integrate .. //depot/projects/hammer/sys/conf/ldscript.amd64#5 integrate .. //depot/projects/hammer/sys/conf/options.amd64#6 integrate .. //depot/projects/hammer/usr.bin/m4/eval.c#2 integrate Differences ... ==== //depot/projects/hammer/sbin/vinum/commands.c#4 (text+ko) ==== @@ -36,31 +36,11 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: commands.c,v 1.15 2001/05/22 08:40:21 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/commands.c,v 1.46 2003/03/15 20:49:38 phk Exp $ + * $Id: commands.c,v 1.22 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/commands.c,v 1.47 2003/05/01 01:39:49 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "vext.h" -#include -#include -#include -#include -#include -#include -#include #include static void dorename(struct vinum_rename_msg *msg, const char *oldname, const char *name, int maxlen); @@ -122,8 +102,8 @@ char *configline; configline = fgets(buffer, BUFSIZE, dfd); - if (history) - fprintf(history, "%s", buffer); + if (History) + fprintf(History, "%s", buffer); if (configline == NULL) { if (ferror(dfd)) @@ -268,6 +248,9 @@ } } checkupdates(); /* make sure we're updating */ + /* Arguably we should be cleverer about this. */ + if (no_devfs) + make_devices(); } } @@ -277,28 +260,31 @@ char reply[32]; int error; - printf(" WARNING! This command will completely wipe out your vinum configuration.\n" - " All data will be lost. If you really want to do this, enter the text\n\n" - " NO FUTURE\n" - " Enter text -> "); - fgets(reply, sizeof(reply), stdin); - if (strcmp(reply, "NO FUTURE\n")) /* changed his mind */ - printf("\n No change\n"); - else { - error = ioctl(superdev, VINUM_RESETCONFIG, NULL); /* trash config on disk */ - if (error) { - if (errno == EBUSY) - fprintf(stderr, "Can't reset configuration: objects are in use\n"); - else - perror("Can't find vinum config"); - } else { - if (no_devfs) - make_devices(); /* recreate the /dev/vinum hierarchy */ - printf("\b Vinum configuration obliterated\n"); - start_daemon(); /* then restart the daemon */ + if (isatty(STDIN_FILENO)) { + printf(" WARNING! This command will completely wipe out your vinum configuration.\n" + " All data will be lost. If you really want to do this, enter the text\n\n" + " NO FUTURE\n" + " Enter text -> "); + fgets(reply, sizeof(reply), stdin); + if (strcmp(reply, "NO FUTURE\n")) /* changed his mind */ + printf("\n No change\n"); + else { + error = ioctl(superdev, VINUM_RESETCONFIG, NULL); /* trash config on disk */ + if (error) { + if (errno == EBUSY) + fprintf(stderr, "Can't reset configuration: objects are in use\n"); + else + perror("Can't find vinum config"); + } else { + if (no_devfs) + make_devices(); /* recreate the /dev/vinum hierarchy */ + printf("\b Vinum configuration obliterated\n"); + start_daemon(); /* then restart the daemon */ + } } - } - checkupdates(); /* make sure we're updating */ + checkupdates(); /* make sure we're updating */ + } else + fprintf(stderr, "Please enter this command from a terminal\n"); } /* Initialize subdisks */ @@ -310,8 +296,8 @@ int objno; enum objecttype type; /* type returned */ - if (history) - fflush(history); /* don't let all the kids do it. */ + if (History) + fflush(History); /* don't let all the kids do it. */ for (objindex = 0; objindex < argc; objindex++) { objno = find_object(argv[objindex], &type); /* find the object */ if (objno < 0) @@ -399,13 +385,6 @@ } } if (failed == 0) { -#if 0 - message->index = plexno; /* pass object number */ - message->type = plex_object; /* and type of object */ - message->state = object_up; - message->force = 1; /* insist */ - ioctl(superdev, VINUM_SETSTATE, message); -#endif syslog(LOG_INFO | LOG_KERN, "plex %s initialized", plex.name); } else syslog(LOG_ERR | LOG_KERN, "couldn't initialize plex %s, %d processes died", @@ -545,10 +524,11 @@ for (i = 0; i < devs; i++) { struct devstat *stat = &statinfo.dinfo->devices[i]; + /* Submitted by Pete Carah */ if ((((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_DIRECT) /* disk device */ - || ((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) /* storage array */ - &&((stat->device_type & DEVSTAT_TYPE_PASS) == 0) /* and not passthrough */ - &&((stat->device_name[0] != '\0'))) { /* and it has a name */ + ||((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) /* storage array */ + &&((stat->device_type & DEVSTAT_TYPE_PASS) == 0) /* and not passthrough */ + &&((stat->device_name[0] != '\0'))) { /* and it has a name */ sprintf(enamelist, _PATH_DEV "%s%d", stat->device_name, stat->unit_number); token[tokens] = enamelist; /* point to it */ tokens++; /* one more token */ @@ -2098,7 +2078,8 @@ /* * First, check our drives. */ - if (argc & 1) { + if ((argc < 2) + || (argc & 1)) { fprintf(stderr, "You need an even number of drives to create a mirrored volume\n"); return; } ==== //depot/projects/hammer/sbin/vinum/list.c#4 (text+ko) ==== @@ -39,27 +39,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: list.c,v 1.25 2000/12/20 03:38:43 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/list.c,v 1.37 2003/03/15 20:49:38 phk Exp $ + * $Id: list.c,v 1.32 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/list.c,v 1.38 2003/05/01 01:38:55 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "vext.h" #include -#include -#include "vext.h" #include -/* #include */ #include /* @@ -599,6 +585,8 @@ (long long) sd.sectors * DEV_BSIZE, (long long) sd.sectors / (MEGABYTE / DEV_BSIZE), sd_state(sd.state)); + if (sd.flags & VF_RETRYERRORS) + printf("\t\tretryerrors\n"); if (sd.plexno >= 0) { get_plex_info(&plex, sd.plexno); printf("\t\tPlex %s", plex.name); @@ -828,6 +816,21 @@ return &text[11]; } +/* Return the difference in microseconds between two timevals. */ +inline struct timeval +timediff(struct timeval then, struct timeval now) +{ + struct timeval diff; + + diff.tv_sec = now.tv_sec - then.tv_sec; + diff.tv_usec = now.tv_usec - then.tv_usec; + if (diff.tv_usec < 0) { + diff.tv_usec += 1000000; + diff.tv_sec--; + } + return diff; +} + void vinum_info(int argc, char *argv[], char *argv0[]) { @@ -835,6 +838,8 @@ struct mc malloced; int i; struct rqinfo rq; + struct timeval lasttime; /* time of previous request */ + struct timeval diff; /* difference from now */ if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) { perror("Can't get vinum config"); @@ -848,7 +853,8 @@ perror("Can't get information"); return; } - printf("Total of %d blocks malloced, total memory: %d\nMaximum allocs: %8d, malloc table at 0x%08x\n", + printf("Total of %d blocks malloced, total memory: %d\n" + "Maximum allocs: %8d, malloc table at 0x%08x\n", meminfo.mallocs, meminfo.total_malloced, meminfo.highwater, @@ -875,147 +881,194 @@ (char *) &malloced.file); } if (Verbose) { - printf("\nTime\t\t Event\t Buf\tDev\t Offset\tBytes\tSD\tSDoff\tDoffset\tGoffset\n\n"); + if (Verbose > 1) { + lasttime.tv_sec = 0; + lasttime.tv_usec = 0; + printf("\n Time\t\t Event\t Buf\tDev\t Offset\t" + "Bytes\tSD\tSDoff\tDoffset\tGoffset\n\n"); + } else + printf("\nTime\t\t Event\t Buf\tDev\t Offset\tBytes\tSD" + "\tSDoff\tDoffset\tGoffset\n\n"); for (i = RQINFO_SIZE - 1; i >= 0; i--) { /* go through the request list in order */ *((int *) &rq) = i; if (ioctl(superdev, VINUM_RQINFO, &rq) < 0) { perror("Can't get information"); return; } - /* Compress devminor into something printable. */ - rq.devminor = (rq.devminor & 0xff) - | ((rq.devminor & 0xfff0000) >> 8); - switch (rq.type) { - case loginfo_unused: /* never been used */ - break; + if (rq.type != loginfo_unused) { + switch (Verbose) { + case 2: + if ((lasttime.tv_usec != 0) || (lasttime.tv_sec != 0)) { + diff = timediff(lasttime, rq.timestamp); + if (diff.tv_sec != 0) + printf("\n+ %d.%06d sec:\n ", diff.tv_sec, diff.tv_usec); + else + printf("+%6d µs ", diff.tv_usec); + } else + printf(" "); + break; + + case 3: + if ((lasttime.tv_usec != 0) || (lasttime.tv_sec != 0)) + diff = timediff(lasttime, rq.timestamp); + if (diff.tv_sec != 0) + printf("\n+ %d.%06d sec:\n ", diff.tv_sec, diff.tv_usec); + else if (rq.type == loginfo_iodone) { + diff = timediff(rq.info.rqe.launchtime, rq.timestamp); + printf("+%6d µs ", + diff.tv_usec); + } else + printf(" "); + break; + + default: + break; + } - case loginfo_user_bp: /* this is the bp when strategy is called */ - printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.b.b_blkno, - rq.info.b.b_bcount); - break; + /* Compress devminor into something printable. */ + rq.devminor = (rq.devminor & 0xff) + | ((rq.devminor & 0xfff0000) >> 8); + switch (rq.type) { + case loginfo_user_bp: /* this is the bp when strategy is called */ + printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.b.b_blkno, + rq.info.b.b_bcount); + break; - case loginfo_sdiol: /* subdisk I/O launch */ - case loginfo_user_bpl: /* and this is the bp at launch time */ - printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.b.b_blkno, - rq.info.b.b_bcount); - break; + case loginfo_sdiol: /* subdisk I/O launch */ + case loginfo_user_bpl: /* and this is the bp at launch time */ + printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.b.b_blkno, + rq.info.b.b_bcount); + break; - case loginfo_rqe: /* user RQE */ - printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_rqe: /* user RQE */ + /* + * We have two timestamps + * in this request, and + * they might not agree by + * one or two µs. Make + * them agree by force. + */ + rq.timestamp = rq.info.rqe.launchtime; + printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_iodone: /* iodone called */ - printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_iodone: /* iodone called */ + printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_raid5_data: /* RAID-5 write data block */ - printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_raid5_data: /* RAID-5 write data block */ + printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_raid5_parity: /* RAID-5 write parity block */ - printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_raid5_parity: /* RAID-5 write parity block */ + printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_sdio: /* subdisk I/O */ - printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.info.b.b_blkno, - rq.info.b.b_bcount, - rq.devminor); - break; + case loginfo_sdio: /* subdisk I/O */ + printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.info.b.b_blkno, + rq.info.b.b_bcount, + rq.devminor); + break; - case loginfo_sdiodone: /* subdisk I/O done */ - printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.info.b.b_blkno, - rq.info.b.b_bcount, - rq.devminor); - break; + case loginfo_sdiodone: /* subdisk I/O done */ + printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.info.b.b_blkno, + rq.info.b.b_bcount, + rq.devminor); + break; - case loginfo_lockwait: - printf("%s Lockwait %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_lockwait: + printf("%s Lockwait %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; - case loginfo_lock: - printf("%s Lock %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_lock: + printf("%s Lock %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; - case loginfo_unlock: - printf("%s Unlock\t %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_unlock: + printf("%s Unlock\t %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; + default: + printf("*** invalid log type: %d ***\n", rq.type); + } + if (Verbose > 1) + lasttime = rq.timestamp; } } } @@ -1214,7 +1267,7 @@ { int i; - if (argc == 0) { /* start everything */ + if (argc == 0) { /* dump everything */ int devs = devstat_getnumdevs(NULL); struct statinfo statinfo; char *namelist; ==== //depot/projects/hammer/sbin/vinum/v.c#4 (text+ko) ==== @@ -36,37 +36,14 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: v.c,v 1.31 2000/09/03 01:29:26 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/v.c,v 1.37 2003/01/16 23:48:34 joerg Exp $ + * $Id: v.c,v 1.35 2003/04/26 02:02:49 grog Exp $ + * $FreeBSD: src/sbin/vinum/v.c,v 1.38 2003/05/01 01:39:42 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "vext.h" -#include -#include -#include -#include -#include -#include -#include -#include FILE *cf; /* config file handle */ -FILE *history; /* history file */ +FILE *History; /* history file */ char *historyfile; /* and its name */ char *dateformat; /* format in which to store date */ @@ -150,11 +127,11 @@ errno); exit(1); } - history = fopen(historyfile, "a+"); - if (history != NULL) { + History = fopen(historyfile, "a+"); + if (History != NULL) { timestamp(); - fprintf(history, "*** " VINUMMOD " started ***\n"); - fflush(history); /* before we start the daemon */ + fprintf(History, "*** " VINUMMOD " started ***\n"); + fflush(History); /* before we start the daemon */ } if (sysctlbyname("vfs.devfs.generation", NULL, NULL, NULL, 0) == 0) no_devfs = 0; @@ -246,8 +223,8 @@ if (tokens) parseline(tokens, token); /* and do what he says */ } - if (history) - fflush(history); + if (History) + fflush(History); } } return 0; /* normal completion */ @@ -336,11 +313,11 @@ int j; enum keyword command; /* command to execute */ - if (history != NULL) { /* save the command to history file */ + if (History != NULL) { /* save the command to history file */ timestamp(); for (i = 0; i < args; i++) /* all args */ - fprintf(history, "%s ", argv[i]); - fputs("\n", history); + fprintf(History, "%s ", argv[i]); + fputs("\n", History); } if ((args == 0) /* empty line */ ||(*argv[0] == '#')) /* or a comment, */ @@ -544,9 +521,9 @@ perror(VINUMMOD ": Can't write to " _PATH_DEV); return; } - if (history) { + if (History) { timestamp(); - fprintf(history, "*** Created devices ***\n"); + fprintf(History, "*** Created devices ***\n"); } if (superdev >= 0) /* super device open */ close(superdev); @@ -559,10 +536,9 @@ if (mknod(VINUM_SUPERDEV_NAME, S_IRUSR | S_IWUSR | S_IFCHR, /* user only */ - makedev(VINUM_CDEV_MAJOR, VINUM_SUPERDEV)) < 0) + makedev(VINUM_CDEV_MAJOR, VINUM_SUPERDEV_VOL)) < 0) fprintf(stderr, "Can't create %s: %s\n", VINUM_SUPERDEV_NAME, strerror(errno)); - superdev = open(VINUM_SUPERDEV_NAME, O_RDWR); /* open the super device */ if (superdev < 0) { perror(VINUM_SUPERDEV_NAME); @@ -570,7 +546,7 @@ } if (mknod(VINUM_DAEMON_DEV_NAME, /* daemon super device */ S_IRUSR | S_IWUSR | S_IFCHR, /* user only */ - makedev(VINUM_CDEV_MAJOR, VINUM_DAEMON_DEV)) < 0) + makedev(VINUM_CDEV_MAJOR, VINUM_DAEMON_VOL)) < 0) fprintf(stderr, "Can't create %s: %s\n", VINUM_DAEMON_DEV_NAME, strerror(errno)); if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) { @@ -608,26 +584,29 @@ get_volume_info(&vol, volno); if (vol.state != volume_unallocated) { /* we could have holes in our lists */ - voldev = VINUMDEV(volno, 0, 0, VINUM_VOLUME_TYPE); /* create a device number */ + voldev = VINUMDEV(volno, VINUM_VOLUME_TYPE); /* create a device number */ /* Create /dev/vinum/ */ sprintf(filename, VINUM_DIR "/%s", vol.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, voldev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); /* Create /dev/vinum/vol/ */ sprintf(filename, VINUM_DIR "/vol/%s", vol.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, voldev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); if (vol.plexes > 0) { /* Create /dev/vinum/vol/.plex/ */ sprintf(filename, VINUM_DIR "/vol/%s.plex", vol.name); if (mkdir(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IXOTH) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } if (recurse) for (plexno = 0; plexno < vol.plexes; plexno++) @@ -654,23 +633,26 @@ sprintf(filename, VINUM_DIR "/plex/%s", plex.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, plexdev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); if (plex.volno >= 0) { get_volume_info(&vol, plex.volno); - plexdev = VINUMDEV(plex.volno, plexno, 0, VINUM_PLEX_TYPE); + plexdev = VINUMDEV(plex.volno, VINUM_PLEX_TYPE); /* Create device /dev/vinum/vol/.plex/ */ sprintf(filename, VINUM_DIR "/vol/%s.plex/%s", vol.name, plex.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, plexdev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); /* Create directory /dev/vinum/vol/.plex/.sd */ sprintf(filename, VINUM_DIR "/vol/%s.plex/%s.sd", vol.name, plex.name); if (mkdir(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IXOTH) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } if (recurse) { for (sdno = 0; sdno < plex.subdisks; sdno++) { @@ -696,7 +678,8 @@ sprintf(filename, VINUM_DIR "/sd/%s", sd.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, sddev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } } @@ -877,7 +860,7 @@ char datetext[MAXDATETEXT]; time_t sec; - if (history != NULL) { + if (History != NULL) { if (gettimeofday(&now, NULL) != 0) { fprintf(stderr, "Can't get time: %s\n", strerror(errno)); return; @@ -885,7 +868,7 @@ sec = now.tv_sec; date = localtime(&sec); strftime(datetext, MAXDATETEXT, dateformat, date), - fprintf(history, + fprintf(History, "%s.%06ld ", datetext, now.tv_usec); ==== //depot/projects/hammer/sbin/vinum/vext.h#3 (text+ko) ==== @@ -35,14 +35,15 @@ */ /* - * $Id: vext.h,v 1.19 2001/05/23 23:00:12 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/vext.h,v 1.26 2003/02/16 14:13:23 phk Exp $ + * $Id: vext.h,v 1.22 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/vext.h,v 1.27 2003/05/01 01:40:16 grog Exp $ */ #define MAXARGS 64 /* maximum number of args on a line */ #define PLEXINITSIZE 65536 /* init in this size chunks */ #define MAXPLEXINITSIZE 65536 /* max chunk size to use for init */ #define MAXDATETEXT 128 /* date text in history (far too much) */ +#define VINUMDEBUG /* for including kernel headers */ enum { KILOBYTE = 1024, @@ -54,8 +55,31 @@ #define DEFAULT_HISTORYFILE "/var/log/vinum_history" /* default name for history stuff */ +#include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include @@ -67,7 +91,6 @@ #include #include #include -#include #include #include #include @@ -178,7 +201,7 @@ extern int dowait; /* wait for children to exit */ extern char *objectname; /* name for some functions */ -extern FILE *history; /* history file */ +extern FILE *History; /* history file */ /* Structures to read kernel data into */ extern struct __vinum_conf vinum_conf; /* configuration information */ ==== //depot/projects/hammer/sys/conf/Makefile.amd64#6 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.5 2003/04/15 21:29:11 phk Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.6 2003/05/01 02:59:24 peter Exp $ # # Makefile for FreeBSD # @@ -28,9 +28,7 @@ OBJCOPY= x86_64-unknown-freebsd5.0-objcopy OBJDUMP= x86_64-unknown-freebsd5.0-objdump MACHINE_ARCH= amd64 -#COPTFLAGS= # none, -O crashes the 3.2 cross compiler I have -NO_CPU_COPTFLAGS= true - +NO_CPU_COPTFLAGS= true # minimize cross compile pain # Which version of config(8) is required. %VERSREQ= 500012 ==== //depot/projects/hammer/sys/conf/files.amd64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.10 2003/02/28 21:59:13 ru Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.11 2003/05/01 02:59:24 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/hammer/sys/conf/ldscript.amd64#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* Default linker script, for normal executables */ +/* $FreeBSD: src/sys/conf/ldscript.amd64,v 1.8 2003/05/01 02:59:24 peter Exp $ */ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_ARCH(i386:x86-64) ENTRY(btext) ==== //depot/projects/hammer/sys/conf/options.amd64#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.amd64,v 1.5 2003/04/12 09:40:37 des Exp $ +# $FreeBSD: src/sys/conf/options.amd64,v 1.6 2003/05/01 02:59:24 peter Exp $ # Options specific to the AMD x86-64 platform kernels MAXMEM ==== //depot/projects/hammer/usr.bin/m4/eval.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/m4/eval.c,v 1.20 2002/07/15 02:15:12 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/m4/eval.c,v 1.21 2003/05/01 02:36:27 tjr Exp $"); /* * eval.c @@ -241,8 +241,10 @@ /* * dosys - execute system command */ - if (argc > 2) + if (argc > 2) { + fflush(NULL); sysval = system(argv[2]); + } break; case SYSVTYPE: From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:06:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D4D437B404; Wed, 30 Apr 2003 21:06:22 -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 1F28837B401 for ; Wed, 30 Apr 2003 21:06:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48FD243FBF for ; Wed, 30 Apr 2003 21:06:21 -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 h4146L0U008866 for ; Wed, 30 Apr 2003 21:06:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4146Knw008863 for perforce@freebsd.org; Wed, 30 Apr 2003 21:06:20 -0700 (PDT) Date: Wed, 30 Apr 2003 21:06:20 -0700 (PDT) Message-Id: <200305010406.h4146Knw008863@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 30259 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:06:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=30259 Change 30259 by peter@peter_daintree on 2003/04/30 21:06:06 IFC @30258 Affected files ... .. //depot/projects/hammer/bin/pax/tar.1#4 integrate .. //depot/projects/hammer/sys/amd64/include/metadata.h#2 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#3 integrate .. //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#3 integrate .. //depot/projects/hammer/sys/boot/common/Makefile.inc#5 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#5 integrate .. //depot/projects/hammer/sys/boot/common/load_elf.c#11 integrate .. //depot/projects/hammer/sys/boot/common/load_elf32.c#2 integrate .. //depot/projects/hammer/sys/boot/common/load_elf64.c#2 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#6 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#6 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#14 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#7 delete .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/hammer/sys/boot/i386/loader/conf.c#6 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#4 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#4 integrate .. //depot/projects/hammer/sys/i386/include/metadata.h#2 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/hammer/sys/powerpc/include/metadata.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#13 integrate .. //depot/projects/hammer/sys/sparc64/include/metadata.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#17 integrate .. //depot/projects/hammer/sys/sys/linker.h#9 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#13 integrate Differences ... ==== //depot/projects/hammer/bin/pax/tar.1#4 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (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/bin/pax/tar.1,v 1.6 2002/10/06 07:56:27 tjr Exp $ +.\" $FreeBSD: src/bin/pax/tar.1,v 1.7 2003/05/01 02:37:46 tjr Exp $ .\" $OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $ .\" .Dd February 7, 2001 @@ -41,7 +41,7 @@ .Sm off .Op Fl .Brq Cm crtux -.Op Cm befhmopqsvwzHLOPXZ014578 +.Op Cm befhjmopqsvwyzHLOPXZ014578 .Sm on .Op Ar blocksize .Op Ar archive ==== //depot/projects/hammer/sys/amd64/include/metadata.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.11 2000/11/14 08:10:15 mjacob Exp $ */ +/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- ==== //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.3 2000/05/01 17:41:20 bp Exp $ */ +/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- ==== //depot/projects/hammer/sys/boot/common/Makefile.inc#5 (text+ko) ==== @@ -1,17 +1,17 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.14 2002/08/29 02:02:27 peter Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.15 2003/05/01 03:56:29 peter Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" SRCS+= load_elf32.c load_elf64.c .endif .if ${MACHINE_ARCH} == "powerpc" SRCS+= load_elf32.c .endif .if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "alpha" -SRCS+= load_elf32.c +SRCS+= load_elf64.c .endif .if defined(LOADER_NET_SUPPORT) ==== //depot/projects/hammer/sys/boot/common/bootstrap.h#5 (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/common/bootstrap.h,v 1.37 2003/04/06 06:28:08 peter Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.38 2003/05/01 03:56:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/common/load_elf.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.26 2003/04/04 16:35:14 phk Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.27 2003/05/01 03:56:29 peter Exp $ */ #include @@ -261,7 +261,7 @@ if (ef->kernel) { #ifdef __i386__ #if __ELF_WORD_SIZE == 64 - off = - (off & 0xffffffffff000000u);/* x86_64 relocates after locore */ + off = - (off & 0xffffffffff000000ull);/* x86_64 relocates after locore */ #else off = - (off & 0xff000000u); /* i386 relocates after locore */ #endif ==== //depot/projects/hammer/sys/boot/common/load_elf32.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/common/load_elf64.c#2 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.10 2002/11/28 03:25:51 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.11 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- ==== //depot/projects/hammer/sys/boot/i386/libi386/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.28 2002/08/29 02:02:28 peter Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.29 2003/05/01 03:56:29 peter Exp $ # LIB= i386 INTERNALLIB= true ==== //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#3 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#5 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.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/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.34 2003/05/01 03:56:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.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/bootinfo32.c,v 1.33 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo32.c,v 1.34 2003/05/01 03:56:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#7 (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/bootinfo64.c,v 1.33 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.34 2003/05/01 03:56:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/elf32_freebsd.c#5 (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/elf32_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.12 2003/05/01 03:56:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/libi386/elf64_freebsd.c#14 (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/elf64_freebsd.c,v 1.11 2003/04/04 16:35:15 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/elf64_freebsd.c,v 1.12 2003/05/01 03:56:29 peter Exp $ */ #define __ELF_WORD_SIZE 64 ==== //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#5 (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/libi386.h,v 1.15 2001/11/05 18:58:33 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.16 2003/05/01 03:56:29 peter Exp $ */ ==== //depot/projects/hammer/sys/boot/i386/loader/conf.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/loader/conf.c,v 1.22 2002/12/19 19:34:59 jake Exp $ + * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.23 2003/05/01 03:56:29 peter Exp $ */ #include ==== //depot/projects/hammer/sys/boot/i386/loader/main.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/loader/main.c,v 1.26 2002/10/01 19:31:09 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/loader/main.c,v 1.27 2003/05/01 03:56:29 peter Exp $ */ /* ==== //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.7 2003/02/01 22:50:08 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.8 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- ==== //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#3 (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/ofw/libofw/elf_freebsd.c,v 1.4 2002/07/18 12:39:01 benno Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.5 2003/05/01 03:56:30 peter Exp $ */ #include ==== //depot/projects/hammer/sys/dev/firewire/sbp.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.47 2003/04/30 10:32:32 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.48 2003/05/01 03:38:04 simokawa Exp $ * */ @@ -2218,10 +2218,10 @@ } SBP_DEBUG(1) printf("%s:%d:%d:%d:XPT_CALC_GEOMETRY: " - "Volume size = %d\n", + "Volume size = %lld\n", device_get_nameunit(sbp->fd.dev), cam_sim_path(sbp->sim), ccb->ccb_h.target_id, ccb->ccb_h.target_lun, - ccg->volume_size); + (u_int64_t)ccg->volume_size); END_DEBUG size_mb = ccg->volume_size ==== //depot/projects/hammer/sys/i386/include/elf.h#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/i386/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/i386/include/elf.h,v 1.14 2003/05/01 03:46:12 peter Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -65,7 +65,7 @@ } Elf32_Auxinfo; #if __ELF_WORD_SIZE == 64 -/* Fake for x86-64 loader support */ +/* Fake for amd64 loader support */ typedef struct { int fake; } Elf64_Auxinfo; ==== //depot/projects/hammer/sys/i386/include/metadata.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/i386/include/specialreg.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.23 2003/01/22 17:26:18 jhb Exp $ + * $FreeBSD: src/sys/i386/include/specialreg.h,v 1.24 2003/05/01 03:44:40 peter Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -108,7 +108,7 @@ #define CPUID_SS 0x08000000 #define CPUID_HTT 0x10000000 #define CPUID_TM 0x20000000 -#define CPUID_B30 0x40000000 +#define CPUID_IA64 0x40000000 #define CPUID_PBE 0x80000000 /* ==== //depot/projects/hammer/sys/kern/vfs_default.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/kern/vfs_default.c,v 1.81 2003/04/29 13:36:03 kan Exp $ + * $FreeBSD: src/sys/kern/vfs_default.c,v 1.82 2003/05/01 03:51:05 alc Exp $ */ #include @@ -605,7 +605,9 @@ * Dereference the reference we just created. This assumes * that the object is associated with the vp. */ + VM_OBJECT_LOCK(object); object->ref_count--; + VM_OBJECT_UNLOCK(object); vrele(vp); } else { if (object->flags & OBJ_DEAD) { ==== //depot/projects/hammer/sys/kern/vfs_subr.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.444 2003/04/26 23:41:30 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.445 2003/05/01 03:10:38 alc Exp $ */ /* @@ -829,11 +829,15 @@ /* * Don't recycle if we still have cached pages. */ - if (VOP_GETVOBJECT(vp, &object) == 0 && - (object->resident_page_count || - object->ref_count)) { - error = EBUSY; - goto done; + if (VOP_GETVOBJECT(vp, &object) == 0) { + VM_OBJECT_LOCK(object); + if (object->resident_page_count || + object->ref_count) { + VM_OBJECT_UNLOCK(object); + error = EBUSY; + goto done; + } + VM_OBJECT_UNLOCK(object); } if (LIST_FIRST(&vp->v_cache_src)) { /* ==== //depot/projects/hammer/sys/powerpc/include/metadata.h#3 (text+ko) ==== @@ -23,15 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/metadata.h,v 1.1 2002/07/10 12:14:23 benno Exp $ + * $FreeBSD: src/sys/powerpc/include/metadata.h,v 1.2 2003/05/01 03:31:17 peter Exp $ */ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ -/* These three have been moved to MI */ -#define MODINFOMD_OENVP 0x1001 -#define MODINFOMD_OHOWTO 0x1002 -#define MODINFOMD_OKERNEND 0x1003 +#define MODINFOMD_ENVP 0x1001 +#define MODINFOMD_HOWTO 0x1002 +#define MODINFOMD_KERNEND 0x1003 #endif /* !_MACHINE_METADATA_H_ */ ==== //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#13 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.55 2003/04/30 22:09:26 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.56 2003/05/01 03:33:28 peter Exp $"); #include "opt_ddb.h" #include "opt_compat.h" @@ -268,8 +268,6 @@ if (mdp != NULL) { preload_metadata = mdp; kmdp = preload_search_by_type("elf kernel"); - if (kmdp == NULL) - kmdp = preload_search_by_type("elf32 kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); ==== //depot/projects/hammer/sys/sparc64/include/metadata.h#3 (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/sparc64/include/metadata.h,v 1.3 2002/05/29 05:49:59 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.4 2003/05/01 03:31:18 peter Exp $ */ #ifndef _MACHINE_METADATA_H_ ==== //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#17 (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.92 2003/04/30 22:09:26 peter Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.93 2003/05/01 03:33:28 peter Exp $ */ #include "opt_compat.h" @@ -243,8 +243,6 @@ if (mdp != NULL) { preload_metadata = mdp; kmdp = preload_search_by_type("elf kernel"); - if (kmdp == NULL) - kmdp = preload_search_by_type("elf32 kernel"); if (kmdp != NULL) { boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); ==== //depot/projects/hammer/sys/sys/linker.h#9 (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/sys/linker.h,v 1.35 2003/01/21 02:42:44 jake Exp $ + * $FreeBSD: src/sys/sys/linker.h,v 1.36 2003/05/01 03:31:17 peter Exp $ */ #ifndef _SYS_LINKER_H_ @@ -191,9 +191,12 @@ #define MODINFOMD_SSYM 0x0003 /* start of symbols */ #define MODINFOMD_ESYM 0x0004 /* end of symbols */ #define MODINFOMD_DYNAMIC 0x0005 /* _DYNAMIC pointer */ +/* These values are MD on these two platforms */ +#if !defined(__sparc64__) && !defined(__powerpc__) #define MODINFOMD_ENVP 0x0006 /* envp[] */ #define MODINFOMD_HOWTO 0x0007 /* boothowto */ #define MODINFOMD_KERNEND 0x0008 /* kernend */ +#endif #define MODINFOMD_NOCOPY 0x8000 /* don't copy this metadata to the kernel */ #define MODINFOMD_DEPLIST (0x4001 | MODINFOMD_NOCOPY) /* depends on */ ==== //depot/projects/hammer/sys/vm/vm_object.c#13 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.277 2003/04/28 03:45:35 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.278 2003/05/01 03:29:20 alc Exp $ */ /* @@ -369,28 +369,26 @@ /* * vm_object_reference: * - * Gets another reference to the given object. + * Gets another reference to the given object. Note: OBJ_DEAD + * objects can be referenced during final cleaning. */ void vm_object_reference(vm_object_t object) { if (object == NULL) return; - - vm_object_lock(object); -#if 0 - /* object can be re-referenced during final cleaning */ - KASSERT(!(object->flags & OBJ_DEAD), - ("vm_object_reference: attempting to reference dead obj")); -#endif - + if (object != kmem_object) + mtx_lock(&Giant); + VM_OBJECT_LOCK(object); object->ref_count++; + VM_OBJECT_UNLOCK(object); if (object->type == OBJT_VNODE) { while (vget((struct vnode *) object->handle, LK_RETRY, curthread)) { printf("vm_object_reference: delay in getting object\n"); } } - vm_object_unlock(object); + if (object != kmem_object) + mtx_unlock(&Giant); } /* From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:09:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D10F37B404; Wed, 30 Apr 2003 21:09:26 -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 1714937B401 for ; Wed, 30 Apr 2003 21:09:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FD9D43FCB for ; Wed, 30 Apr 2003 21:09:25 -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 h4149P0U008938 for ; Wed, 30 Apr 2003 21:09:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4149Ptj008935 for perforce@freebsd.org; Wed, 30 Apr 2003 21:09:25 -0700 (PDT) Date: Wed, 30 Apr 2003 21:09:25 -0700 (PDT) Message-Id: <200305010409.h4149Ptj008935@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 30260 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:09:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30260 Change 30260 by peter@peter_daintree on 2003/04/30 21:09:22 rcsid sync Affected files ... .. //depot/projects/hammer/sys/amd64/include/metadata.h#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/metadata.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/amd64/include/metadata.h,v 1.1 2003/05/01 03:31:17 peter Exp $ */ #ifndef _MACHINE_METADATA_H_ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:11:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A460737B404; Wed, 30 Apr 2003 21:11:29 -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 5AE0F37B401 for ; Wed, 30 Apr 2003 21:11:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E77F143FB1 for ; Wed, 30 Apr 2003 21:11:28 -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 h414BS0U009089 for ; Wed, 30 Apr 2003 21:11:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414BSu4009086 for perforce@freebsd.org; Wed, 30 Apr 2003 21:11:28 -0700 (PDT) Date: Wed, 30 Apr 2003 21:11:28 -0700 (PDT) Message-Id: <200305010411.h414BSu4009086@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 30261 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:11:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30261 Change 30261 by peter@peter_daintree on 2003/04/30 21:10:50 revert to vendor Affected files ... .. //depot/projects/hammer/sys/boot/i386/Makefile#4 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/sys/boot/i386/Makefile,v 1.19 2002/12/31 02:29:03 obrien Exp $ -SUBDIR= btx libi386 loader +SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:12:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E211037B404; Wed, 30 Apr 2003 21:12:31 -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 934BA37B401 for ; Wed, 30 Apr 2003 21:12:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F63043FAF for ; Wed, 30 Apr 2003 21:12:31 -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 h414CU0U009112 for ; Wed, 30 Apr 2003 21:12:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414CU2w009109 for perforce@freebsd.org; Wed, 30 Apr 2003 21:12:30 -0700 (PDT) Date: Wed, 30 Apr 2003 21:12:30 -0700 (PDT) Message-Id: <200305010412.h414CU2w009109@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 30262 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:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30262 Change 30262 by peter@peter_daintree on 2003/04/30 21:12:04 revert to vendor Affected files ... .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#6 edit .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#7 edit Differences ... ==== //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#6 (text+ko) ==== @@ -302,10 +302,6 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); - /* Compatability with older kernels */ - file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto); - file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp); - file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend); *modulep = addr; size = md_copymodules(0); @@ -313,8 +309,6 @@ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); - md = file_findmetadata(kfp, MODINFOMD_OKERNEND); /* Compat */ - bcopy(&kernend, md->md_data, sizeof kernend); (void)md_copymodules(addr); ==== //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#7 (text+ko) ==== @@ -304,10 +304,6 @@ file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); - /* The next three are for compatability with older kernels */ - file_addmetadata(kfp, MODINFOMD_OHOWTO, sizeof howto, &howto); - file_addmetadata(kfp, MODINFOMD_OENVP, sizeof envp, &envp); - file_addmetadata(kfp, MODINFOMD_OKERNEND, sizeof kernend, &kernend); file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slot, &dtlb_slot); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slot, &itlb_slot); file_addmetadata(kfp, MODINFOMD_DTLB, @@ -321,8 +317,6 @@ md = file_findmetadata(kfp, MODINFOMD_KERNEND); bcopy(&kernend, md->md_data, sizeof kernend); - md = file_findmetadata(kfp, MODINFOMD_OKERNEND); /* Compat */ - bcopy(&kernend, md->md_data, sizeof kernend); (void)md_copymodules(addr); 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 $ */ /* From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:13:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B685A37B404; Wed, 30 Apr 2003 21:13:34 -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 51F8737B401 for ; Wed, 30 Apr 2003 21:13:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF08143FAF for ; Wed, 30 Apr 2003 21:13:33 -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 h414DX0U009247 for ; Wed, 30 Apr 2003 21:13:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414DX0J009244 for perforce@freebsd.org; Wed, 30 Apr 2003 21:13:33 -0700 (PDT) Date: Wed, 30 Apr 2003 21:13:33 -0700 (PDT) Message-Id: <200305010413.h414DX0J009244@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 30264 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:13:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30264 Change 30264 by peter@peter_daintree on 2003/04/30 21:13:12 nuke, was added as ldscript.amd64 instead Affected files ... .. //depot/projects/hammer/sys/conf/ldscript.x86_64#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:14:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C420F37B404; Wed, 30 Apr 2003 21:14:36 -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 59ADB37B401 for ; Wed, 30 Apr 2003 21:14:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E65F043F75 for ; Wed, 30 Apr 2003 21:14:35 -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 h414EZ0U009268 for ; Wed, 30 Apr 2003 21:14:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414EZ2D009265 for perforce@freebsd.org; Wed, 30 Apr 2003 21:14:35 -0700 (PDT) Date: Wed, 30 Apr 2003 21:14:35 -0700 (PDT) Message-Id: <200305010414.h414EZ2D009265@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 30265 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:14:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=30265 Change 30265 by peter@peter_daintree on 2003/04/30 21:13:46 rcsid sync Affected files ... .. //depot/projects/hammer/sys/i386/include/metadata.h#3 edit Differences ... ==== //depot/projects/hammer/sys/i386/include/metadata.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/i386/include/metadata.h,v 1.1 2003/05/01 03:31:17 peter Exp $ */ #ifndef _MACHINE_METADATA_H_ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:15:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A97A937B404; Wed, 30 Apr 2003 21:15:38 -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 5F78337B401 for ; Wed, 30 Apr 2003 21:15:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F8A143F93 for ; Wed, 30 Apr 2003 21:15:38 -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 h414Fb0U009381 for ; Wed, 30 Apr 2003 21:15:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414FbDh009378 for perforce@freebsd.org; Wed, 30 Apr 2003 21:15:37 -0700 (PDT) Date: Wed, 30 Apr 2003 21:15:37 -0700 (PDT) Message-Id: <200305010415.h414FbDh009378@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 30266 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:15:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30266 Change 30266 by peter@peter_daintree on 2003/04/30 21:14:35 revert to vendor Affected files ... .. //depot/projects/hammer/sys/sparc64/include/metadata.h#4 edit Differences ... ==== //depot/projects/hammer/sys/sparc64/include/metadata.h#4 (text+ko) ==== @@ -29,10 +29,9 @@ #ifndef _MACHINE_METADATA_H_ #define _MACHINE_METADATA_H_ -/* The first three have been promoted to MI */ -#define MODINFOMD_OENVP 0x1001 -#define MODINFOMD_OHOWTO 0x1002 -#define MODINFOMD_OKERNEND 0x1003 +#define MODINFOMD_ENVP 0x1001 +#define MODINFOMD_HOWTO 0x1002 +#define MODINFOMD_KERNEND 0x1003 #define MODINFOMD_DTLB_SLOTS 0x1004 #define MODINFOMD_ITLB_SLOTS 0x1005 #define MODINFOMD_DTLB 0x1006 From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:16:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB9BB37B404; Wed, 30 Apr 2003 21:16:40 -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 65BDF37B401 for ; Wed, 30 Apr 2003 21:16:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F311043FA3 for ; Wed, 30 Apr 2003 21:16:39 -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 h414Gd0U009408 for ; Wed, 30 Apr 2003 21:16:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414Gdig009405 for perforce@freebsd.org; Wed, 30 Apr 2003 21:16:39 -0700 (PDT) Date: Wed, 30 Apr 2003 21:16:39 -0700 (PDT) Message-Id: <200305010416.h414Gdig009405@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 30267 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:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30267 Change 30267 by peter@peter_daintree on 2003/04/30 21:15:37 fatfingered rcsid Affected files ... .. //depot/projects/hammer/sys/boot/common/load_elf32.c#4 edit Differences ... ==== //depot/projects/hammer/sys/boot/common/load_elf32.c#4 (text+ko) ==== @@ -1,3 +1,3 @@ -* $FreeBSD: src/sys/boot/common/load_elf32.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */ +/* $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" From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:16:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C16A537B404; Wed, 30 Apr 2003 21:16:41 -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 E211937B412 for ; Wed, 30 Apr 2003 21:16:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76E4243FA3 for ; Wed, 30 Apr 2003 21:16:40 -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 h414Ge0U009414 for ; Wed, 30 Apr 2003 21:16:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414GeuD009411 for perforce@freebsd.org; Wed, 30 Apr 2003 21:16:40 -0700 (PDT) Date: Wed, 30 Apr 2003 21:16:40 -0700 (PDT) Message-Id: <200305010416.h414GeuD009411@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 30268 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:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30268 Change 30268 by peter@peter_daintree on 2003/04/30 21:16:03 argh. cut/paste botch on rcsid Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#7 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/biossmap.c#7 (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/biossmap.c,v 1.1 2003/05/01 03:56:29 peter Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:24:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 098CD37B404; Wed, 30 Apr 2003 21:24:53 -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 9988A37B401 for ; Wed, 30 Apr 2003 21:24:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2FFC43FBD for ; Wed, 30 Apr 2003 21:24:51 -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 h414Op0U009815 for ; Wed, 30 Apr 2003 21:24:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414Op98009812 for perforce@freebsd.org; Wed, 30 Apr 2003 21:24:51 -0700 (PDT) Date: Wed, 30 Apr 2003 21:24:51 -0700 (PDT) Message-Id: <200305010424.h414Op98009812@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 30270 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:24:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30270 Change 30270 by peter@peter_daintree on 2003/04/30 21:24:02 remove extra #endif leftover from a merge Affected files ... .. //depot/projects/hammer/sys/dev/fb/fbreg.h#7 edit Differences ... ==== //depot/projects/hammer/sys/dev/fb/fbreg.h#7 (text+ko) ==== @@ -84,7 +84,6 @@ #define fill_io(p, d, c) memset_io((d), (p), (c)) #define fillw(p, d, c) memsetw((d), (p), (c)) #define fillw_io(p, d, c) memsetw_io((d), (p), (c)) -#endif #endif /* !__i386__ */ /* video function table */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:26:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E32F037B404; Wed, 30 Apr 2003 21:26: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 7C93A37B401 for ; Wed, 30 Apr 2003 21:26:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06A9243FAF for ; Wed, 30 Apr 2003 21:26:56 -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 h414Qt0U009986 for ; Wed, 30 Apr 2003 21:26:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414QtmX009983 for perforce@freebsd.org; Wed, 30 Apr 2003 21:26:55 -0700 (PDT) Date: Wed, 30 Apr 2003 21:26:55 -0700 (PDT) Message-Id: <200305010426.h414QtmX009983@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 30272 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:26:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30272 Change 30272 by peter@peter_daintree on 2003/04/30 21:26:18 IFC @30271 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#8 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#10 integrate .. //depot/projects/hammer/sys/dev/kbd/atkbdc.c#5 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#5 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.564 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.565 2003/05/01 04:18:02 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/dev/fb/fbreg.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/dev/fb/fbreg.h,v 1.14 2003/04/29 07:06:44 marcel Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.15 2003/05/01 04:21:05 peter Exp $ */ #ifndef _DEV_FB_FBREG_H_ ==== //depot/projects/hammer/sys/dev/fb/vga.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * (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/dev/fb/vga.c,v 1.24 2003/03/25 00:07:00 jake Exp $ + * $FreeBSD: src/sys/dev/fb/vga.c,v 1.25 2003/05/01 04:21:05 peter Exp $ */ #include "opt_vga.h" ==== //depot/projects/hammer/sys/dev/kbd/atkbdc.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.12 2002/08/19 23:58:37 peter Exp $ + * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.13 2003/05/01 04:19:19 peter Exp $ * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp */ ==== //depot/projects/hammer/sys/isa/vga_isa.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/isa/vga_isa.c,v 1.23 2003/03/25 00:07:03 jake Exp $ + * $FreeBSD: src/sys/isa/vga_isa.c,v 1.24 2003/05/01 04:23:15 peter Exp $ */ #include "opt_vga.h" From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:27:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1684F37B404; Wed, 30 Apr 2003 21:27:59 -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 A3A1C37B401 for ; Wed, 30 Apr 2003 21:27:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3914D43F3F for ; Wed, 30 Apr 2003 21:27:58 -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 h414Rv0U010030 for ; Wed, 30 Apr 2003 21:27:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414RvXO010027 for perforce@freebsd.org; Wed, 30 Apr 2003 21:27:57 -0700 (PDT) Date: Wed, 30 Apr 2003 21:27:57 -0700 (PDT) Message-Id: <200305010427.h414RvXO010027@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 30273 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:28:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=30273 Change 30273 by peter@peter_daintree on 2003/04/30 21:27:13 revert to vendor Affected files ... .. //depot/projects/hammer/sys/dev/sio/sio.c#13 edit Differences ... ==== //depot/projects/hammer/sys/dev/sio/sio.c#13 (text+ko) ==== @@ -934,7 +934,7 @@ com->bst = rman_get_bustag(port); com->bsh = rman_get_bushandle(port); com->cfcr_image = CFCR_8BITS; - com->dtr_wait = hz; + com->dtr_wait = 3 * hz; com->loses_outints = COM_LOSESOUTINTS(flags) != 0; com->no_irq = bus_get_resource(dev, SYS_RES_IRQ, 0, NULL, NULL) != 0; com->tx_fifo_size = 1; From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:30:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47AD837B401; Wed, 30 Apr 2003 21:30:05 -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 2701737B401 for ; Wed, 30 Apr 2003 21:30:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B223343FB1 for ; Wed, 30 Apr 2003 21:30:01 -0700 (PDT) (envelope-from marcel@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 h414U10U010158 for ; Wed, 30 Apr 2003 21:30:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414U06q010155 for perforce@freebsd.org; Wed, 30 Apr 2003 21:30:00 -0700 (PDT) Date: Wed, 30 Apr 2003 21:30:00 -0700 (PDT) Message-Id: <200305010430.h414U06q010155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30274 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:30:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=30274 Change 30274 by marcel@marcel_nfs on 2003/04/30 21:29:37 Diff reduction: remove EPC specific file. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#39 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#39 (text+ko) ==== @@ -94,7 +94,6 @@ ia64/ia64/support.s standard ia64/ia64/swtch.s standard ia64/ia64/sys_machdep.c standard -ia64/ia64/syscall.s standard ia64/ia64/trap.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard From owner-p4-projects@FreeBSD.ORG Wed Apr 30 21:32:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6860137B405; Wed, 30 Apr 2003 21:32:05 -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 E9AF337B401 for ; Wed, 30 Apr 2003 21:32:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AB7E43F3F for ; Wed, 30 Apr 2003 21:32:04 -0700 (PDT) (envelope-from marcel@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 h414W40U010347 for ; Wed, 30 Apr 2003 21:32:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h414W4nm010344 for perforce@freebsd.org; Wed, 30 Apr 2003 21:32:04 -0700 (PDT) Date: Wed, 30 Apr 2003 21:32:04 -0700 (PDT) Message-Id: <200305010432.h414W4nm010344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30275 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:32:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=30275 Change 30275 by marcel@marcel_nfs on 2003/04/30 21:31:30 Diff reduction: remove EPC specific change. Affected files ... .. //depot/projects/ia64/sys/conf/ldscript.ia64#7 edit Differences ... ==== //depot/projects/ia64/sys/conf/ldscript.ia64#7 (text+ko) ==== @@ -11,11 +11,9 @@ .text : { - *(.text) - *(.text.syscall) - *(.text.gateway) *(.text.ivt) . += 8192; + *(.text) *(.stub) /* .gnu.warning sections are handled specially by elf32.em. */ *(.gnu.warning) From owner-p4-projects@FreeBSD.ORG Wed Apr 30 22:01:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EC9237B404; Wed, 30 Apr 2003 22:01:43 -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 CF53737B401 for ; Wed, 30 Apr 2003 22:01:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66BD943F85 for ; Wed, 30 Apr 2003 22:01:42 -0700 (PDT) (envelope-from marcel@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 h4151g0U011522 for ; Wed, 30 Apr 2003 22:01:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4151f6N011519 for perforce@freebsd.org; Wed, 30 Apr 2003 22:01:41 -0700 (PDT) Date: Wed, 30 Apr 2003 22:01:41 -0700 (PDT) Message-Id: <200305010501.h4151f6N011519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30278 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 05:01:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=30278 Change 30278 by marcel@marcel_nfs on 2003/04/30 22:01:01 Diff reduction: remove EPC specific change. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#59 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#59 (text+ko) ==== @@ -121,7 +121,6 @@ #include -#include #include #include @@ -469,8 +468,6 @@ * Clear out any random TLB entries left over from booting. */ pmap_invalidate_all(kernel_pmap); - - map_gateway_page(); } void * From owner-p4-projects@FreeBSD.ORG Wed Apr 30 22:02:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 270EF37B404; Wed, 30 Apr 2003 22:02:45 -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 B721337B401 for ; Wed, 30 Apr 2003 22:02:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50AE443F85 for ; Wed, 30 Apr 2003 22:02:44 -0700 (PDT) (envelope-from marcel@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 h4152i0U011541 for ; Wed, 30 Apr 2003 22:02:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4152h0J011538 for perforce@freebsd.org; Wed, 30 Apr 2003 22:02:43 -0700 (PDT) Date: Wed, 30 Apr 2003 22:02:43 -0700 (PDT) Message-Id: <200305010502.h4152h0J011538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30279 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 05:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30279 Change 30279 by marcel@marcel_nfs on 2003/04/30 22:02:29 Remove EPC specific file from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#6 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 22:04:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 582CA37B404; Wed, 30 Apr 2003 22:04:48 -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 EC03837B401 for ; Wed, 30 Apr 2003 22:04:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C03D43F75 for ; Wed, 30 Apr 2003 22:04:47 -0700 (PDT) (envelope-from marcel@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 h4154l0U012533 for ; Wed, 30 Apr 2003 22:04:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4154klE012530 for perforce@freebsd.org; Wed, 30 Apr 2003 22:04:46 -0700 (PDT) Date: Wed, 30 Apr 2003 22:04:46 -0700 (PDT) Message-Id: <200305010504.h4154klE012530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30280 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 05:04:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=30280 Change 30280 by marcel@marcel_nfs on 2003/04/30 22:03:47 Diff reduction: remove EPC specific file from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/include/_regset.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 30 22:05:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1ED8537B404; Wed, 30 Apr 2003 22:05:50 -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 B16DC37B401 for ; Wed, 30 Apr 2003 22:05:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DB8443F75 for ; Wed, 30 Apr 2003 22:05:49 -0700 (PDT) (envelope-from marcel@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 h4155n0U012705 for ; Wed, 30 Apr 2003 22:05:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4155mEb012702 for perforce@freebsd.org; Wed, 30 Apr 2003 22:05:48 -0700 (PDT) Date: Wed, 30 Apr 2003 22:05:48 -0700 (PDT) Message-Id: <200305010505.h4155mEb012702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30281 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 05:05:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=30281 Change 30281 by marcel@marcel_nfs on 2003/04/30 22:05:03 Diff reduction: remove EPC specific change from this branch. Affected files ... .. //depot/projects/ia64/sys/ia64/include/asm.h#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/asm.h#8 (text+ko) ==== @@ -151,26 +151,16 @@ label: ASCIZ msg; \ .text; - /* * System call glue. */ -#define SYSCALLNUM(name) SYS_ ## name +#define SYSCALLNUM(name) \ + SYS_ ## name #define CALLSYS_NOERROR(name) \ mov r15=SYSCALLNUM(name); \ break 0x100000 ;; -#define EPC_CALLSYS_NOERROR(name) \ -{ .mmi ; \ - alloc r9 = ar.pfs, 0, 0, 8, 0 ; \ - mov r14 = ar.k7 ;; } \ -{ .mib ; \ - mov r8 = SYSCALLNUM(name) ; \ - mov b7 = r14 ; \ - br.call.sptk b6 = b7 } - - /* * WEAK_ALIAS: create a weak alias (ELF only). */ From owner-p4-projects@FreeBSD.ORG Wed Apr 30 22:14:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CF1C37B404; Wed, 30 Apr 2003 22:14:02 -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 3D19437B401 for ; Wed, 30 Apr 2003 22:14:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F24AB43FAF for ; Wed, 30 Apr 2003 22:14:00 -0700 (PDT) (envelope-from marcel@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 h415E00U013059 for ; Wed, 30 Apr 2003 22:14:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h415E0bc013052 for perforce@freebsd.org; Wed, 30 Apr 2003 22:14:00 -0700 (PDT) Date: Wed, 30 Apr 2003 22:14:00 -0700 (PDT) Message-Id: <200305010514.h415E0bc013052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30283 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 05:14:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=30283 Change 30283 by marcel@marcel_pluto1 on 2003/04/30 22:13:54 IFC @30282 Affected files ... .. //depot/projects/ia64/bin/pax/tar.1#6 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#6 integrate .. //depot/projects/ia64/sbin/vinum/list.c#6 integrate .. //depot/projects/ia64/sbin/vinum/v.c#5 integrate .. //depot/projects/ia64/sbin/vinum/vext.h#6 integrate .. //depot/projects/ia64/sys/amd64/Makefile#1 branch .. //depot/projects/ia64/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/ia64/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/exception.s#1 branch .. //depot/projects/ia64/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/locore.s#1 branch .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/sigtramp.s#1 branch .. //depot/projects/ia64/sys/amd64/amd64/support.s#1 branch .. //depot/projects/ia64/sys/amd64/amd64/swtch.s#1 branch .. //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/ia64/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/ia64/sys/amd64/conf/Makefile#1 branch .. //depot/projects/ia64/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/ia64/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/ia64/sys/amd64/include/_types.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/asm.h#1 branch .. //depot/projects/ia64/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/ia64/sys/amd64/include/atomic.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus_at386.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/ia64/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/ia64/sys/amd64/include/clock.h#1 branch .. //depot/projects/ia64/sys/amd64/include/cpu.h#1 branch .. //depot/projects/ia64/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/ia64/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/ia64/sys/amd64/include/critical.h#1 branch .. //depot/projects/ia64/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/ia64/sys/amd64/include/elf.h#1 branch .. //depot/projects/ia64/sys/amd64/include/endian.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/exec.h#1 branch .. //depot/projects/ia64/sys/amd64/include/float.h#1 branch .. //depot/projects/ia64/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/ia64/sys/amd64/include/frame.h#1 branch .. //depot/projects/ia64/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/ia64/sys/amd64/include/kse.h#1 branch .. //depot/projects/ia64/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/ia64/sys/amd64/include/md_var.h#1 branch .. //depot/projects/ia64/sys/amd64/include/metadata.h#1 branch .. //depot/projects/ia64/sys/amd64/include/mutex.h#1 branch .. //depot/projects/ia64/sys/amd64/include/npx.h#1 branch .. //depot/projects/ia64/sys/amd64/include/param.h#2 integrate .. //depot/projects/ia64/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/ia64/sys/amd64/include/pcb.h#1 branch .. //depot/projects/ia64/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/ia64/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/ia64/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/ia64/sys/amd64/include/pmap.h#1 branch .. //depot/projects/ia64/sys/amd64/include/proc.h#1 branch .. //depot/projects/ia64/sys/amd64/include/profile.h#1 branch .. //depot/projects/ia64/sys/amd64/include/psl.h#1 branch .. //depot/projects/ia64/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/ia64/sys/amd64/include/reg.h#1 branch .. //depot/projects/ia64/sys/amd64/include/reloc.h#1 branch .. //depot/projects/ia64/sys/amd64/include/resource.h#1 branch .. //depot/projects/ia64/sys/amd64/include/runq.h#1 branch .. //depot/projects/ia64/sys/amd64/include/segments.h#1 branch .. //depot/projects/ia64/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/ia64/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/ia64/sys/amd64/include/signal.h#1 branch .. //depot/projects/ia64/sys/amd64/include/smp.h#1 branch .. //depot/projects/ia64/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/ia64/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/ia64/sys/amd64/include/trap.h#1 branch .. //depot/projects/ia64/sys/amd64/include/tss.h#1 branch .. //depot/projects/ia64/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/ia64/sys/amd64/include/varargs.h#1 branch .. //depot/projects/ia64/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/ia64/sys/amd64/isa/clock.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu.h#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu_ipl.s#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu_vector.s#1 branch .. //depot/projects/ia64/sys/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/ia64/sys/amd64/isa/isa.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/isa.h#1 branch .. //depot/projects/ia64/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/ia64/sys/amd64/isa/ithread.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/npx.c#1 branch .. //depot/projects/ia64/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/ia64/sys/amd64/isa/vector.s#1 branch .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/ia64/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/ia64/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/ia64/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/ia64/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/ia64/sys/boot/common/bootstrap.h#6 integrate .. //depot/projects/ia64/sys/boot/common/load_elf.c#11 integrate .. //depot/projects/ia64/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/ia64/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#8 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#6 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/ia64/sys/boot/i386/libi386/elf_freebsd.c#3 delete .. //depot/projects/ia64/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/ia64/sys/boot/i386/loader/conf.c#6 integrate .. //depot/projects/ia64/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#7 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/elf_freebsd.c#5 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#12 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/ia64/sys/conf/files.amd64#2 integrate .. //depot/projects/ia64/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/ia64/sys/conf/options.amd64#2 integrate .. //depot/projects/ia64/sys/dev/fb/fbreg.h#7 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#11 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#29 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbdc.c#6 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#9 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#9 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#11 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumkw.h#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumlock.c#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinummemory.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumparser.c#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumraid5.c#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#7 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumutil.c#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#19 integrate .. //depot/projects/ia64/sys/i386/include/elf.h#5 integrate .. //depot/projects/ia64/sys/i386/include/metadata.h#1 branch .. //depot/projects/ia64/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/ia64/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/ia64/sys/isa/vga_isa.c#5 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#22 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#44 integrate .. //depot/projects/ia64/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#26 integrate .. //depot/projects/ia64/sys/sparc64/include/metadata.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#38 integrate .. //depot/projects/ia64/sys/sys/linker.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#49 integrate .. //depot/projects/ia64/sys/x86_64/compile/.cvsignore#2 delete .. //depot/projects/ia64/sys/x86_64/include/_limits.h#3 delete .. //depot/projects/ia64/sys/x86_64/include/_stdint.h#2 delete .. //depot/projects/ia64/sys/x86_64/include/_types.h#3 delete .. //depot/projects/ia64/sys/x86_64/include/endian.h#4 delete .. //depot/projects/ia64/sys/x86_64/include/limits.h#6 delete .. //depot/projects/ia64/sys/x86_64/include/param.h#3 delete .. //depot/projects/ia64/sys/x86_64/include/stdarg.h#5 delete .. //depot/projects/ia64/usr.bin/m4/eval.c#6 integrate Differences ... ==== //depot/projects/ia64/bin/pax/tar.1#6 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (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/bin/pax/tar.1,v 1.6 2002/10/06 07:56:27 tjr Exp $ +.\" $FreeBSD: src/bin/pax/tar.1,v 1.7 2003/05/01 02:37:46 tjr Exp $ .\" $OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $ .\" .Dd February 7, 2001 @@ -41,7 +41,7 @@ .Sm off .Op Fl .Brq Cm crtux -.Op Cm befhmopqsvwzHLOPXZ014578 +.Op Cm befhjmopqsvwyzHLOPXZ014578 .Sm on .Op Ar blocksize .Op Ar archive ==== //depot/projects/ia64/sbin/vinum/commands.c#6 (text+ko) ==== @@ -36,31 +36,11 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: commands.c,v 1.15 2001/05/22 08:40:21 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/commands.c,v 1.46 2003/03/15 20:49:38 phk Exp $ + * $Id: commands.c,v 1.22 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/commands.c,v 1.47 2003/05/01 01:39:49 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "vext.h" -#include -#include -#include -#include -#include -#include -#include #include static void dorename(struct vinum_rename_msg *msg, const char *oldname, const char *name, int maxlen); @@ -122,8 +102,8 @@ char *configline; configline = fgets(buffer, BUFSIZE, dfd); - if (history) - fprintf(history, "%s", buffer); + if (History) + fprintf(History, "%s", buffer); if (configline == NULL) { if (ferror(dfd)) @@ -268,6 +248,9 @@ } } checkupdates(); /* make sure we're updating */ + /* Arguably we should be cleverer about this. */ + if (no_devfs) + make_devices(); } } @@ -277,28 +260,31 @@ char reply[32]; int error; - printf(" WARNING! This command will completely wipe out your vinum configuration.\n" - " All data will be lost. If you really want to do this, enter the text\n\n" - " NO FUTURE\n" - " Enter text -> "); - fgets(reply, sizeof(reply), stdin); - if (strcmp(reply, "NO FUTURE\n")) /* changed his mind */ - printf("\n No change\n"); - else { - error = ioctl(superdev, VINUM_RESETCONFIG, NULL); /* trash config on disk */ - if (error) { - if (errno == EBUSY) - fprintf(stderr, "Can't reset configuration: objects are in use\n"); - else - perror("Can't find vinum config"); - } else { - if (no_devfs) - make_devices(); /* recreate the /dev/vinum hierarchy */ - printf("\b Vinum configuration obliterated\n"); - start_daemon(); /* then restart the daemon */ + if (isatty(STDIN_FILENO)) { + printf(" WARNING! This command will completely wipe out your vinum configuration.\n" + " All data will be lost. If you really want to do this, enter the text\n\n" + " NO FUTURE\n" + " Enter text -> "); + fgets(reply, sizeof(reply), stdin); + if (strcmp(reply, "NO FUTURE\n")) /* changed his mind */ + printf("\n No change\n"); + else { + error = ioctl(superdev, VINUM_RESETCONFIG, NULL); /* trash config on disk */ + if (error) { + if (errno == EBUSY) + fprintf(stderr, "Can't reset configuration: objects are in use\n"); + else + perror("Can't find vinum config"); + } else { + if (no_devfs) + make_devices(); /* recreate the /dev/vinum hierarchy */ + printf("\b Vinum configuration obliterated\n"); + start_daemon(); /* then restart the daemon */ + } } - } - checkupdates(); /* make sure we're updating */ + checkupdates(); /* make sure we're updating */ + } else + fprintf(stderr, "Please enter this command from a terminal\n"); } /* Initialize subdisks */ @@ -310,8 +296,8 @@ int objno; enum objecttype type; /* type returned */ - if (history) - fflush(history); /* don't let all the kids do it. */ + if (History) + fflush(History); /* don't let all the kids do it. */ for (objindex = 0; objindex < argc; objindex++) { objno = find_object(argv[objindex], &type); /* find the object */ if (objno < 0) @@ -399,13 +385,6 @@ } } if (failed == 0) { -#if 0 - message->index = plexno; /* pass object number */ - message->type = plex_object; /* and type of object */ - message->state = object_up; - message->force = 1; /* insist */ - ioctl(superdev, VINUM_SETSTATE, message); -#endif syslog(LOG_INFO | LOG_KERN, "plex %s initialized", plex.name); } else syslog(LOG_ERR | LOG_KERN, "couldn't initialize plex %s, %d processes died", @@ -545,10 +524,11 @@ for (i = 0; i < devs; i++) { struct devstat *stat = &statinfo.dinfo->devices[i]; + /* Submitted by Pete Carah */ if ((((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_DIRECT) /* disk device */ - || ((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) /* storage array */ - &&((stat->device_type & DEVSTAT_TYPE_PASS) == 0) /* and not passthrough */ - &&((stat->device_name[0] != '\0'))) { /* and it has a name */ + ||((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) /* storage array */ + &&((stat->device_type & DEVSTAT_TYPE_PASS) == 0) /* and not passthrough */ + &&((stat->device_name[0] != '\0'))) { /* and it has a name */ sprintf(enamelist, _PATH_DEV "%s%d", stat->device_name, stat->unit_number); token[tokens] = enamelist; /* point to it */ tokens++; /* one more token */ @@ -2098,7 +2078,8 @@ /* * First, check our drives. */ - if (argc & 1) { + if ((argc < 2) + || (argc & 1)) { fprintf(stderr, "You need an even number of drives to create a mirrored volume\n"); return; } ==== //depot/projects/ia64/sbin/vinum/list.c#6 (text+ko) ==== @@ -39,27 +39,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: list.c,v 1.25 2000/12/20 03:38:43 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/list.c,v 1.37 2003/03/15 20:49:38 phk Exp $ + * $Id: list.c,v 1.32 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/list.c,v 1.38 2003/05/01 01:38:55 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "vext.h" #include -#include -#include "vext.h" #include -/* #include */ #include /* @@ -599,6 +585,8 @@ (long long) sd.sectors * DEV_BSIZE, (long long) sd.sectors / (MEGABYTE / DEV_BSIZE), sd_state(sd.state)); + if (sd.flags & VF_RETRYERRORS) + printf("\t\tretryerrors\n"); if (sd.plexno >= 0) { get_plex_info(&plex, sd.plexno); printf("\t\tPlex %s", plex.name); @@ -828,6 +816,21 @@ return &text[11]; } +/* Return the difference in microseconds between two timevals. */ +inline struct timeval +timediff(struct timeval then, struct timeval now) +{ + struct timeval diff; + + diff.tv_sec = now.tv_sec - then.tv_sec; + diff.tv_usec = now.tv_usec - then.tv_usec; + if (diff.tv_usec < 0) { + diff.tv_usec += 1000000; + diff.tv_sec--; + } + return diff; +} + void vinum_info(int argc, char *argv[], char *argv0[]) { @@ -835,6 +838,8 @@ struct mc malloced; int i; struct rqinfo rq; + struct timeval lasttime; /* time of previous request */ + struct timeval diff; /* difference from now */ if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) { perror("Can't get vinum config"); @@ -848,7 +853,8 @@ perror("Can't get information"); return; } - printf("Total of %d blocks malloced, total memory: %d\nMaximum allocs: %8d, malloc table at 0x%08x\n", + printf("Total of %d blocks malloced, total memory: %d\n" + "Maximum allocs: %8d, malloc table at 0x%08x\n", meminfo.mallocs, meminfo.total_malloced, meminfo.highwater, @@ -875,147 +881,194 @@ (char *) &malloced.file); } if (Verbose) { - printf("\nTime\t\t Event\t Buf\tDev\t Offset\tBytes\tSD\tSDoff\tDoffset\tGoffset\n\n"); + if (Verbose > 1) { + lasttime.tv_sec = 0; + lasttime.tv_usec = 0; + printf("\n Time\t\t Event\t Buf\tDev\t Offset\t" + "Bytes\tSD\tSDoff\tDoffset\tGoffset\n\n"); + } else + printf("\nTime\t\t Event\t Buf\tDev\t Offset\tBytes\tSD" + "\tSDoff\tDoffset\tGoffset\n\n"); for (i = RQINFO_SIZE - 1; i >= 0; i--) { /* go through the request list in order */ *((int *) &rq) = i; if (ioctl(superdev, VINUM_RQINFO, &rq) < 0) { perror("Can't get information"); return; } - /* Compress devminor into something printable. */ - rq.devminor = (rq.devminor & 0xff) - | ((rq.devminor & 0xfff0000) >> 8); - switch (rq.type) { - case loginfo_unused: /* never been used */ - break; + if (rq.type != loginfo_unused) { + switch (Verbose) { + case 2: + if ((lasttime.tv_usec != 0) || (lasttime.tv_sec != 0)) { + diff = timediff(lasttime, rq.timestamp); + if (diff.tv_sec != 0) + printf("\n+ %d.%06d sec:\n ", diff.tv_sec, diff.tv_usec); + else + printf("+%6d µs ", diff.tv_usec); + } else + printf(" "); + break; + + case 3: + if ((lasttime.tv_usec != 0) || (lasttime.tv_sec != 0)) + diff = timediff(lasttime, rq.timestamp); + if (diff.tv_sec != 0) + printf("\n+ %d.%06d sec:\n ", diff.tv_sec, diff.tv_usec); + else if (rq.type == loginfo_iodone) { + diff = timediff(rq.info.rqe.launchtime, rq.timestamp); + printf("+%6d µs ", + diff.tv_usec); + } else + printf(" "); + break; + + default: + break; + } - case loginfo_user_bp: /* this is the bp when strategy is called */ - printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.b.b_blkno, - rq.info.b.b_bcount); - break; + /* Compress devminor into something printable. */ + rq.devminor = (rq.devminor & 0xff) + | ((rq.devminor & 0xfff0000) >> 8); + switch (rq.type) { + case loginfo_user_bp: /* this is the bp when strategy is called */ + printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.b.b_blkno, + rq.info.b.b_bcount); + break; - case loginfo_sdiol: /* subdisk I/O launch */ - case loginfo_user_bpl: /* and this is the bp at launch time */ - printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.b.b_blkno, - rq.info.b.b_bcount); - break; + case loginfo_sdiol: /* subdisk I/O launch */ + case loginfo_user_bpl: /* and this is the bp at launch time */ + printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.b.b_blkno, + rq.info.b.b_bcount); + break; - case loginfo_rqe: /* user RQE */ - printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_rqe: /* user RQE */ + /* + * We have two timestamps + * in this request, and + * they might not agree by + * one or two µs. Make + * them agree by force. + */ + rq.timestamp = rq.info.rqe.launchtime; + printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_iodone: /* iodone called */ - printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_iodone: /* iodone called */ + printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_raid5_data: /* RAID-5 write data block */ - printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_raid5_data: /* RAID-5 write data block */ + printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_raid5_parity: /* RAID-5 write parity block */ - printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_raid5_parity: /* RAID-5 write parity block */ + printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_sdio: /* subdisk I/O */ - printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.info.b.b_blkno, - rq.info.b.b_bcount, - rq.devminor); - break; + case loginfo_sdio: /* subdisk I/O */ + printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.info.b.b_blkno, + rq.info.b.b_bcount, + rq.devminor); + break; - case loginfo_sdiodone: /* subdisk I/O done */ - printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.info.b.b_blkno, - rq.info.b.b_bcount, - rq.devminor); - break; + case loginfo_sdiodone: /* subdisk I/O done */ + printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.info.b.b_blkno, + rq.info.b.b_bcount, + rq.devminor); + break; - case loginfo_lockwait: - printf("%s Lockwait %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_lockwait: + printf("%s Lockwait %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; - case loginfo_lock: - printf("%s Lock %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_lock: + printf("%s Lock %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; - case loginfo_unlock: - printf("%s Unlock\t %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_unlock: + printf("%s Unlock\t %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; + default: + printf("*** invalid log type: %d ***\n", rq.type); + } + if (Verbose > 1) + lasttime = rq.timestamp; } } } @@ -1214,7 +1267,7 @@ { int i; - if (argc == 0) { /* start everything */ + if (argc == 0) { /* dump everything */ int devs = devstat_getnumdevs(NULL); struct statinfo statinfo; char *namelist; ==== //depot/projects/ia64/sbin/vinum/v.c#5 (text+ko) ==== @@ -36,37 +36,14 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: v.c,v 1.31 2000/09/03 01:29:26 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/v.c,v 1.37 2003/01/16 23:48:34 joerg Exp $ + * $Id: v.c,v 1.35 2003/04/26 02:02:49 grog Exp $ + * $FreeBSD: src/sbin/vinum/v.c,v 1.38 2003/05/01 01:39:42 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "vext.h" -#include -#include -#include -#include -#include -#include -#include -#include FILE *cf; /* config file handle */ -FILE *history; /* history file */ +FILE *History; /* history file */ char *historyfile; /* and its name */ char *dateformat; /* format in which to store date */ @@ -150,11 +127,11 @@ errno); exit(1); } - history = fopen(historyfile, "a+"); - if (history != NULL) { + History = fopen(historyfile, "a+"); + if (History != NULL) { timestamp(); - fprintf(history, "*** " VINUMMOD " started ***\n"); - fflush(history); /* before we start the daemon */ + fprintf(History, "*** " VINUMMOD " started ***\n"); + fflush(History); /* before we start the daemon */ } if (sysctlbyname("vfs.devfs.generation", NULL, NULL, NULL, 0) == 0) no_devfs = 0; @@ -246,8 +223,8 @@ if (tokens) parseline(tokens, token); /* and do what he says */ } - if (history) - fflush(history); + if (History) + fflush(History); } } return 0; /* normal completion */ @@ -336,11 +313,11 @@ int j; enum keyword command; /* command to execute */ - if (history != NULL) { /* save the command to history file */ + if (History != NULL) { /* save the command to history file */ timestamp(); for (i = 0; i < args; i++) /* all args */ - fprintf(history, "%s ", argv[i]); - fputs("\n", history); + fprintf(History, "%s ", argv[i]); + fputs("\n", History); } if ((args == 0) /* empty line */ ||(*argv[0] == '#')) /* or a comment, */ @@ -544,9 +521,9 @@ perror(VINUMMOD ": Can't write to " _PATH_DEV); return; } - if (history) { + if (History) { timestamp(); - fprintf(history, "*** Created devices ***\n"); + fprintf(History, "*** Created devices ***\n"); } if (superdev >= 0) /* super device open */ close(superdev); @@ -559,10 +536,9 @@ if (mknod(VINUM_SUPERDEV_NAME, S_IRUSR | S_IWUSR | S_IFCHR, /* user only */ - makedev(VINUM_CDEV_MAJOR, VINUM_SUPERDEV)) < 0) + makedev(VINUM_CDEV_MAJOR, VINUM_SUPERDEV_VOL)) < 0) fprintf(stderr, "Can't create %s: %s\n", VINUM_SUPERDEV_NAME, strerror(errno)); - superdev = open(VINUM_SUPERDEV_NAME, O_RDWR); /* open the super device */ if (superdev < 0) { perror(VINUM_SUPERDEV_NAME); @@ -570,7 +546,7 @@ } if (mknod(VINUM_DAEMON_DEV_NAME, /* daemon super device */ S_IRUSR | S_IWUSR | S_IFCHR, /* user only */ - makedev(VINUM_CDEV_MAJOR, VINUM_DAEMON_DEV)) < 0) + makedev(VINUM_CDEV_MAJOR, VINUM_DAEMON_VOL)) < 0) fprintf(stderr, "Can't create %s: %s\n", VINUM_DAEMON_DEV_NAME, strerror(errno)); if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) { @@ -608,26 +584,29 @@ get_volume_info(&vol, volno); if (vol.state != volume_unallocated) { /* we could have holes in our lists */ - voldev = VINUMDEV(volno, 0, 0, VINUM_VOLUME_TYPE); /* create a device number */ + voldev = VINUMDEV(volno, VINUM_VOLUME_TYPE); /* create a device number */ /* Create /dev/vinum/ */ sprintf(filename, VINUM_DIR "/%s", vol.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, voldev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); /* Create /dev/vinum/vol/ */ sprintf(filename, VINUM_DIR "/vol/%s", vol.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, voldev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); if (vol.plexes > 0) { /* Create /dev/vinum/vol/.plex/ */ sprintf(filename, VINUM_DIR "/vol/%s.plex", vol.name); if (mkdir(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IXOTH) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } if (recurse) for (plexno = 0; plexno < vol.plexes; plexno++) @@ -654,23 +633,26 @@ sprintf(filename, VINUM_DIR "/plex/%s", plex.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, plexdev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); if (plex.volno >= 0) { get_volume_info(&vol, plex.volno); - plexdev = VINUMDEV(plex.volno, plexno, 0, VINUM_PLEX_TYPE); + plexdev = VINUMDEV(plex.volno, VINUM_PLEX_TYPE); /* Create device /dev/vinum/vol/.plex/ */ sprintf(filename, VINUM_DIR "/vol/%s.plex/%s", vol.name, plex.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, plexdev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); /* Create directory /dev/vinum/vol/.plex/.sd */ sprintf(filename, VINUM_DIR "/vol/%s.plex/%s.sd", vol.name, plex.name); if (mkdir(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IXOTH) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } if (recurse) { for (sdno = 0; sdno < plex.subdisks; sdno++) { @@ -696,7 +678,8 @@ sprintf(filename, VINUM_DIR "/sd/%s", sd.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, sddev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } } @@ -877,7 +860,7 @@ char datetext[MAXDATETEXT]; time_t sec; - if (history != NULL) { + if (History != NULL) { if (gettimeofday(&now, NULL) != 0) { fprintf(stderr, "Can't get time: %s\n", strerror(errno)); return; @@ -885,7 +868,7 @@ sec = now.tv_sec; date = localtime(&sec); strftime(datetext, MAXDATETEXT, dateformat, date), - fprintf(history, + fprintf(History, "%s.%06ld ", datetext, now.tv_usec); ==== //depot/projects/ia64/sbin/vinum/vext.h#6 (text+ko) ==== @@ -35,14 +35,15 @@ */ /* - * $Id: vext.h,v 1.19 2001/05/23 23:00:12 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/vext.h,v 1.26 2003/02/16 14:13:23 phk Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 30 23:30:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDE0B37B404; Wed, 30 Apr 2003 23:30:37 -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 6D0CE37B401 for ; Wed, 30 Apr 2003 23:30:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C566D43FB1 for ; Wed, 30 Apr 2003 23:30:36 -0700 (PDT) (envelope-from marcel@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 h416Ua0U018236 for ; Wed, 30 Apr 2003 23:30:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h416Uat9018233 for perforce@freebsd.org; Wed, 30 Apr 2003 23:30:36 -0700 (PDT) Date: Wed, 30 Apr 2003 23:30:36 -0700 (PDT) Message-Id: <200305010630.h416Uat9018233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30288 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 06:30:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30288 Change 30288 by marcel@marcel_pluto1 on 2003/04/30 23:30:04 IFC @30287 Affected files ... .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#42 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#22 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#7 integrate Differences ... ==== //depot/projects/ia64/sys/cam/scsi/scsi_da.c#42 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.140 2003/04/30 13:36:51 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.141 2003/05/01 05:16:13 ken Exp $ */ #ifdef _KERNEL @@ -1785,6 +1785,8 @@ int error; softc = (struct da_softc *)periph->softc; + block_len = 0; + maxsector = 0; error = 0; /* Do a read capacity */ ==== //depot/projects/ia64/sys/dev/ata/ata-chipset.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/dev/ata/ata-chipset.c,v 1.20 2003/04/16 08:30:40 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.21 2003/05/01 06:20:50 sos Exp $ */ #include "opt_ata.h" #include @@ -79,12 +79,17 @@ static void ata_via_family_setmode(struct ata_device *, int); static void ata_via_southbridge_fixup(device_t); static int ata_promise_chipinit(device_t); +static int ata_promise_mio_allocate(device_t, struct ata_channel *); static void ata_promise_old_intr(void *); static void ata_promise_tx2_intr(void *); +static void ata_promise_mio_intr(void *); static void ata_promise_setmode(struct ata_device *, int); static int ata_promise_old_dmainit(struct ata_channel *); static int ata_promise_old_dmastart(struct ata_channel *, caddr_t, int32_t,int); static int ata_promise_old_dmastop(struct ata_channel *); +static int ata_promise_mio_dmainit(struct ata_channel *); +static int ata_promise_mio_dmastart(struct ata_channel *, caddr_t, int32_t,int); +static int ata_promise_mio_dmastop(struct ata_channel *); static int ata_serverworks_chipinit(device_t); static void ata_serverworks_setmode(struct ata_device *, int); static int ata_sii_chipinit(device_t); @@ -939,6 +944,18 @@ { ATA_PDC20275, 0, PRTX, 0x00, ATA_UDMA6, "Promise PDC20275" }, { ATA_PDC20276, 0, PRTX, PRSX6K, ATA_UDMA6, "Promise PDC20276" }, { ATA_PDC20277, 0, PRTX, 0x00, ATA_UDMA6, "Promise PDC20277" }, + { ATA_PDC20318, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20318" }, + { ATA_PDC20319, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20319" }, + { ATA_PDC20371, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20371" }, + { ATA_PDC20375, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20375" }, + { ATA_PDC20376, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20376" }, + { ATA_PDC20377, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20377" }, + { ATA_PDC20378, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20378" }, + { ATA_PDC20379, 0, PRMIO, PRSATA, ATA_UDMA6, "Promise PDC20379" }, + { ATA_PDC20617, 0, PRMIO, PRDUAL, ATA_UDMA6, "Promise PDC20617" }, + { ATA_PDC20618, 0, PRMIO, PRDUAL, ATA_UDMA6, "Promise PDC20618" }, + { ATA_PDC20619, 0, PRMIO, PRDUAL, ATA_UDMA6, "Promise PDC20619" }, + { ATA_PDC20620, 0, PRMIO, PRDUAL, ATA_UDMA6, "Promise PDC20620" }, { 0, 0, 0, 0, 0, 0}}; char *desc, buffer[64]; uintptr_t devid = 0; @@ -1015,11 +1032,67 @@ return ENXIO; } break; + + case PRMIO: + rid = 0x1c; + if (!(ctlr->r_io2 = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, + 0, ~0, 1, RF_ACTIVE))) + return ENXIO; + + ctlr->dmainit = ata_promise_mio_dmainit; + ctlr->allocate = ata_promise_mio_allocate; + + if (ctlr->chip->cfg2 & PRDUAL) { + ctlr->channels = ((ATA_INL(ctlr->r_io2, 0x48) & 0x01) > 0) + + ((ATA_INL(ctlr->r_io2, 0x48) & 0x02) > 0) + 2; + } + else if (ctlr->chip->cfg2 & PRSATA) { + ATA_OUTL(ctlr->r_io2, 0x06c, 0x00ff0033); + ctlr->channels = ((ATA_INL(ctlr->r_io2, 0x48) & 0x02) > 0) + 3; + } + else + ctlr->channels = 4; + + if ((bus_setup_intr(dev, ctlr->r_irq, INTR_TYPE_BIO | INTR_ENTROPY, + ata_promise_mio_intr, ctlr, &ctlr->handle))) { + device_printf(dev, "unable to setup interrupt\n"); + return ENXIO; + } + break; } ctlr->setmode = ata_promise_setmode; return 0; } +static int +ata_promise_mio_allocate(device_t dev, struct ata_channel *ch) +{ + struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev)); + int i; + + for (i = ATA_DATA; i <= ATA_STATUS; i++) { + ch->r_io[i].res = ctlr->r_io2; + ch->r_io[i].offset = 0x200 + (i << 2) + (ch->unit << 7); + } + ch->r_io[ATA_ALTSTAT].res = ctlr->r_io2; + ch->r_io[ATA_ALTSTAT].offset = 0x238 + (ch->unit << 7); + ch->r_io[ATA_BMCTL_PORT].res = ctlr->r_io2; + ch->r_io[ATA_BMCTL_PORT].offset = 0x260 + (ch->unit << 7); + ch->r_io[ATA_BMDTP_PORT].res = ctlr->r_io2; + ch->r_io[ATA_BMDTP_PORT].offset = 0x244 + (ch->unit << 7); + ch->r_io[ATA_BMDEVSPEC_0].res = ctlr->r_io2; + ch->r_io[ATA_BMDEVSPEC_0].offset = (ch->unit << 2); + ch->r_io[ATA_IDX_ADDR].res = ctlr->r_io2; + + ATA_IDX_OUTL(ch, ATA_BMCMD_PORT, + (ATA_IDX_INL(ch, ATA_BMCMD_PORT) & ~0x00000f8f) | ch->unit); + ATA_IDX_OUTL(ch, ATA_BMDEVSPEC_0, 0x00000001); + + ch->flags |= ATA_NO_SLAVE; + ctlr->dmainit(ch); + return 0; +} + static void ata_promise_old_intr(void *data) { @@ -1072,6 +1145,24 @@ } static void +ata_promise_mio_intr(void *data) +{ + struct ata_pci_controller *ctlr = data; + struct ata_channel *ch; + u_int32_t irq_vector; + int unit; + + irq_vector = ATA_INL(ctlr->r_io2, 0x0040); + for (unit = 0; unit < ctlr->channels; unit++) { + if (irq_vector & (1 << unit)) { + if ((ch = ctlr->interrupt[unit].argument)) + ctlr->interrupt[unit].function(ch); + ATA_IDX_OUTL(ch, ATA_BMDEVSPEC_0, 0x00000001); + } + } +} + +static void ata_promise_setmode(struct ata_device *atadev, int mode) { device_t parent = device_get_parent(atadev->channel->dev); @@ -1098,8 +1189,19 @@ mode = ata_limit_mode(atadev, mode, ctlr->chip->max_dma); - /* is this a TX2 or later chip ? */ switch (ctlr->chip->cfg1) { + case PROLD: + case PRNEW: + if (mode > ATA_UDMA2 && (pci_read_config(parent, 0x50, 2) & + (atadev->channel->unit ? 1 << 11 : 1 << 10))) { + ata_prtdev(atadev, + "DMA limited to UDMA33, non-ATA66 cable or device\n"); + mode = ATA_UDMA2; + } + if (ATAPI_DEVICE(atadev) && mode > ATA_PIO_MAX) + mode = ata_limit_mode(atadev, mode, ATA_PIO_MAX); + break; + case PRTX: ATA_IDX_OUTB(atadev->channel, ATA_BMDEVSPEC_0, 0x0b); if (mode > ATA_UDMA2 && @@ -1110,16 +1212,14 @@ } break; - case PROLD: - case PRNEW: - if (mode > ATA_UDMA2 && (pci_read_config(parent, 0x50, 2) & - (atadev->channel->unit ? 1 << 11 : 1 << 10))) { + case PRMIO: + if (mode > ATA_UDMA2 && + (ATA_IDX_INL(atadev->channel, ATA_BMCTL_PORT) & 0x01000000)) { ata_prtdev(atadev, "DMA limited to UDMA33, non-ATA66 cable or device\n"); mode = ATA_UDMA2; } - if (ATAPI_DEVICE(atadev) && mode > ATA_PIO_MAX) - mode = ata_limit_mode(atadev, mode, ATA_PIO_MAX); + break; } error = ata_command(atadev, ATA_C_SETFEATURES, 0, mode, @@ -1196,6 +1296,43 @@ return error; } +static int +ata_promise_mio_dmainit(struct ata_channel *ch) +{ + int error; + + if ((error = ata_dmainit(ch))) + return error; + + ch->dma->start = ata_promise_mio_dmastart; + ch->dma->stop = ata_promise_mio_dmastop; + return 0; +} + +static int +ata_promise_mio_dmastart(struct ata_channel *ch, + caddr_t data, int32_t count, int dir) +{ + int error; + + if ((error = ata_dmastart(ch, data, count, dir))) + return error; + + ATA_IDX_OUTL(ch, ATA_BMDTP_PORT, ch->dma->mdmatab); + ATA_IDX_OUTL(ch, ATA_BMCTL_PORT, + (ATA_IDX_INL(ch, ATA_BMCTL_PORT) & ~0x000000c0) | + ((dir) ? 0x00000080 : 0x000000c0)); + return error; +} + +static int +ata_promise_mio_dmastop(struct ata_channel *ch) +{ + ATA_IDX_OUTL(ch, ATA_BMCTL_PORT, + ATA_IDX_INL(ch, ATA_BMCTL_PORT) & ~0x00000080); + return ata_dmastop(ch); +} + /* * ServerWorks chipset support functions */ ==== //depot/projects/ia64/sys/dev/ata/ata-disk.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/dev/ata/ata-disk.c,v 1.151 2003/04/07 14:14:29 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.152 2003/05/01 06:17:30 sos Exp $ */ #include "opt_ata.h" @@ -121,8 +121,8 @@ !(atadev->param->atavalid & ATA_FLAG_54_58) || !lbasize) adp->flags |= AD_F_CHS_USED; - /* use the 28bit LBA size if valid */ - if (atadev->param->cylinders == 16383 && adp->total_secs < lbasize) + /* use the 28bit LBA size if valid or bigger than the CHS mapping */ + if (atadev->param->cylinders == 16383 || adp->total_secs < lbasize) adp->total_secs = lbasize; lbasize48 = ((u_int64_t)atadev->param->lba_size48_1) | ==== //depot/projects/ia64/sys/dev/ata/ata-pci.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/dev/ata/ata-pci.h,v 1.7 2003/04/10 12:24:39 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.8 2003/05/01 06:20:50 sos Exp $ */ /* structure holding chipset config info */ @@ -129,7 +129,18 @@ #define ATA_PDC20275 0x1275105a #define ATA_PDC20276 0x5275105a #define ATA_PDC20277 0x7275105a +#define ATA_PDC20318 0x3318105a +#define ATA_PDC20319 0x3319105a +#define ATA_PDC20371 0x3371105a +#define ATA_PDC20375 0x3375105a #define ATA_PDC20376 0x3376105a +#define ATA_PDC20377 0x3377105a +#define ATA_PDC20378 0x3373105a +#define ATA_PDC20379 0x3372105a +#define ATA_PDC20617 0x6617105a +#define ATA_PDC20618 0x6626105a +#define ATA_PDC20619 0x6629105a +#define ATA_PDC20620 0x6620105a #define ATA_PDC20621 0x6621105a #define ATA_SERVERWORKS_ID 0x1166 @@ -216,9 +227,13 @@ #define PROLD 0 #define PRNEW 1 #define PRTX 2 -#define PRMEM 3 +#define PRMIO 3 +#define PRIDX 4 #define PRTX4 0x01 -#define PRSX6K 0x02 +#define PRSX4K 0x02 +#define PRSX6K 0x04 +#define PRSATA 0x08 +#define PRDUAL 0x10 #define SWKS33 0 #define SWKS66 1 From owner-p4-projects@FreeBSD.ORG Thu May 1 00:37:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65C1F37B404; Thu, 1 May 2003 00:37:01 -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 18F7C37B401 for ; Thu, 1 May 2003 00:37:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A16E843FA3 for ; Thu, 1 May 2003 00:37:00 -0700 (PDT) (envelope-from marcel@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 h417b00U021874 for ; Thu, 1 May 2003 00:37:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h417ax4b021867 for perforce@freebsd.org; Thu, 1 May 2003 00:36:59 -0700 (PDT) Date: Thu, 1 May 2003 00:36:59 -0700 (PDT) Message-Id: <200305010736.h417ax4b021867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30293 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 07:37:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=30293 Change 30293 by marcel@marcel_nfs on 2003/05/01 00:36:55 IFia64_epc: unstaticize comdefaultrate and comdefaultrclk Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#42 integrate Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#42 (text+ko) ==== @@ -186,9 +186,9 @@ .d_kqfilter = ttykqfilter, }; -static speed_t comdefaultrate = CONSPEED; +speed_t comdefaultrate = CONSPEED; -static u_long comdefaultrclk = DEFAULT_RCLK; +u_long comdefaultrclk = DEFAULT_RCLK; SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, ""); static speed_t gdbdefaultrate = GDBSPEED; From owner-p4-projects@FreeBSD.ORG Thu May 1 00:59:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD6737B404; Thu, 1 May 2003 00:59:31 -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 F30C337B401 for ; Thu, 1 May 2003 00:59:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CF4C43FA3 for ; Thu, 1 May 2003 00:59:29 -0700 (PDT) (envelope-from marcel@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 h417xT0U027872 for ; Thu, 1 May 2003 00:59:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h417xSjx027869 for perforce@freebsd.org; Thu, 1 May 2003 00:59:28 -0700 (PDT) Date: Thu, 1 May 2003 00:59:28 -0700 (PDT) Message-Id: <200305010759.h417xSjx027869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30295 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 07:59:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30295 Change 30295 by marcel@marcel_pluto1 on 2003/05/01 00:59:08 IFia64: this integ did not take the EPC related cleanups on the ia64 branch. This increases the diff between the two branches. Affected files ... .. //depot/projects/ia64_epc/Makefile#4 integrate .. //depot/projects/ia64_epc/bin/pax/tar.1#2 integrate .. //depot/projects/ia64_epc/lib/libc/ia64/sys/brk.S#4 integrate .. //depot/projects/ia64_epc/lib/libc/ia64/sys/sbrk.S#4 integrate .. //depot/projects/ia64_epc/lib/libthr/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/ia64_epc/lib/libthr/arch/ia64/ia64/_curthread.c#3 integrate .. //depot/projects/ia64_epc/sbin/vinum/commands.c#4 integrate .. //depot/projects/ia64_epc/sbin/vinum/list.c#4 integrate .. //depot/projects/ia64_epc/sbin/vinum/v.c#2 integrate .. //depot/projects/ia64_epc/sbin/vinum/vext.h#3 integrate .. //depot/projects/ia64_epc/sys/amd64/Makefile#1 branch .. //depot/projects/ia64_epc/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/exception.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/locore.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/sigtramp.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/support.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/swtch.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/ia64_epc/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/ia64_epc/sys/amd64/conf/Makefile#1 branch .. //depot/projects/ia64_epc/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/_types.h#2 integrate .. //depot/projects/ia64_epc/sys/amd64/include/asm.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/atomic.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/bus.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/bus_at386.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/clock.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/cpu.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/critical.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/elf.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/endian.h#2 integrate .. //depot/projects/ia64_epc/sys/amd64/include/exec.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/float.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/frame.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/kse.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/md_var.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/metadata.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/mutex.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/npx.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/param.h#2 integrate .. //depot/projects/ia64_epc/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/pcb.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/pmap.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/proc.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/profile.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/psl.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/reg.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/reloc.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/resource.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/runq.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/segments.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/signal.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/smp.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/trap.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/tss.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/varargs.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/clock.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/icu.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/icu_ipl.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/icu_vector.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/isa.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/isa.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/ithread.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/npx.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/vector.s#1 branch .. //depot/projects/ia64_epc/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/ia64_epc/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/ia64_epc/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/ia64_epc/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/ia64_epc/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/ia64_epc/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/ia64_epc/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/ia64_epc/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/ia64_epc/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/ia64_epc/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/ia64_epc/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/ia64_epc/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/ia64_epc/sys/boot/i386/libi386/elf_freebsd.c#3 delete .. //depot/projects/ia64_epc/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/ia64_epc/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/ia64_epc/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/ia64_epc/sys/conf/files.amd64#2 integrate .. //depot/projects/ia64_epc/sys/conf/files.ia64#12 integrate .. //depot/projects/ia64_epc/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/ia64_epc/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/ia64_epc/sys/conf/options.amd64#2 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/ia64_epc/sys/dev/fb/fbreg.h#5 integrate .. //depot/projects/ia64_epc/sys/dev/fb/vga.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#13 integrate .. //depot/projects/ia64_epc/sys/dev/kbd/atkbdc.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumext.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumio.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumioctl.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumkw.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumlock.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinummemory.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumparser.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumraid5.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumrequest.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumrevive.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumutil.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/ia64_epc/sys/i386/include/elf.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/metadata.h#1 branch .. //depot/projects/ia64_epc/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/ia64_epc/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/exception.s#18 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#20 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/mp_machdep.c#9 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/ia64_epc/sys/ia64/include/asm.h#5 integrate .. //depot/projects/ia64_epc/sys/ia64/include/cpu.h#7 integrate .. //depot/projects/ia64_epc/sys/isa/vga_isa.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_default.c#8 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/ia64_epc/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/metadata.h#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/machdep.c#10 integrate .. //depot/projects/ia64_epc/sys/sys/linker.h#2 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.c#13 integrate .. //depot/projects/ia64_epc/sys/x86_64/compile/.cvsignore#2 delete .. //depot/projects/ia64_epc/sys/x86_64/include/_limits.h#3 delete .. //depot/projects/ia64_epc/sys/x86_64/include/_stdint.h#2 delete .. //depot/projects/ia64_epc/sys/x86_64/include/_types.h#3 delete .. //depot/projects/ia64_epc/sys/x86_64/include/endian.h#2 delete .. //depot/projects/ia64_epc/sys/x86_64/include/limits.h#3 delete .. //depot/projects/ia64_epc/sys/x86_64/include/param.h#2 delete .. //depot/projects/ia64_epc/sys/x86_64/include/stdarg.h#2 delete .. //depot/projects/ia64_epc/usr.bin/m4/eval.c#2 integrate Differences ... ==== //depot/projects/ia64_epc/Makefile#4 (text+ko) ==== @@ -62,9 +62,7 @@ cleandepend cleandir depend distribute distributeworld everything \ hierarchy install installcheck installkernel \ reinstallkernel installmost installworld libraries lint maninstall \ - mk most obj objlink regress rerelease tags update \ - _worldtmp _bootstrap-tools _cleanobj _obj _build-tools \ - _cross-tools _includes _libraries _depend + mk most obj objlink regress rerelease tags update BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/ia64_epc/bin/pax/tar.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (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/bin/pax/tar.1,v 1.6 2002/10/06 07:56:27 tjr Exp $ +.\" $FreeBSD: src/bin/pax/tar.1,v 1.7 2003/05/01 02:37:46 tjr Exp $ .\" $OpenBSD: tar.1,v 1.33 2001/05/01 17:58:01 aaron Exp $ .\" .Dd February 7, 2001 @@ -41,7 +41,7 @@ .Sm off .Op Fl .Brq Cm crtux -.Op Cm befhmopqsvwzHLOPXZ014578 +.Op Cm befhjmopqsvwyzHLOPXZ014578 .Sm on .Op Ar blocksize .Op Ar archive ==== //depot/projects/ia64_epc/lib/libc/ia64/sys/brk.S#4 (text+ko) ==== ==== //depot/projects/ia64_epc/lib/libc/ia64/sys/sbrk.S#4 (text+ko) ==== ==== //depot/projects/ia64_epc/lib/libthr/arch/ia64/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.1 2003/04/20 03:06:42 marcel Exp $ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} ==== //depot/projects/ia64_epc/lib/libthr/arch/ia64/ia64/_curthread.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libthr/arch/ia64/ia64/_curthread.c,v 1.1 2003/04/20 03:06:42 marcel Exp $"); #include #include ==== //depot/projects/ia64_epc/sbin/vinum/commands.c#4 (text+ko) ==== @@ -36,31 +36,11 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: commands.c,v 1.15 2001/05/22 08:40:21 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/commands.c,v 1.46 2003/03/15 20:49:38 phk Exp $ + * $Id: commands.c,v 1.22 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/commands.c,v 1.47 2003/05/01 01:39:49 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "vext.h" -#include -#include -#include -#include -#include -#include -#include #include static void dorename(struct vinum_rename_msg *msg, const char *oldname, const char *name, int maxlen); @@ -122,8 +102,8 @@ char *configline; configline = fgets(buffer, BUFSIZE, dfd); - if (history) - fprintf(history, "%s", buffer); + if (History) + fprintf(History, "%s", buffer); if (configline == NULL) { if (ferror(dfd)) @@ -268,6 +248,9 @@ } } checkupdates(); /* make sure we're updating */ + /* Arguably we should be cleverer about this. */ + if (no_devfs) + make_devices(); } } @@ -277,28 +260,31 @@ char reply[32]; int error; - printf(" WARNING! This command will completely wipe out your vinum configuration.\n" - " All data will be lost. If you really want to do this, enter the text\n\n" - " NO FUTURE\n" - " Enter text -> "); - fgets(reply, sizeof(reply), stdin); - if (strcmp(reply, "NO FUTURE\n")) /* changed his mind */ - printf("\n No change\n"); - else { - error = ioctl(superdev, VINUM_RESETCONFIG, NULL); /* trash config on disk */ - if (error) { - if (errno == EBUSY) - fprintf(stderr, "Can't reset configuration: objects are in use\n"); - else - perror("Can't find vinum config"); - } else { - if (no_devfs) - make_devices(); /* recreate the /dev/vinum hierarchy */ - printf("\b Vinum configuration obliterated\n"); - start_daemon(); /* then restart the daemon */ + if (isatty(STDIN_FILENO)) { + printf(" WARNING! This command will completely wipe out your vinum configuration.\n" + " All data will be lost. If you really want to do this, enter the text\n\n" + " NO FUTURE\n" + " Enter text -> "); + fgets(reply, sizeof(reply), stdin); + if (strcmp(reply, "NO FUTURE\n")) /* changed his mind */ + printf("\n No change\n"); + else { + error = ioctl(superdev, VINUM_RESETCONFIG, NULL); /* trash config on disk */ + if (error) { + if (errno == EBUSY) + fprintf(stderr, "Can't reset configuration: objects are in use\n"); + else + perror("Can't find vinum config"); + } else { + if (no_devfs) + make_devices(); /* recreate the /dev/vinum hierarchy */ + printf("\b Vinum configuration obliterated\n"); + start_daemon(); /* then restart the daemon */ + } } - } - checkupdates(); /* make sure we're updating */ + checkupdates(); /* make sure we're updating */ + } else + fprintf(stderr, "Please enter this command from a terminal\n"); } /* Initialize subdisks */ @@ -310,8 +296,8 @@ int objno; enum objecttype type; /* type returned */ - if (history) - fflush(history); /* don't let all the kids do it. */ + if (History) + fflush(History); /* don't let all the kids do it. */ for (objindex = 0; objindex < argc; objindex++) { objno = find_object(argv[objindex], &type); /* find the object */ if (objno < 0) @@ -399,13 +385,6 @@ } } if (failed == 0) { -#if 0 - message->index = plexno; /* pass object number */ - message->type = plex_object; /* and type of object */ - message->state = object_up; - message->force = 1; /* insist */ - ioctl(superdev, VINUM_SETSTATE, message); -#endif syslog(LOG_INFO | LOG_KERN, "plex %s initialized", plex.name); } else syslog(LOG_ERR | LOG_KERN, "couldn't initialize plex %s, %d processes died", @@ -545,10 +524,11 @@ for (i = 0; i < devs; i++) { struct devstat *stat = &statinfo.dinfo->devices[i]; + /* Submitted by Pete Carah */ if ((((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_DIRECT) /* disk device */ - || ((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) /* storage array */ - &&((stat->device_type & DEVSTAT_TYPE_PASS) == 0) /* and not passthrough */ - &&((stat->device_name[0] != '\0'))) { /* and it has a name */ + ||((stat->device_type & DEVSTAT_TYPE_MASK) == DEVSTAT_TYPE_STORARRAY)) /* storage array */ + &&((stat->device_type & DEVSTAT_TYPE_PASS) == 0) /* and not passthrough */ + &&((stat->device_name[0] != '\0'))) { /* and it has a name */ sprintf(enamelist, _PATH_DEV "%s%d", stat->device_name, stat->unit_number); token[tokens] = enamelist; /* point to it */ tokens++; /* one more token */ @@ -2098,7 +2078,8 @@ /* * First, check our drives. */ - if (argc & 1) { + if ((argc < 2) + || (argc & 1)) { fprintf(stderr, "You need an even number of drives to create a mirrored volume\n"); return; } ==== //depot/projects/ia64_epc/sbin/vinum/list.c#4 (text+ko) ==== @@ -39,27 +39,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: list.c,v 1.25 2000/12/20 03:38:43 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/list.c,v 1.37 2003/03/15 20:49:38 phk Exp $ + * $Id: list.c,v 1.32 2003/04/28 06:19:06 grog Exp $ + * $FreeBSD: src/sbin/vinum/list.c,v 1.38 2003/05/01 01:38:55 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "vext.h" #include -#include -#include "vext.h" #include -/* #include */ #include /* @@ -599,6 +585,8 @@ (long long) sd.sectors * DEV_BSIZE, (long long) sd.sectors / (MEGABYTE / DEV_BSIZE), sd_state(sd.state)); + if (sd.flags & VF_RETRYERRORS) + printf("\t\tretryerrors\n"); if (sd.plexno >= 0) { get_plex_info(&plex, sd.plexno); printf("\t\tPlex %s", plex.name); @@ -828,6 +816,21 @@ return &text[11]; } +/* Return the difference in microseconds between two timevals. */ +inline struct timeval +timediff(struct timeval then, struct timeval now) +{ + struct timeval diff; + + diff.tv_sec = now.tv_sec - then.tv_sec; + diff.tv_usec = now.tv_usec - then.tv_usec; + if (diff.tv_usec < 0) { + diff.tv_usec += 1000000; + diff.tv_sec--; + } + return diff; +} + void vinum_info(int argc, char *argv[], char *argv0[]) { @@ -835,6 +838,8 @@ struct mc malloced; int i; struct rqinfo rq; + struct timeval lasttime; /* time of previous request */ + struct timeval diff; /* difference from now */ if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) { perror("Can't get vinum config"); @@ -848,7 +853,8 @@ perror("Can't get information"); return; } - printf("Total of %d blocks malloced, total memory: %d\nMaximum allocs: %8d, malloc table at 0x%08x\n", + printf("Total of %d blocks malloced, total memory: %d\n" + "Maximum allocs: %8d, malloc table at 0x%08x\n", meminfo.mallocs, meminfo.total_malloced, meminfo.highwater, @@ -875,147 +881,194 @@ (char *) &malloced.file); } if (Verbose) { - printf("\nTime\t\t Event\t Buf\tDev\t Offset\tBytes\tSD\tSDoff\tDoffset\tGoffset\n\n"); + if (Verbose > 1) { + lasttime.tv_sec = 0; + lasttime.tv_usec = 0; + printf("\n Time\t\t Event\t Buf\tDev\t Offset\t" + "Bytes\tSD\tSDoff\tDoffset\tGoffset\n\n"); + } else + printf("\nTime\t\t Event\t Buf\tDev\t Offset\tBytes\tSD" + "\tSDoff\tDoffset\tGoffset\n\n"); for (i = RQINFO_SIZE - 1; i >= 0; i--) { /* go through the request list in order */ *((int *) &rq) = i; if (ioctl(superdev, VINUM_RQINFO, &rq) < 0) { perror("Can't get information"); return; } - /* Compress devminor into something printable. */ - rq.devminor = (rq.devminor & 0xff) - | ((rq.devminor & 0xfff0000) >> 8); - switch (rq.type) { - case loginfo_unused: /* never been used */ - break; + if (rq.type != loginfo_unused) { + switch (Verbose) { + case 2: + if ((lasttime.tv_usec != 0) || (lasttime.tv_sec != 0)) { + diff = timediff(lasttime, rq.timestamp); + if (diff.tv_sec != 0) + printf("\n+ %d.%06d sec:\n ", diff.tv_sec, diff.tv_usec); + else + printf("+%6d µs ", diff.tv_usec); + } else + printf(" "); + break; + + case 3: + if ((lasttime.tv_usec != 0) || (lasttime.tv_sec != 0)) + diff = timediff(lasttime, rq.timestamp); + if (diff.tv_sec != 0) + printf("\n+ %d.%06d sec:\n ", diff.tv_sec, diff.tv_usec); + else if (rq.type == loginfo_iodone) { + diff = timediff(rq.info.rqe.launchtime, rq.timestamp); + printf("+%6d µs ", + diff.tv_usec); + } else + printf(" "); + break; + + default: + break; + } - case loginfo_user_bp: /* this is the bp when strategy is called */ - printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.b.b_blkno, - rq.info.b.b_bcount); - break; + /* Compress devminor into something printable. */ + rq.devminor = (rq.devminor & 0xff) + | ((rq.devminor & 0xfff0000) >> 8); + switch (rq.type) { + case loginfo_user_bp: /* this is the bp when strategy is called */ + printf("%s %dVS %s %p\t%2d.%-6d 0x%9llx\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.b.b_blkno, + rq.info.b.b_bcount); + break; - case loginfo_sdiol: /* subdisk I/O launch */ - case loginfo_user_bpl: /* and this is the bp at launch time */ - printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.b.b_blkno, - rq.info.b.b_bcount); - break; + case loginfo_sdiol: /* subdisk I/O launch */ + case loginfo_user_bpl: /* and this is the bp at launch time */ + printf("%s %dLR %s %p\t%2d.%-6d 0x%9llx\t%ld\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.b.b_blkno, + rq.info.b.b_bcount); + break; - case loginfo_rqe: /* user RQE */ - printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_rqe: /* user RQE */ + /* + * We have two timestamps + * in this request, and + * they might not agree by + * one or two µs. Make + * them agree by force. + */ + rq.timestamp = rq.info.rqe.launchtime; + printf("%s 3RQ %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_iodone: /* iodone called */ - printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_iodone: /* iodone called */ + printf("%s 4DN %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_raid5_data: /* RAID-5 write data block */ - printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_raid5_data: /* RAID-5 write data block */ + printf("%s 5RD %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_raid5_parity: /* RAID-5 write parity block */ - printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", - timetext(&rq.timestamp), - rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.devmajor, - rq.devminor, - rq.info.rqe.b.b_blkno, - rq.info.rqe.b.b_bcount, - rq.info.rqe.sdno, - rq.info.rqe.sdoffset, - rq.info.rqe.dataoffset, - rq.info.rqe.groupoffset); - break; + case loginfo_raid5_parity: /* RAID-5 write parity block */ + printf("%s 6RP %s %p\t%2d.%-6d 0x%9llx\t%ld\t%d\t%6x\t%6x\t%x\n", + timetext(&rq.timestamp), + rq.info.rqe.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.devmajor, + rq.devminor, + rq.info.rqe.b.b_blkno, + rq.info.rqe.b.b_bcount, + rq.info.rqe.sdno, + rq.info.rqe.sdoffset, + rq.info.rqe.dataoffset, + rq.info.rqe.groupoffset); + break; - case loginfo_sdio: /* subdisk I/O */ - printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.info.b.b_blkno, - rq.info.b.b_bcount, - rq.devminor); - break; + case loginfo_sdio: /* subdisk I/O */ + printf("%s %dVS %s %p\t\t 0x%9llx\t%ld\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.info.b.b_blkno, + rq.info.b.b_bcount, + rq.devminor); + break; - case loginfo_sdiodone: /* subdisk I/O done */ - printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", - timetext(&rq.timestamp), - rq.type, - rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", - rq.bp, - rq.info.b.b_blkno, - rq.info.b.b_bcount, - rq.devminor); - break; + case loginfo_sdiodone: /* subdisk I/O done */ + printf("%s %dSD %s %p\t\t 0x%9llx\t%ld\t%d\n", + timetext(&rq.timestamp), + rq.type, + rq.info.b.b_iocmd == BIO_READ ? "Read " : "Write", + rq.bp, + rq.info.b.b_blkno, + rq.info.b.b_bcount, + rq.devminor); + break; - case loginfo_lockwait: - printf("%s Lockwait %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_lockwait: + printf("%s Lockwait %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; - case loginfo_lock: - printf("%s Lock %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_lock: + printf("%s Lock %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; - case loginfo_unlock: - printf("%s Unlock\t %p\t 0x%x\n", - timetext(&rq.timestamp), - rq.bp, - rq.info.lockinfo.stripe); - break; + case loginfo_unlock: + printf("%s Unlock\t %p\t 0x%x\n", + timetext(&rq.timestamp), + rq.bp, + rq.info.lockinfo.stripe); + break; + default: + printf("*** invalid log type: %d ***\n", rq.type); + } + if (Verbose > 1) + lasttime = rq.timestamp; } } } @@ -1214,7 +1267,7 @@ { int i; - if (argc == 0) { /* start everything */ + if (argc == 0) { /* dump everything */ int devs = devstat_getnumdevs(NULL); struct statinfo statinfo; char *namelist; ==== //depot/projects/ia64_epc/sbin/vinum/v.c#2 (text+ko) ==== @@ -36,37 +36,14 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: v.c,v 1.31 2000/09/03 01:29:26 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/v.c,v 1.37 2003/01/16 23:48:34 joerg Exp $ + * $Id: v.c,v 1.35 2003/04/26 02:02:49 grog Exp $ + * $FreeBSD: src/sbin/vinum/v.c,v 1.38 2003/05/01 01:39:42 grog Exp $ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "vext.h" -#include -#include -#include -#include -#include -#include -#include -#include FILE *cf; /* config file handle */ -FILE *history; /* history file */ +FILE *History; /* history file */ char *historyfile; /* and its name */ char *dateformat; /* format in which to store date */ @@ -150,11 +127,11 @@ errno); exit(1); } - history = fopen(historyfile, "a+"); - if (history != NULL) { + History = fopen(historyfile, "a+"); + if (History != NULL) { timestamp(); - fprintf(history, "*** " VINUMMOD " started ***\n"); - fflush(history); /* before we start the daemon */ + fprintf(History, "*** " VINUMMOD " started ***\n"); + fflush(History); /* before we start the daemon */ } if (sysctlbyname("vfs.devfs.generation", NULL, NULL, NULL, 0) == 0) no_devfs = 0; @@ -246,8 +223,8 @@ if (tokens) parseline(tokens, token); /* and do what he says */ } - if (history) - fflush(history); + if (History) + fflush(History); } } return 0; /* normal completion */ @@ -336,11 +313,11 @@ int j; enum keyword command; /* command to execute */ - if (history != NULL) { /* save the command to history file */ + if (History != NULL) { /* save the command to history file */ timestamp(); for (i = 0; i < args; i++) /* all args */ - fprintf(history, "%s ", argv[i]); - fputs("\n", history); + fprintf(History, "%s ", argv[i]); + fputs("\n", History); } if ((args == 0) /* empty line */ ||(*argv[0] == '#')) /* or a comment, */ @@ -544,9 +521,9 @@ perror(VINUMMOD ": Can't write to " _PATH_DEV); return; } - if (history) { + if (History) { timestamp(); - fprintf(history, "*** Created devices ***\n"); + fprintf(History, "*** Created devices ***\n"); } if (superdev >= 0) /* super device open */ close(superdev); @@ -559,10 +536,9 @@ if (mknod(VINUM_SUPERDEV_NAME, S_IRUSR | S_IWUSR | S_IFCHR, /* user only */ - makedev(VINUM_CDEV_MAJOR, VINUM_SUPERDEV)) < 0) + makedev(VINUM_CDEV_MAJOR, VINUM_SUPERDEV_VOL)) < 0) fprintf(stderr, "Can't create %s: %s\n", VINUM_SUPERDEV_NAME, strerror(errno)); - superdev = open(VINUM_SUPERDEV_NAME, O_RDWR); /* open the super device */ if (superdev < 0) { perror(VINUM_SUPERDEV_NAME); @@ -570,7 +546,7 @@ } if (mknod(VINUM_DAEMON_DEV_NAME, /* daemon super device */ S_IRUSR | S_IWUSR | S_IFCHR, /* user only */ - makedev(VINUM_CDEV_MAJOR, VINUM_DAEMON_DEV)) < 0) + makedev(VINUM_CDEV_MAJOR, VINUM_DAEMON_VOL)) < 0) fprintf(stderr, "Can't create %s: %s\n", VINUM_DAEMON_DEV_NAME, strerror(errno)); if (ioctl(superdev, VINUM_GETCONFIG, &vinum_conf) < 0) { @@ -608,26 +584,29 @@ get_volume_info(&vol, volno); if (vol.state != volume_unallocated) { /* we could have holes in our lists */ - voldev = VINUMDEV(volno, 0, 0, VINUM_VOLUME_TYPE); /* create a device number */ + voldev = VINUMDEV(volno, VINUM_VOLUME_TYPE); /* create a device number */ /* Create /dev/vinum/ */ sprintf(filename, VINUM_DIR "/%s", vol.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, voldev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); /* Create /dev/vinum/vol/ */ sprintf(filename, VINUM_DIR "/vol/%s", vol.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, voldev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); if (vol.plexes > 0) { /* Create /dev/vinum/vol/.plex/ */ sprintf(filename, VINUM_DIR "/vol/%s.plex", vol.name); if (mkdir(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IXOTH) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); } if (recurse) for (plexno = 0; plexno < vol.plexes; plexno++) @@ -654,23 +633,26 @@ sprintf(filename, VINUM_DIR "/plex/%s", plex.name); if (mknod(filename, S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, plexdev) < 0) fprintf(stderr, "Can't create %s: %s\n", filename, strerror(errno)); - (void)chown(filename, UID_ROOT, gid_operator); + else + chown(filename, UID_ROOT, gid_operator); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 06:55:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7E1837B404; Thu, 1 May 2003 06:55:50 -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 539AD37B401 for ; Thu, 1 May 2003 06:55:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0063943F3F for ; Thu, 1 May 2003 06:55:50 -0700 (PDT) (envelope-from jhb@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 h41Dtn0U054343 for ; Thu, 1 May 2003 06:55:49 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41DtnHY054340 for perforce@freebsd.org; Thu, 1 May 2003 06:55:49 -0700 (PDT) Date: Thu, 1 May 2003 06:55:49 -0700 (PDT) Message-Id: <200305011355.h41DtnHY054340@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 Subject: PERFORCE change 30304 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 13:55:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=30304 Change 30304 by jhb@jhb_laptop on 2003/05/01 06:55:24 Replace printf with an appropriate KASSERT(). Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#26 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#26 (text+ko) ==== @@ -265,12 +265,9 @@ */ if (lkp->lk_lockholder != thr) { lockflags = LK_HAVE_EXCL; -#ifdef INVARIANTS - if (td != NULL && td != curthread) - printf("%s: weird thread pid %d (%s)\n", - __func__, td->td_proc->p_pid, - td->td_proc->p_comm); -#endif + KASSERT(td == NULL || td == &thread0 || + td == curthread, ("%s: bogus thread pid %d", + __func__, td->td_proc->p_pid)); if (td != NULL && !(td->td_flags & TDF_DEADLKTREAT)) lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE; error = acquire(&lkp, extflags, lockflags); From owner-p4-projects@FreeBSD.ORG Thu May 1 08:57:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AB0D37B404; Thu, 1 May 2003 08:57:21 -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 A675837B401 for ; Thu, 1 May 2003 08:57:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50A3D43F75 for ; Thu, 1 May 2003 08:57:20 -0700 (PDT) (envelope-from des@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 h41FvK0U066961 for ; Thu, 1 May 2003 08:57:20 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41FvJ4B066958 for perforce@freebsd.org; Thu, 1 May 2003 08:57:19 -0700 (PDT) Date: Thu, 1 May 2003 08:57:19 -0700 (PDT) Message-Id: <200305011557.h41FvJ4B066958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30310 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 15:57:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30310 Change 30310 by des@des.at.des.thinksec.com on 2003/05/01 08:57:17 Variable initialization issues. Affected files ... .. //depot/projects/openpam/lib/pam_set_item.c#18 edit Differences ... ==== //depot/projects/openpam/lib/pam_set_item.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_item.c#17 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#18 $ */ #include @@ -62,6 +62,7 @@ if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); slot = &pamh->item[item_type]; + osize = nsize = 0; switch (item_type) { case PAM_SERVICE: case PAM_USER: @@ -73,10 +74,10 @@ case PAM_USER_PROMPT: case PAM_AUTHTOK_PROMPT: case PAM_OLDAUTHTOK_PROMPT: + if (*slot != NULL) + osize = strlen(*slot) + 1; if (item != NULL) nsize = strlen(item) + 1; - if (*slot != NULL) - osize = strlen(*slot) + 1; break; case PAM_REPOSITORY: osize = nsize = sizeof(struct pam_repository); From owner-p4-projects@FreeBSD.ORG Thu May 1 09:11:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF3B937B404; Thu, 1 May 2003 09:11:38 -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 703BE37B401 for ; Thu, 1 May 2003 09:11:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1686E43FA3 for ; Thu, 1 May 2003 09:11:38 -0700 (PDT) (envelope-from des@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 h41GBb0U068529 for ; Thu, 1 May 2003 09:11:37 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41GBbq4068524 for perforce@freebsd.org; Thu, 1 May 2003 09:11:37 -0700 (PDT) Date: Thu, 1 May 2003 09:11:37 -0700 (PDT) Message-Id: <200305011611.h41GBbq4068524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30311 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 16:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30311 Change 30311 by des@des.at.des.thinksec.com on 2003/05/01 09:11:15 Some compilers (gcc at least) promote the integer literal 0x80000000 to long, while enums are required to fit in an int. To avoid the warning this causes, use (-0x7fffffff - 1) instead of 0x80000000. Affected files ... .. //depot/projects/openpam/include/security/pam_constants.h#20 edit Differences ... ==== //depot/projects/openpam/include/security/pam_constants.h#20 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_constants.h#19 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#20 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED @@ -97,7 +97,8 @@ * XSSO 5.4 */ enum { - PAM_SILENT = 0x80000000, + /* some compilers promote 0x8000000 to long */ + PAM_SILENT = (-0x7fffffff - 1), PAM_DISALLOW_NULL_AUTHTOK = 0x1, PAM_ESTABLISH_CRED = 0x1, PAM_DELETE_CRED = 0x2, From owner-p4-projects@FreeBSD.ORG Thu May 1 09:13:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEA5C37B407; Thu, 1 May 2003 09:13:41 -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 9037037B404 for ; Thu, 1 May 2003 09:13:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3735C43F85 for ; Thu, 1 May 2003 09:13:41 -0700 (PDT) (envelope-from des@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 h41GDf0U068660 for ; Thu, 1 May 2003 09:13:41 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41GDeRO068657 for perforce@freebsd.org; Thu, 1 May 2003 09:13:40 -0700 (PDT) Date: Thu, 1 May 2003 09:13:40 -0700 (PDT) Message-Id: <200305011613.h41GDeRO068657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30312 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 16:13:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30312 Change 30312 by des@des.at.des.thinksec.com on 2003/05/01 09:13:09 Avoid dereferencing an unitialized dl handle. Also, add a cast to avoid a warning about assigning void * to a function pointer. Affected files ... .. //depot/projects/openpam/lib/openpam_dynamic.c#7 edit Differences ... ==== //depot/projects/openpam/lib/openpam_dynamic.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#7 $ */ #include @@ -57,6 +57,7 @@ void *dlh; int i; + dlh = NULL; if ((module = calloc(1, sizeof *module)) == NULL) goto buf_err; @@ -77,7 +78,7 @@ goto buf_err; module->dlh = dlh; for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) { - module->func[i] = dlsym(dlh, _pam_sm_func_name[i]); + module->func[i] = (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]); if (module->func[i] == NULL) openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", path, _pam_sm_func_name[i], dlerror()); @@ -85,7 +86,8 @@ return (module); buf_err: openpam_log(PAM_LOG_ERROR, "%m"); - dlclose(dlh); + if (dlh != NULL) + dlclose(dlh); free(module); return (NULL); } From owner-p4-projects@FreeBSD.ORG Thu May 1 09:18:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B50537B404; Thu, 1 May 2003 09:18:49 -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 AEE6C37B401 for ; Thu, 1 May 2003 09:18:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5504643FAF for ; Thu, 1 May 2003 09:18:48 -0700 (PDT) (envelope-from des@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 h41GIl0U068875 for ; Thu, 1 May 2003 09:18:48 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41GIllO068872 for perforce@freebsd.org; Thu, 1 May 2003 09:18:47 -0700 (PDT) Date: Thu, 1 May 2003 09:18:47 -0700 (PDT) Message-Id: <200305011618.h41GIllO068872@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30313 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 16:18:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30313 Change 30313 by des@des.at.des.thinksec.com on 2003/05/01 09:18:06 Add a global variable controlling the output of debugging messages. This allows modules etc. to emit PAM_LOG_DEBUG messages independently of whether libpam was compiled with -DDEBUG. Affected files ... .. //depot/projects/openpam/lib/openpam_impl.h#21 edit .. //depot/projects/openpam/lib/openpam_log.c#18 edit Differences ... ==== //depot/projects/openpam/lib/openpam_impl.h#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#21 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -44,6 +44,8 @@ extern const char *_pam_err_name[PAM_NUM_ERRORS]; extern const char *_pam_item_name[PAM_NUM_ITEMS]; +extern int _openpam_debug; + /* * Control flags */ ==== //depot/projects/openpam/lib/openpam_log.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#18 $ */ #include @@ -45,6 +45,8 @@ #include "openpam_impl.h" +int _openpam_debug = 0; + #if defined(openpam_log) /* @@ -62,12 +64,10 @@ switch (level) { case PAM_LOG_DEBUG: -#ifndef DEBUG - return; -#else + if (!_openpam_debug) + return; priority = LOG_DEBUG; break; -#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; break; @@ -108,12 +108,10 @@ switch (level) { case PAM_LOG_DEBUG: -#ifndef DEBUG - return; -#else + if (!_openpam_debug) + return; priority = LOG_DEBUG; break; -#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; break; From owner-p4-projects@FreeBSD.ORG Thu May 1 09:20:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3546737B404; Thu, 1 May 2003 09:20:52 -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 DC14637B401 for ; Thu, 1 May 2003 09:20:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78BAD43FA3 for ; Thu, 1 May 2003 09:20:51 -0700 (PDT) (envelope-from des@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 h41GKp0U069015 for ; Thu, 1 May 2003 09:20:51 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41GKpnv069012 for perforce@freebsd.org; Thu, 1 May 2003 09:20:51 -0700 (PDT) Date: Thu, 1 May 2003 09:20:51 -0700 (PDT) Message-Id: <200305011620.h41GKpnv069012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30314 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 16:20:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=30314 Change 30314 by des@des.at.des.thinksec.com on 2003/05/01 09:20:03 If compiled with -DDEBUG, enable debugging right before calling a module which has the "debug" option, and disable it upon return. Affected files ... .. //depot/projects/openpam/lib/openpam_dispatch.c#19 edit Differences ... ==== //depot/projects/openpam/lib/openpam_dispatch.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#18 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#19 $ */ #include @@ -59,6 +59,9 @@ { pam_chain_t *chain; int err, fail, r; +#ifdef DEBUG + int debug; +#endif ENTER(); if (pamh == NULL) @@ -96,8 +99,6 @@ /* execute */ for (err = fail = 0; chain != NULL; chain = chain->next) { - openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", - _pam_sm_func_name[primitive], chain->module->path); if (chain->module->func[primitive] == NULL) { openpam_log(PAM_LOG_ERROR, "%s: no %s()", chain->module->path, _pam_sm_func_name[primitive]); @@ -105,12 +106,23 @@ } else { pamh->primitive = primitive; pamh->current = chain; +#ifdef DEBUG + debug = (openpam_get_option(pamh, "debug") != NULL); + if (debug) + ++_openpam_debug; + openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", + _pam_sm_func_name[primitive], chain->module->path); +#endif r = (chain->module->func[primitive])(pamh, flags, chain->optc, (const char **)chain->optv); pamh->current = NULL; +#ifdef DEBUG openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", chain->module->path, _pam_sm_func_name[primitive], pam_strerror(pamh, r)); + if (debug) + --_openpam_debug; +#endif } if (r == PAM_IGNORE) From owner-p4-projects@FreeBSD.ORG Thu May 1 09:21:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 177EA37B401; Thu, 1 May 2003 09:21:54 -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 D1D4137B404 for ; Thu, 1 May 2003 09:21:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E50543FAF for ; Thu, 1 May 2003 09:21:53 -0700 (PDT) (envelope-from obrien@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 h41GLr0U069051 for ; Thu, 1 May 2003 09:21:53 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41GLqO1069048 for perforce@freebsd.org; Thu, 1 May 2003 09:21:52 -0700 (PDT) Date: Thu, 1 May 2003 09:21:52 -0700 (PDT) Message-Id: <200305011621.h41GLqO1069048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30315 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 16:21:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30315 Change 30315 by obrien@obrien_trang on 2003/05/01 09:21:52 Revert to rev #1. (how to do this properly??) Affected files ... .. //depot/projects/hammer/lib/msun/Makefile#3 edit Differences ... ==== //depot/projects/hammer/lib/msun/Makefile#3 (text+ko) ==== @@ -41,7 +41,7 @@ # default standard # -.if ${TARGET_ARCH} == "alpha" +.if ${MACHINE_ARCH} == "alpha" .PATH: ${.CURDIR)/alpha ARCH= alpha ARCH_SRCS = s_copysign.S s_copysignf.S @@ -50,7 +50,7 @@ # handling is broken (doesn't exist!) on the Alpha port. # Stock gcc 2.7.2.1 doesn't understand these options. #CFLAGS += -mtrap-precision=i -mfp-trap-mode=su -.elif ${TARGET_ARCH} == "i386" +.elif ${MACHINE_ARCH} == "i386" ARCH= i387 ARCH_PREFIX= ${ARCH}_ ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \ From owner-p4-projects@FreeBSD.ORG Thu May 1 10:15:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06C5437B404; Thu, 1 May 2003 10:15:08 -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 9468837B401 for ; Thu, 1 May 2003 10:15:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C36E43FBD for ; Thu, 1 May 2003 10:15:05 -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 h41HF50U072659 for ; Thu, 1 May 2003 10:15:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41HF01Q072648 for perforce@freebsd.org; Thu, 1 May 2003 10:15:00 -0700 (PDT) Date: Thu, 1 May 2003 10:15:00 -0700 (PDT) Message-Id: <200305011715.h41HF01Q072648@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 30320 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 17:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30320 Change 30320 by peter@peter_daintree on 2003/05/01 10:14:49 IFC @30319, with all the brokenness Affected files ... .. //depot/projects/hammer/bin/chflags/chflags.c#2 integrate .. //depot/projects/hammer/contrib/groff/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/groff/INSTALL#3 integrate .. //depot/projects/hammer/contrib/groff/MANIFEST#2 integrate .. //depot/projects/hammer/contrib/groff/Makefile.ccpg#3 integrate .. //depot/projects/hammer/contrib/groff/Makefile.comm#3 integrate .. //depot/projects/hammer/contrib/groff/Makefile.dev#2 integrate .. //depot/projects/hammer/contrib/groff/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/groff/Makefile.lib#2 integrate .. //depot/projects/hammer/contrib/groff/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/NEWS#3 integrate .. //depot/projects/hammer/contrib/groff/PROBLEMS#3 integrate .. //depot/projects/hammer/contrib/groff/REVISION#3 integrate .. //depot/projects/hammer/contrib/groff/VERSION#3 integrate .. //depot/projects/hammer/contrib/groff/aclocal.m4#3 integrate .. //depot/projects/hammer/contrib/groff/configure#3 integrate .. //depot/projects/hammer/contrib/groff/configure.ac#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/README#1 branch .. //depot/projects/hammer/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/groff_mm.man#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/m.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/contrib/mm/mm/4.MT#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/examples/typeset.mom#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/hammer/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-10#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-11#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-4#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-5#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-6#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-7#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-8#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff-9#2 integrate .. //depot/projects/hammer/contrib/groff/doc/groff.texinfo#3 integrate .. //depot/projects/hammer/contrib/groff/doc/pic.ms#3 integrate .. //depot/projects/hammer/contrib/groff/doc/texinfo.tex#3 integrate .. //depot/projects/hammer/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/CBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/HBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/HR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/NB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/NBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/NI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/NR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100-12/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/CBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/HBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/HR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/NB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/NBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/NI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/NR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX100/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/CBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/HBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/HR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/NB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/NBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/NI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/NR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75-12/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/CBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/HBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/HR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/NB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/NBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/NI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/NR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devX75/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devascii/R.proto#3 integrate .. //depot/projects/hammer/contrib/groff/font/devcp1047/R.proto#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/CW#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/CWEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/CWI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/CWIEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/CWITC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/CWTC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/EX#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HBEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HBI#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HBIEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HBITC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HBTC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HIEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HITC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HR#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HREC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/HRTC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/MI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/SC#1 branch .. //depot/projects/hammer/contrib/groff/font/devdvi/TB#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TBEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TBI#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TBIEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TBITC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TBTC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TI#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TIEC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TITC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TR#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TREC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/TRTC#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/Makefile#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/ec.map#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/tc.map#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/texb.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/texex.map#2 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/texi.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/texmi.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/texr.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/texsy.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/textex.map#1 branch .. //depot/projects/hammer/contrib/groff/font/devdvi/generate/textt.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devhtml/DESC.proto#3 integrate .. //depot/projects/hammer/contrib/groff/font/devhtml/R.proto#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlatin1/R.proto#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/EB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/EI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/ER#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HNB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HNBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HNI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HNR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/HR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlbp/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/ALBB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/ALBR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AOB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AOI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/AOR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CLARENDON#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CORONET#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/GR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/LGB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/LGI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/LGR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/MARIGOLD#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/OR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UCR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/UR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/hammer/contrib/groff/font/devlj4/generate/text.map#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/AB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/ABI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/AI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/AR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/BMB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/BMBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/BMI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/BMR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/CB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/CBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/CI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/CR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/EURO#1 branch .. //depot/projects/hammer/contrib/groff/font/devps/HB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HNR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/HR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/NR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/PR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/S#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TB#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TBI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/TR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/ZCMI#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/ZD#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/ZDR#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/download#2 integrate .. //depot/projects/hammer/contrib/groff/font/devps/freeeuro.afm#1 branch .. //depot/projects/hammer/contrib/groff/font/devps/freeeuro.pfa#1 branch .. //depot/projects/hammer/contrib/groff/font/devps/generate/Makefile#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/generate/freeeuro.sfd#1 branch .. //depot/projects/hammer/contrib/groff/font/devps/generate/sfdtopfa.pe#1 branch .. //depot/projects/hammer/contrib/groff/font/devps/generate/symbolchars#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/generate/textmap#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/prologue.ps#3 integrate .. //depot/projects/hammer/contrib/groff/font/devps/symbolmap#3 integrate .. //depot/projects/hammer/contrib/groff/font/devutf8/NOTES#3 integrate .. //depot/projects/hammer/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/hammer/contrib/groff/man/groff.man#3 integrate .. //depot/projects/hammer/contrib/groff/man/groff_char.man#3 integrate .. //depot/projects/hammer/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/hammer/contrib/groff/man/groff_font.man#3 integrate .. //depot/projects/hammer/contrib/groff/man/groff_out.man#4 integrate .. //depot/projects/hammer/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/hammer/contrib/groff/man/roff.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grodvi/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grodvi/dvi.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grodvi/dvi.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grodvi/grodvi.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-table.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-table.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-text.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-text.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/html-text.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/output.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/output.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/post-html.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grohtml/post-html.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/charset.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/lbp.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/lbp.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grolbp/lbp.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/lj4.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grolj4/lj4.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grops/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/TODO#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/grops.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/ps.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grops/ps.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grops/ps.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grops/psrm.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grops/psrm.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/devices/grotty/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/devices/grotty/tty.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/devices/grotty/tty.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/driver.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/include/html-strings.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/lib.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/nonposix.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/printer.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libbib/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libbib/common.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libbib/common.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libbib/index.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libbib/index.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libbib/linear.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libbib/linear.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libbib/search.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libbib/search.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/input.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/input.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/printer.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libdriver/printer.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/assert.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/assert.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/change_lf.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/change_lf.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/cmap.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/cmap.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/color.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/color.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/cset.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/cset.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/device.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/device.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/errarg.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/errarg.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/error.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/error.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fatal.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fatal.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/filename.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/filename.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/font.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/font.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fontfile.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/fontfile.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/geometry.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/geometry.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/htmlhint.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/htmlhint.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/invalid.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/invalid.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/lf.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/lf.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/lineno.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/lineno.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/macropath.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/macropath.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/maxfilename.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/maxfilename.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/mksdir.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/mksdir.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/mkstemp.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/mkstemp.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/nametoindex.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/nametoindex.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/new.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/new.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/paper.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/paper.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/prime.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/prime.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/progname.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/progname.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/ptable.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/ptable.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/searchpath.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/searchpath.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strcasecmp.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/string.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/string.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strncasecmp.c#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strsave.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/strsave.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/tmpfile.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/tmpfile.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/tmpname.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/libs/libgroff/tmpname.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/box.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/box.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/delim.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/delim.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/lex.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/lex.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/limit.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/limit.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/list.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/list.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/main.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/main.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/mark.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/mark.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/other.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/other.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/over.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/over.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/pile.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/pile.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/script.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/script.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/special.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/special.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/sqrt.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/sqrt.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/text.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/eqn/text.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/grn/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/README#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hdb.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hdb.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hgraph.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hgraph.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hpoint.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/grn/hpoint.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/grn/main.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/grn/main.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/html/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/html/pre-html.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/html/pre-html.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/html/pushback.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/html/pushback.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/common.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/pic/common.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/pic/lex.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/pic/lex.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/pic/main.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/pic/main.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/pic/object.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/pic/object.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/pic/pic.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/pic.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/pic.y#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/pic/tex.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/pic/tex.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/pic/troff.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/pic/troff.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/refer/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/command.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/refer/command.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/refer/ref.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/refer/ref.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/refer/refer.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/refer/refer.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/refer/token.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/refer/token.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/soelim.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/soelim.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/main.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/main.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/table.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/table.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/preproc/tbl/tbl.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/groff.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/groff/groff.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/groff/groff.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/groff/pipeline.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/grog/grog.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/nroff/nroff.sh#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/charinfo.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/column.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/column.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/dictionary.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/dictionary.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/div.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/div.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/div.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/env.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/env.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/glyphuni.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/input.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/input.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/node.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/node.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/node.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/number.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/number.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/reg.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/reg.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/symbol.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/roff/troff/symbol.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/token.h#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/troff.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/roff/troff/unicode.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/unicode.h#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/uniglyph.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/roff/troff/uniuni.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/addftinfo.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/addftinfo.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/guess.cc#2 delete .. //depot/projects/hammer/contrib/groff/src/utils/addftinfo/guess.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/afmtodit/afmtodit.man#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/afmtodit/afmtodit.pl#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/hpftodit.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/hpftodit.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/hpftodit/hpftodit.man#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/indxbib/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/indxbib/indxbib.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/utils/indxbib/indxbib.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/lkbib/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/lkbib/lkbib.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/utils/lkbib/lkbib.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/lookbib/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/lookbib/lookbib.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/utils/lookbib/lookbib.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/utils/pfbtops/pfbtops.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/pfbtops/pfbtops.man#2 integrate .. //depot/projects/hammer/contrib/groff/src/utils/tfmtodit/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#3 delete .. //depot/projects/hammer/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#1 branch .. //depot/projects/hammer/contrib/groff/src/xditview/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/groff/src/xditview/DviChar.c#3 integrate .. //depot/projects/hammer/contrib/groff/src/xditview/Imakefile.in#3 integrate .. //depot/projects/hammer/contrib/groff/src/xditview/draw.c#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/Makefile.sub#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/README#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/X.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/Xps.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/a4.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/an-old.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/composite.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/cp1047.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-ditroff#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-nroff#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/dvi.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/ec.tmac#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/eqnrc#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/europs.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/groff_man.man#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/html-end.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/html.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/hyphen.us#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/hyphenex.pl#1 branch .. //depot/projects/hammer/contrib/groff/tmac/hyphenex.us#1 branch .. //depot/projects/hammer/contrib/groff/tmac/latin1.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/latin2.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/latin9.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/lbp.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/lj4.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/papersize.tmac#1 branch .. //depot/projects/hammer/contrib/groff/tmac/ps.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/pspic.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/troffrc#4 integrate .. //depot/projects/hammer/contrib/groff/tmac/troffrc-end#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty-char.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/tty.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/www.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/win32-diffs#3 delete .. //depot/projects/hammer/crypto/openssh/auth-krb4.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pam.c#4 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#4 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#3 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#4 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#4 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#3 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#4 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#4 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.c#3 integrate .. //depot/projects/hammer/crypto/openssh/key.c#4 integrate .. //depot/projects/hammer/crypto/openssh/rijndael.c#3 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#4 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/hammer/crypto/openssh/session.h#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh.h#3 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#3 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.h#4 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile.inc#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/Makefile.dev#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/devdvi/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/font/devps/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grodvi/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grohtml/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grolbp/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grolj4/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grops/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grotty/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/include/config.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libbib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libdriver/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libgroff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/eqn/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/grn/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/html/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/pic/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/refer/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/tbl/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/roff/groff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/roff/troff/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/indxbib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/lkbib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/lookbib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/Makefile#5 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#7 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#6 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/Makefile#2 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#7 integrate .. //depot/projects/hammer/sbin/vinum/Makefile#2 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo64.c#8 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/hammer/sys/conf/files#17 integrate .. //depot/projects/hammer/sys/conf/files.pc98#13 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/request.h#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/hammer/sys/kern/init_main.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_kthread.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#24 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#7 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#9 integrate .. //depot/projects/hammer/sys/sys/diskpc98.h#4 integrate .. //depot/projects/hammer/sys/sys/proc.h#20 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#14 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#3 integrate .. //depot/projects/hammer/usr.bin/fetch/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/apm/apm.8#4 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#2 integrate Differences ... ==== //depot/projects/hammer/bin/chflags/chflags.c#2 (text+ko) ==== @@ -31,20 +31,20 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif -#if 0 #ifndef lint static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.17 2003/02/18 19:51:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.18 2003/05/01 14:45:27 obrien Exp $"); #include #include ==== //depot/projects/hammer/contrib/groff/ChangeLog#3 (text+ko) ==== @@ -1,4706 +1,6431 @@ -2002-10-08 Werner LEMBERG +2003-04-29 Werner LEMBERG + + * VERSION: Set to 1.19. + * REVISION: Set to 0. + * doc/groff.texinfo, doc/webpage.ms, NEWS: Updated. + + * src/devices/grohtml/post-html.cpp (html_printer::~html_printer): + Define charset as `US-ASCII' in html output. + + * tmac/www.tmac (ULE): Add missing scaling indicator. - * doc/webpage.ms, NEWS: Updated. + * win32-diffs: Removed. -2002-10-07 Werner LEMBERG +2003-04-28 Werner LEMBERG - * tmac/doc-common (Ss): Add final `.ns' (similar to `.Sh') to - suppress additional whitespace after the header. + * doc/groff.texinfo: Document `dn' and `dl' registers if used with + `.da' and `.boxa'. + Document how to insert discardable whitespace with `.ss'. - * tmac/doc-ditroff, tmac/doc-nroff (Am): New string to be in sync - with NetBSD. +2003-04-27 Werner LEMBERG - * src/preproc/grn/grn.man, tmac/groff_mdoc.man, NEWS: Updated. + * src/preproc/pic/tex.cpp (tex_output::start_picture): Make code + work with plain TeX also. -2002-10-07 Ruslan Ermilov + * src/preproc/pic/pic.man, doc/pic.ms: Fix TeX code example. - * tmac/doc-common(doc-volume-operating-system-ateol): New flag. - (Dt): Use it to improve language localization (especially Russian - and French). +2003-04-25 Gaius Mulley -2002-10-07 Daniel Senderowicz + * src/devices/grohtml/post-html.cpp (html_printer::~html_printer): + Use a loose DTD. - * src/preproc/grn/gprint.h (BSPLINE, BEZIER): New macros. - * src/preproc/grn/hdb.cc (DBGetType): Parse spline and bezier - drawing commands. - * src/preproc/grn/hgraph.cc (drawwig): Add parameter to control - curve type. - Call `picurve' for BSPLINE. - (HGPrintElt): Handle BSPLINE. - * src/preproc/grn/README: Document it. +2003-04-24 Werner LEMBERG -2002-10-03 Werner LEMBERG + * src/preproc/pic/pic.man, doc/pic.ms: Explain how to get a + vbox with positive height and zero depth if in TeX mode. - * src/roff/troff/node.cc (break_char_node::col): New variable. - Updated constructor. - (space_node::tprint, word_space_node::tprint): Call `fill_color' - unconditionally. - (space_node::space_node): Remove assertion. - (break_char_node::add_self): Pass color argument to space node. - * src/roff/troff/input.cc (token::add_to_node_list, token::process): - Ditto. - * src/roff/troff/env.cc (environment::do_break, - environment::add_padding): Ditto. + * NEWS: Document glyph name changes for grodvi and grolj4. -2002-10-02 Werner LEMBERG +2003-04-23 Werner LEMBERG - Redesigning color support in troff. Colors are no longer - represented as separate nodes but are now part of glyph nodes and - friends. This fixes the current formatting misbehaviour due to the - changes introduced on 2002-09-20. Some extra code is necessary for - proper grotty support: Without adding color variables to - space-related nodes, the background color would be changed too late. + * src/preproc/pic/tex.cpp (tex_output::start_picture): Fix TeX code. + * doc/pic.ms: Fixed. - * src/roff/troff/node.h, src/roff/troff/node.cc: - s/current_pagecolor/current_fill_color/. - s/current_glyphcolor/current_glyph_color/. - (glyph_color_node, fill_color_node): Removed. - (node::get_glyph_color, node::get_fill_color): New virtual member - functions. - (space_node::col): New variable. - Updated constructors of space_node and derived classes accordingly. - (hmotion_node::col): New variable. - Updated constructors of hmotion_node and space_char_hmotion_node - accordingly. - (vmotion_node::col): New variable. - Updated constructor accordingly. - (draw_node::gcol, draw_node::fcol): New variables. - Updated constructor accordingly. - (special_node::gcol, special_node::fcol): New variables. - Updated constructors accordingly. - (troff_output_file::put_char, troff_output_file::put_charwidth, - troff_output_file::draw): Set glyph and fill color. - (troff_output_file::start_special): Set glyph and fill color. - Always set current font. - (troff_output_file::fill_color, troff_output_file::glyph_color): - Don't call `do_motion'. - (glyph_node::gcol, glyph_node::fcol): New variables. - Updated constructors of glyph_node and ligature_node accordingly. - (glyph_node::get_glyph_color, glyph_node::get_fill_color): New - member functions. - (glyph_node::merge_glyph_node, - kern_pair_node::add_discretionary_hyphen, - node::add_discretionary_hyphen): Updated. - (break_char_node::merge_self): Updated. - (word_space_node::tprint, space_node::tprint, hmotion_node::tprint, - vmotion_node::tprint): Handle color. - (make_glyph_node, make_node, node::add_char): Updated. +2003-04-21 Werner LEMBERG - * src/roff/troff/env.cc (environment::space_newline, - environment::space, environment::output_line, environment::do_break, - environment::make_tab_node, environment::add_padding, title): - Updated. - (environment_switch, environment_copy): Don't add color nodes. + HP-UX 10.20 has `snprintf' but it isn't declared. - * src/roff/troff/input.cc (do_glyph_color, do_fill_color): Return - nothing. - (token::next): Updated. - \m and \M now are as transparent as \s. - (process_input_stack, token::add_to_node_list, token::process, - read_draw_node): Updated. - (charinfo_to_node_list): Don't add color nodes. + * configure.ac: Add declaration test for snprintf. + * configure: Regenerated. + * src/include/lib.h: Handle `NEED_DECLARATION_SNPRINTF'. + * src/include/config.hin: Regenerated. - * doc/groff.texinfo: Updated. +2003-04-19 Werner LEMBERG -2002-09-27 Ruslan Ermilov + Add keyword `figname' to pic, specifying the name of the picture + box in TeX mode. Based on a patch from William J Poser + . - * tmac/doc-common (ds-operating-system-FreeBSD-4.*): New version - strings. + * src/preproc/pic/pic.y: New token `FIGNAME'. + (macro_name): New rule of type . + (placeless_element): Handle `FIGNAME'. + * src/preproc/pic/lex.cpp (lookup_keyword): Add `figname'. + * src/preproc/pic/main.cpp (graphname): New global variable. + (do_picture): Initialize `graphname'. + * src/preproc/pic/pic.h: Updated. + * src/preproc/pic/tex.cpp (tex_output::start_picture): Use + `graphname'. + Simplify TeX code. + (tex_output::text): Beautify output. + * src/preproc/pic/object.cpp (object_spec::~object_spec): Deallocate + `shaded' and `outlined' unconditionally. + * NEWS, src/preproc/pic/pic.man, doc/pic.ms: Updated. + Minor improvements. -2002-09-27 Colin Watson + * PROBLEMS, README.CVS: Mention that bison version 1.875b or + greater is necessary. - * src/roff/troff/node.cc (bracket_node::copy): Check `list' != 0. +2003-04-17 Hartmut Henkel -2002-09-23 Werner LEMBERG + Add option -r to soelim to avoid emission of `.lf' lines. + Add option -t to produces TeX comment lines instead of `.lf' lines. - * src/devices/grolbp/lbp.cc: Replace `300' with `font::res' where - appropriate. - (DEFAULT_LINEWIDTH_FACTOR): New macro. - (linewidth_factor): New global variable. - (lbp_printer::set_line_thickness): Fix case for size < 0, using - linewidth_factor. - (long_options): Add -w/--linewidth option. + * src/preproc/soelim/soelim.cpp: New global variables `raw_flag' + and `tex_flag'. (usage): Updated. - (main): Handle -w option to set linewidth_factor. - (lbp_printer::lbp_printer): Initialize req_linethickness, not - line_thickness. + (main): Handle `-r' and `-t'. + (set_location): Handle `raw_flag' and `tex_flag'. + * src/preproc/soelim/soelim.man, NEWS: Updated. + +2003-04-17 Werner LEMBERG + + * tmac/hyphenex.sh: Replaced with... + * tmac/hyphenex.pl: This perl script to avoid sed compatibility + nightmares. + + * aclocal.m4 (GROFF_HTML_PROGRAMS): Emit useful warning message + if --quiet is used for the configure script. + * configure: Regenerated. + +2003-04-16 Werner LEMBERG + + * src/devices/grohtml/post-html.cpp (text_glob::text_glob): + Add `const' to second argument. + (html_printer::add_table_end): Add `const' to argument. + * src/devices/grohtml/html-text.cpp (html_text::issue_tag): Add + `const' to arguments. + * src/devices/grohtml/html-text.h: Updated. - * src/devices/grolbp/grolbp.man, NEWS, doc/webpage.ms: Updated. + * src/devices/grolbp/charset.h (symset): Use `unsigned char'. + * src/devices/grolbp/lbp.h (lbpputc): Use `unsigned char' for + argument. -2002-09-22 Paco Andrés Verdú + * src/devices/grotty/tty.cpp (tty_printer::make_rgb_string): Use + cast for integer constant. - Fixed a bug in the line thickness setting code. + * src/preproc/html/pre-html.cpp (image_device): Use `const'. + (writeNbytes): Add `const' to first argument. + (writeString): Add `const' to argument. + (char_buffer::can_see): Add `const' to third argument. + * src/preproc/html/pushback.cpp (pushBackBuffer::isString): Add + `const' to argument. + * src/preproc/html/pushback.h: Updated. - * src/devices/grolbp/lbp.cc (lbp_printer::req_linethickness): New - variable. - (lbp_printer::set_line_thickness): Pass environment as second - parameter. - Implement it actually. - (lpb_printer::set_char, lbp_printer::draw): Use `req_linethickness' - and `set_line_thickness, depending on the current font size. + * src/preproc/soelim/soelim.cpp (include_list): Add `const'. + (include_path_append): Add `const' to argument. + (do_file): Updated. -2002-09-21 Werner LEMBERG + * src/roff/troff/uniglyph.cpp (unicode_to_glyph_list): Use `const' + for `value'. + (unicode_to_glyph_init::unicode_to_glyph_init): Updated. + * src/roff/troff/uniuni.cpp (unicode_decompose_list): Use `const' + for `value'. + (unicode_decompose_init::unicode_decompose_init): Updated. + * src/roff/troff/glyphuni.cpp (glyph_to_unicode_list): Use `const' + for `value'. + (glyph_to_unicode_init::glyph_to_unicode_init): Updated. + * src/roff/troff/input.cc (process_startup_file): Add `const' to + argument. - Some Debian patches. + * tmac/hyphenex.sh: Make script more portable by using a here + document. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 10:19:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6ECF37B404; Thu, 1 May 2003 10:19:11 -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 47E3A37B401 for ; Thu, 1 May 2003 10:19:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E802343F93 for ; Thu, 1 May 2003 10:19:10 -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 h41HJA0U072858 for ; Thu, 1 May 2003 10:19:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41HJAPO072855 for perforce@freebsd.org; Thu, 1 May 2003 10:19:10 -0700 (PDT) Date: Thu, 1 May 2003 10:19:10 -0700 (PDT) Message-Id: <200305011719.h41HJAPO072855@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 30321 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 17:19:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30321 Change 30321 by peter@peter_daintree on 2003/05/01 10:18:22 rcsid/whitespace/comment sync Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#8 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#8 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.10 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); /* like alloc, but automatic automatic free in return */ @@ -47,10 +47,8 @@ ENTRY(alloca) popq %rdx /* pop return addr */ movl %rsp,%rcx - addq $15,%rdi /* round up to 16 bytes */ + addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp movq %rsp,%rax /* base of newly allocated space */ jmp *%rdx /* "return" */ - - From owner-p4-projects@FreeBSD.ORG Thu May 1 10:19:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAC5F37B401; Thu, 1 May 2003 10:19:12 -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 D0CCE37B412 for ; Thu, 1 May 2003 10:19:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66A8943F93 for ; Thu, 1 May 2003 10:19:11 -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 h41HJB0U072864 for ; Thu, 1 May 2003 10:19:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41HJAg1072861 for perforce@freebsd.org; Thu, 1 May 2003 10:19:10 -0700 (PDT) Date: Thu, 1 May 2003 10:19:10 -0700 (PDT) Message-Id: <200305011719.h41HJAg1072861@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 30322 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 17:19:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=30322 Change 30322 by peter@peter_daintree on 2003/05/01 10:19:07 one more whitespace sync Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#9 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#9 (text+ko) ==== @@ -38,7 +38,6 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include - __FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); From owner-p4-projects@FreeBSD.ORG Thu May 1 11:05:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2713437B401; Thu, 1 May 2003 11:05:20 -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 BF0EB37B405 for ; Thu, 1 May 2003 11:05:19 -0700 (PDT) Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4230C43F75 for ; Thu, 1 May 2003 11:05:18 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 1224 invoked from network); 1 May 2003 18:05:23 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 1 May 2003 18:05:23 -0000 Received: from laptop.baldwin.cx ([216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h41I5FOv026321; Thu, 1 May 2003 14:05:16 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200305011611.h41GBbq4068524@repoman.freebsd.org> Date: Thu, 01 May 2003 14:05:20 -0400 (EDT) From: John Baldwin To: Dag-Erling Smorgrav cc: Perforce Change Reviews Subject: RE: PERFORCE change 30311 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 18:05:21 -0000 On 01-May-2003 Dag-Erling Smorgrav wrote: > http://perforce.freebsd.org/chv.cgi?CH=30311 > > Change 30311 by des@des.at.des.thinksec.com on 2003/05/01 09:11:15 > > Some compilers (gcc at least) promote the integer literal 0x80000000 > to long, while enums are required to fit in an int. To avoid the > warning this causes, use (-0x7fffffff - 1) instead of 0x80000000. You could just use 0x40000000. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Thu May 1 11:13:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6352537B404; Thu, 1 May 2003 11:13:00 -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 ED63E37B401; Thu, 1 May 2003 11:12:59 -0700 (PDT) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id A36BE43FA3; Thu, 1 May 2003 11:12:58 -0700 (PDT) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id A64DC530E; Thu, 1 May 2003 20:12:56 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: John Baldwin From: Dag-Erling Smorgrav Date: Thu, 01 May 2003 20:12:55 +0200 In-Reply-To: (John Baldwin's message of "Thu, 01 May 2003 14:05:20 -0400 (EDT)") Message-ID: User-Agent: Gnus/5.090015 (Oort Gnus v0.15) Emacs/21.3 References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii cc: Perforce Change Reviews Subject: Re: PERFORCE change 30311 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 18:13:01 -0000 John Baldwin writes: > On 01-May-2003 Dag-Erling Smorgrav wrote: >> Some compilers (gcc at least) promote the integer literal 0x80000000 >> to long, while enums are required to fit in an int. To avoid the >> warning this causes, use (-0x7fffffff - 1) instead of 0x80000000. > You could just use 0x40000000. :) No, I couldn't. DES -- Dag-Erling Smorgrav - des@ofug.org From owner-p4-projects@FreeBSD.ORG Thu May 1 11:16:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAB9237B405; Thu, 1 May 2003 11:16:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id 5986C37B401; Thu, 1 May 2003 11:16:00 -0700 (PDT) Date: Thu, 1 May 2003 13:16:00 -0500 From: Juli Mallett To: Dag-Erling Smorgrav Message-ID: <20030501131600.A19748@FreeBSD.org> References: <200305011613.h41GDeRO068657@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200305011613.h41GDeRO068657@repoman.freebsd.org>; from des@FreeBSD.org on Thu, May 01, 2003 at 09:13:40AM -0700 X-Title: Code Maven X-Towel: Yes X-Negacore: Yes X-Authentication-Warning: localhost: juli pwned teh intarweb cc: Perforce Change Reviews Subject: Re: PERFORCE change 30312 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 18:16:01 -0000 * Dag-Erling Smorgrav [ Date: 2003-05-01 ] [ w.r.t. PERFORCE change 30312 for review ] > http://perforce.freebsd.org/chv.cgi?CH=30312 > > Change 30312 by des@des.at.des.thinksec.com on 2003/05/01 09:13:09 > > Avoid dereferencing an unitialized dl handle. Also, add a cast to > avoid a warning about assigning void * to a function pointer. Use dlfunc() in FreeBSD for this. (+ cast) -- juli mallett. email: jmallett@freebsd.org; aim: bsdflata; efnet: juli; From owner-p4-projects@FreeBSD.ORG Thu May 1 12:08:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE7A637B404; Thu, 1 May 2003 12:08:09 -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 1D7FE37B401 for ; Thu, 1 May 2003 12:08:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4193F43F85 for ; Thu, 1 May 2003 12:08:07 -0700 (PDT) (envelope-from marcel@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 h41J870U079410 for ; Thu, 1 May 2003 12:08:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41J856U079403 for perforce@freebsd.org; Thu, 1 May 2003 12:08:05 -0700 (PDT) Date: Thu, 1 May 2003 12:08:05 -0700 (PDT) Message-Id: <200305011908.h41J856U079403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30331 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 19:08:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=30331 Change 30331 by marcel@marcel_nfs on 2003/05/01 12:06:24 IFC: Creation of a sio branch on which we can collect sio/ng changes. The i386 and alpha bits that we now have on the ia64 branch doesn't help that branch. Having sio/ng changes intermixed with other ia64 hackery is also not really helpful. I did an integ with a change number, but my i386 box hanged, crashed or refused to wake up before I went to sleep or something like that so I'll be doing a new integ later on. I think it would have sufficed to branch only the kernel BTW. Ah well... Affected files ... .. //depot/projects/sio/COPYRIGHT#1 branch .. //depot/projects/sio/MAINTAINERS#1 branch .. //depot/projects/sio/Makefile#1 branch .. //depot/projects/sio/Makefile.inc1#1 branch .. //depot/projects/sio/README#1 branch .. //depot/projects/sio/UPDATING#1 branch .. //depot/projects/sio/bin/Makefile#1 branch .. //depot/projects/sio/bin/Makefile.inc#1 branch .. //depot/projects/sio/bin/cat/Makefile#1 branch .. //depot/projects/sio/bin/cat/cat.1#1 branch .. //depot/projects/sio/bin/cat/cat.c#1 branch .. //depot/projects/sio/bin/chflags/Makefile#1 branch .. //depot/projects/sio/bin/chflags/chflags.1#1 branch .. //depot/projects/sio/bin/chflags/chflags.c#1 branch .. //depot/projects/sio/bin/chio/Makefile#1 branch .. //depot/projects/sio/bin/chio/chio.1#1 branch .. //depot/projects/sio/bin/chio/chio.c#1 branch .. //depot/projects/sio/bin/chio/defs.h#1 branch .. //depot/projects/sio/bin/chio/pathnames.h#1 branch .. //depot/projects/sio/bin/chmod/Makefile#1 branch .. //depot/projects/sio/bin/chmod/chmod.1#1 branch .. //depot/projects/sio/bin/chmod/chmod.c#1 branch .. //depot/projects/sio/bin/cp/Makefile#1 branch .. //depot/projects/sio/bin/cp/cp.1#1 branch .. //depot/projects/sio/bin/cp/cp.c#1 branch .. //depot/projects/sio/bin/cp/extern.h#1 branch .. //depot/projects/sio/bin/cp/utils.c#1 branch .. //depot/projects/sio/bin/csh/Makefile#1 branch .. //depot/projects/sio/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/sio/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/sio/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/sio/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/sio/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/sio/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/sio/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/sio/bin/csh/config.h#1 branch .. //depot/projects/sio/bin/csh/host.defs#1 branch .. //depot/projects/sio/bin/date/Makefile#1 branch .. //depot/projects/sio/bin/date/date.1#1 branch .. //depot/projects/sio/bin/date/date.c#1 branch .. //depot/projects/sio/bin/date/extern.h#1 branch .. //depot/projects/sio/bin/date/netdate.c#1 branch .. //depot/projects/sio/bin/date/vary.c#1 branch .. //depot/projects/sio/bin/date/vary.h#1 branch .. //depot/projects/sio/bin/dd/Makefile#1 branch .. //depot/projects/sio/bin/dd/args.c#1 branch .. //depot/projects/sio/bin/dd/conv.c#1 branch .. //depot/projects/sio/bin/dd/conv_tab.c#1 branch .. //depot/projects/sio/bin/dd/dd.1#1 branch .. //depot/projects/sio/bin/dd/dd.c#1 branch .. //depot/projects/sio/bin/dd/dd.h#1 branch .. //depot/projects/sio/bin/dd/extern.h#1 branch .. //depot/projects/sio/bin/dd/misc.c#1 branch .. //depot/projects/sio/bin/dd/position.c#1 branch .. //depot/projects/sio/bin/df/Makefile#1 branch .. //depot/projects/sio/bin/df/df.1#1 branch .. //depot/projects/sio/bin/df/df.c#1 branch .. //depot/projects/sio/bin/domainname/Makefile#1 branch .. //depot/projects/sio/bin/domainname/domainname.1#1 branch .. //depot/projects/sio/bin/domainname/domainname.c#1 branch .. //depot/projects/sio/bin/echo/Makefile#1 branch .. //depot/projects/sio/bin/echo/echo.1#1 branch .. //depot/projects/sio/bin/echo/echo.c#1 branch .. //depot/projects/sio/bin/ed/Makefile#1 branch .. //depot/projects/sio/bin/ed/POSIX#1 branch .. //depot/projects/sio/bin/ed/README#1 branch .. //depot/projects/sio/bin/ed/buf.c#1 branch .. //depot/projects/sio/bin/ed/cbc.c#1 branch .. //depot/projects/sio/bin/ed/ed.1#1 branch .. //depot/projects/sio/bin/ed/ed.h#1 branch .. //depot/projects/sio/bin/ed/glbl.c#1 branch .. //depot/projects/sio/bin/ed/io.c#1 branch .. //depot/projects/sio/bin/ed/main.c#1 branch .. //depot/projects/sio/bin/ed/re.c#1 branch .. //depot/projects/sio/bin/ed/sub.c#1 branch .. //depot/projects/sio/bin/ed/test/=.err#1 branch .. //depot/projects/sio/bin/ed/test/Makefile#1 branch .. //depot/projects/sio/bin/ed/test/README#1 branch .. //depot/projects/sio/bin/ed/test/TODO#1 branch .. //depot/projects/sio/bin/ed/test/a.d#1 branch .. //depot/projects/sio/bin/ed/test/a.r#1 branch .. //depot/projects/sio/bin/ed/test/a.t#1 branch .. //depot/projects/sio/bin/ed/test/a1.err#1 branch .. //depot/projects/sio/bin/ed/test/a2.err#1 branch .. //depot/projects/sio/bin/ed/test/addr.d#1 branch .. //depot/projects/sio/bin/ed/test/addr.r#1 branch .. //depot/projects/sio/bin/ed/test/addr.t#1 branch .. //depot/projects/sio/bin/ed/test/addr1.err#1 branch .. //depot/projects/sio/bin/ed/test/addr2.err#1 branch .. //depot/projects/sio/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/sio/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/sio/bin/ed/test/ascii.t#1 branch .. //depot/projects/sio/bin/ed/test/bang1.d#1 branch .. //depot/projects/sio/bin/ed/test/bang1.err#1 branch .. //depot/projects/sio/bin/ed/test/bang1.r#1 branch .. //depot/projects/sio/bin/ed/test/bang1.t#1 branch .. //depot/projects/sio/bin/ed/test/bang2.err#1 branch .. //depot/projects/sio/bin/ed/test/c.d#1 branch .. //depot/projects/sio/bin/ed/test/c.r#1 branch .. //depot/projects/sio/bin/ed/test/c.t#1 branch .. //depot/projects/sio/bin/ed/test/c1.err#1 branch .. //depot/projects/sio/bin/ed/test/c2.err#1 branch .. //depot/projects/sio/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/sio/bin/ed/test/d.d#1 branch .. //depot/projects/sio/bin/ed/test/d.err#1 branch .. //depot/projects/sio/bin/ed/test/d.r#1 branch .. //depot/projects/sio/bin/ed/test/d.t#1 branch .. //depot/projects/sio/bin/ed/test/e1.d#1 branch .. //depot/projects/sio/bin/ed/test/e1.err#1 branch .. //depot/projects/sio/bin/ed/test/e1.r#1 branch .. //depot/projects/sio/bin/ed/test/e1.t#1 branch .. //depot/projects/sio/bin/ed/test/e2.d#1 branch .. //depot/projects/sio/bin/ed/test/e2.err#1 branch .. //depot/projects/sio/bin/ed/test/e2.r#1 branch .. //depot/projects/sio/bin/ed/test/e2.t#1 branch .. //depot/projects/sio/bin/ed/test/e3.d#1 branch .. //depot/projects/sio/bin/ed/test/e3.err#1 branch .. //depot/projects/sio/bin/ed/test/e3.r#1 branch .. //depot/projects/sio/bin/ed/test/e3.t#1 branch .. //depot/projects/sio/bin/ed/test/e4.d#1 branch .. //depot/projects/sio/bin/ed/test/e4.r#1 branch .. //depot/projects/sio/bin/ed/test/e4.t#1 branch .. //depot/projects/sio/bin/ed/test/f1.err#1 branch .. //depot/projects/sio/bin/ed/test/f2.err#1 branch .. //depot/projects/sio/bin/ed/test/g1.d#1 branch .. //depot/projects/sio/bin/ed/test/g1.err#1 branch .. //depot/projects/sio/bin/ed/test/g1.r#1 branch .. //depot/projects/sio/bin/ed/test/g1.t#1 branch .. //depot/projects/sio/bin/ed/test/g2.d#1 branch .. //depot/projects/sio/bin/ed/test/g2.err#1 branch .. //depot/projects/sio/bin/ed/test/g2.r#1 branch .. //depot/projects/sio/bin/ed/test/g2.t#1 branch .. //depot/projects/sio/bin/ed/test/g3.d#1 branch .. //depot/projects/sio/bin/ed/test/g3.err#1 branch .. //depot/projects/sio/bin/ed/test/g3.r#1 branch .. //depot/projects/sio/bin/ed/test/g3.t#1 branch .. //depot/projects/sio/bin/ed/test/g4.d#1 branch .. //depot/projects/sio/bin/ed/test/g4.r#1 branch .. //depot/projects/sio/bin/ed/test/g4.t#1 branch .. //depot/projects/sio/bin/ed/test/g5.d#1 branch .. //depot/projects/sio/bin/ed/test/g5.r#1 branch .. //depot/projects/sio/bin/ed/test/g5.t#1 branch .. //depot/projects/sio/bin/ed/test/h.err#1 branch .. //depot/projects/sio/bin/ed/test/i.d#1 branch .. //depot/projects/sio/bin/ed/test/i.r#1 branch .. //depot/projects/sio/bin/ed/test/i.t#1 branch .. //depot/projects/sio/bin/ed/test/i1.err#1 branch .. //depot/projects/sio/bin/ed/test/i2.err#1 branch .. //depot/projects/sio/bin/ed/test/i3.err#1 branch .. //depot/projects/sio/bin/ed/test/j.d#1 branch .. //depot/projects/sio/bin/ed/test/j.r#1 branch .. //depot/projects/sio/bin/ed/test/j.t#1 branch .. //depot/projects/sio/bin/ed/test/k.d#1 branch .. //depot/projects/sio/bin/ed/test/k.r#1 branch .. //depot/projects/sio/bin/ed/test/k.t#1 branch .. //depot/projects/sio/bin/ed/test/k1.err#1 branch .. //depot/projects/sio/bin/ed/test/k2.err#1 branch .. //depot/projects/sio/bin/ed/test/k3.err#1 branch .. //depot/projects/sio/bin/ed/test/k4.err#1 branch .. //depot/projects/sio/bin/ed/test/l.d#1 branch .. //depot/projects/sio/bin/ed/test/l.r#1 branch .. //depot/projects/sio/bin/ed/test/l.t#1 branch .. //depot/projects/sio/bin/ed/test/m.d#1 branch .. //depot/projects/sio/bin/ed/test/m.err#1 branch .. //depot/projects/sio/bin/ed/test/m.r#1 branch .. //depot/projects/sio/bin/ed/test/m.t#1 branch .. //depot/projects/sio/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/sio/bin/ed/test/n.d#1 branch .. //depot/projects/sio/bin/ed/test/n.r#1 branch .. //depot/projects/sio/bin/ed/test/n.t#1 branch .. //depot/projects/sio/bin/ed/test/nl.err#1 branch .. //depot/projects/sio/bin/ed/test/nl1.d#1 branch .. //depot/projects/sio/bin/ed/test/nl1.r#1 branch .. //depot/projects/sio/bin/ed/test/nl1.t#1 branch .. //depot/projects/sio/bin/ed/test/nl2.d#1 branch .. //depot/projects/sio/bin/ed/test/nl2.r#1 branch .. //depot/projects/sio/bin/ed/test/nl2.t#1 branch .. //depot/projects/sio/bin/ed/test/p.d#1 branch .. //depot/projects/sio/bin/ed/test/p.r#1 branch .. //depot/projects/sio/bin/ed/test/p.t#1 branch .. //depot/projects/sio/bin/ed/test/q.d#1 branch .. //depot/projects/sio/bin/ed/test/q.r#1 branch .. //depot/projects/sio/bin/ed/test/q.t#1 branch .. //depot/projects/sio/bin/ed/test/q1.err#1 branch .. //depot/projects/sio/bin/ed/test/r1.d#1 branch .. //depot/projects/sio/bin/ed/test/r1.err#1 branch .. //depot/projects/sio/bin/ed/test/r1.r#1 branch .. //depot/projects/sio/bin/ed/test/r1.t#1 branch .. //depot/projects/sio/bin/ed/test/r2.d#1 branch .. //depot/projects/sio/bin/ed/test/r2.err#1 branch .. //depot/projects/sio/bin/ed/test/r2.r#1 branch .. //depot/projects/sio/bin/ed/test/r2.t#1 branch .. //depot/projects/sio/bin/ed/test/r3.d#1 branch .. //depot/projects/sio/bin/ed/test/r3.r#1 branch .. //depot/projects/sio/bin/ed/test/r3.t#1 branch .. //depot/projects/sio/bin/ed/test/s1.d#1 branch .. //depot/projects/sio/bin/ed/test/s1.err#1 branch .. //depot/projects/sio/bin/ed/test/s1.r#1 branch .. //depot/projects/sio/bin/ed/test/s1.t#1 branch .. //depot/projects/sio/bin/ed/test/s10.err#1 branch .. //depot/projects/sio/bin/ed/test/s2.d#1 branch .. //depot/projects/sio/bin/ed/test/s2.err#1 branch .. //depot/projects/sio/bin/ed/test/s2.r#1 branch .. //depot/projects/sio/bin/ed/test/s2.t#1 branch .. //depot/projects/sio/bin/ed/test/s3.d#1 branch .. //depot/projects/sio/bin/ed/test/s3.err#1 branch .. //depot/projects/sio/bin/ed/test/s3.r#1 branch .. //depot/projects/sio/bin/ed/test/s3.t#1 branch .. //depot/projects/sio/bin/ed/test/s4.err#1 branch .. //depot/projects/sio/bin/ed/test/s5.err#1 branch .. //depot/projects/sio/bin/ed/test/s6.err#1 branch .. //depot/projects/sio/bin/ed/test/s7.err#1 branch .. //depot/projects/sio/bin/ed/test/s8.err#1 branch .. //depot/projects/sio/bin/ed/test/s9.err#1 branch .. //depot/projects/sio/bin/ed/test/t.d#1 branch .. //depot/projects/sio/bin/ed/test/t.r#1 branch .. //depot/projects/sio/bin/ed/test/t1.d#1 branch .. //depot/projects/sio/bin/ed/test/t1.err#1 branch .. //depot/projects/sio/bin/ed/test/t1.r#1 branch .. //depot/projects/sio/bin/ed/test/t1.t#1 branch .. //depot/projects/sio/bin/ed/test/t2.d#1 branch .. //depot/projects/sio/bin/ed/test/t2.err#1 branch .. //depot/projects/sio/bin/ed/test/t2.r#1 branch .. //depot/projects/sio/bin/ed/test/t2.t#1 branch .. //depot/projects/sio/bin/ed/test/u.d#1 branch .. //depot/projects/sio/bin/ed/test/u.err#1 branch .. //depot/projects/sio/bin/ed/test/u.r#1 branch .. //depot/projects/sio/bin/ed/test/u.t#1 branch .. //depot/projects/sio/bin/ed/test/v.d#1 branch .. //depot/projects/sio/bin/ed/test/v.r#1 branch .. //depot/projects/sio/bin/ed/test/v.t#1 branch .. //depot/projects/sio/bin/ed/test/w.d#1 branch .. //depot/projects/sio/bin/ed/test/w.r#1 branch .. //depot/projects/sio/bin/ed/test/w.t#1 branch .. //depot/projects/sio/bin/ed/test/w1.err#1 branch .. //depot/projects/sio/bin/ed/test/w2.err#1 branch .. //depot/projects/sio/bin/ed/test/w3.err#1 branch .. //depot/projects/sio/bin/ed/test/x.err#1 branch .. //depot/projects/sio/bin/ed/test/z.err#1 branch .. //depot/projects/sio/bin/ed/undo.c#1 branch .. //depot/projects/sio/bin/expr/Makefile#1 branch .. //depot/projects/sio/bin/expr/expr.1#1 branch .. //depot/projects/sio/bin/expr/expr.y#1 branch .. //depot/projects/sio/bin/getfacl/Makefile#1 branch .. //depot/projects/sio/bin/getfacl/getfacl.1#1 branch .. //depot/projects/sio/bin/getfacl/getfacl.c#1 branch .. //depot/projects/sio/bin/hostname/Makefile#1 branch .. //depot/projects/sio/bin/hostname/hostname.1#1 branch .. //depot/projects/sio/bin/hostname/hostname.c#1 branch .. //depot/projects/sio/bin/kenv/Makefile#1 branch .. //depot/projects/sio/bin/kenv/kenv.1#1 branch .. //depot/projects/sio/bin/kenv/kenv.c#1 branch .. //depot/projects/sio/bin/kill/Makefile#1 branch .. //depot/projects/sio/bin/kill/kill.1#1 branch .. //depot/projects/sio/bin/kill/kill.c#1 branch .. //depot/projects/sio/bin/ln/Makefile#1 branch .. //depot/projects/sio/bin/ln/ln.1#1 branch .. //depot/projects/sio/bin/ln/ln.c#1 branch .. //depot/projects/sio/bin/ln/symlink.7#1 branch .. //depot/projects/sio/bin/ls/Makefile#1 branch .. //depot/projects/sio/bin/ls/cmp.c#1 branch .. //depot/projects/sio/bin/ls/extern.h#1 branch .. //depot/projects/sio/bin/ls/ls.1#1 branch .. //depot/projects/sio/bin/ls/ls.c#1 branch .. //depot/projects/sio/bin/ls/ls.h#1 branch .. //depot/projects/sio/bin/ls/print.c#1 branch .. //depot/projects/sio/bin/ls/util.c#1 branch .. //depot/projects/sio/bin/mkdir/Makefile#1 branch .. //depot/projects/sio/bin/mkdir/mkdir.1#1 branch .. //depot/projects/sio/bin/mkdir/mkdir.c#1 branch .. //depot/projects/sio/bin/mv/Makefile#1 branch .. //depot/projects/sio/bin/mv/mv.1#1 branch .. //depot/projects/sio/bin/mv/mv.c#1 branch .. //depot/projects/sio/bin/mv/pathnames.h#1 branch .. //depot/projects/sio/bin/pax/Makefile#1 branch .. //depot/projects/sio/bin/pax/ar_io.c#1 branch .. //depot/projects/sio/bin/pax/ar_subs.c#1 branch .. //depot/projects/sio/bin/pax/buf_subs.c#1 branch .. //depot/projects/sio/bin/pax/cache.c#1 branch .. //depot/projects/sio/bin/pax/cache.h#1 branch .. //depot/projects/sio/bin/pax/cpio.1#1 branch .. //depot/projects/sio/bin/pax/cpio.c#1 branch .. //depot/projects/sio/bin/pax/cpio.h#1 branch .. //depot/projects/sio/bin/pax/extern.h#1 branch .. //depot/projects/sio/bin/pax/file_subs.c#1 branch .. //depot/projects/sio/bin/pax/ftree.c#1 branch .. //depot/projects/sio/bin/pax/ftree.h#1 branch .. //depot/projects/sio/bin/pax/gen_subs.c#1 branch .. //depot/projects/sio/bin/pax/getoldopt.c#1 branch .. //depot/projects/sio/bin/pax/options.c#1 branch .. //depot/projects/sio/bin/pax/options.h#1 branch .. //depot/projects/sio/bin/pax/pat_rep.c#1 branch .. //depot/projects/sio/bin/pax/pat_rep.h#1 branch .. //depot/projects/sio/bin/pax/pax.1#1 branch .. //depot/projects/sio/bin/pax/pax.c#1 branch .. //depot/projects/sio/bin/pax/pax.h#1 branch .. //depot/projects/sio/bin/pax/sel_subs.c#1 branch .. //depot/projects/sio/bin/pax/sel_subs.h#1 branch .. //depot/projects/sio/bin/pax/tables.c#1 branch .. //depot/projects/sio/bin/pax/tables.h#1 branch .. //depot/projects/sio/bin/pax/tar.1#1 branch .. //depot/projects/sio/bin/pax/tar.c#1 branch .. //depot/projects/sio/bin/pax/tar.h#1 branch .. //depot/projects/sio/bin/pax/tty_subs.c#1 branch .. //depot/projects/sio/bin/ps/Makefile#1 branch .. //depot/projects/sio/bin/ps/extern.h#1 branch .. //depot/projects/sio/bin/ps/fmt.c#1 branch .. //depot/projects/sio/bin/ps/keyword.c#1 branch .. //depot/projects/sio/bin/ps/nlist.c#1 branch .. //depot/projects/sio/bin/ps/print.c#1 branch .. //depot/projects/sio/bin/ps/ps.1#1 branch .. //depot/projects/sio/bin/ps/ps.c#1 branch .. //depot/projects/sio/bin/ps/ps.h#1 branch .. //depot/projects/sio/bin/pwd/Makefile#1 branch .. //depot/projects/sio/bin/pwd/pwd.1#1 branch .. //depot/projects/sio/bin/pwd/pwd.c#1 branch .. //depot/projects/sio/bin/rcp/Makefile#1 branch .. //depot/projects/sio/bin/rcp/extern.h#1 branch .. //depot/projects/sio/bin/rcp/rcp.1#1 branch .. //depot/projects/sio/bin/rcp/rcp.c#1 branch .. //depot/projects/sio/bin/rcp/util.c#1 branch .. //depot/projects/sio/bin/realpath/Makefile#1 branch .. //depot/projects/sio/bin/realpath/realpath.1#1 branch .. //depot/projects/sio/bin/realpath/realpath.c#1 branch .. //depot/projects/sio/bin/rm/Makefile#1 branch .. //depot/projects/sio/bin/rm/rm.1#1 branch .. //depot/projects/sio/bin/rm/rm.c#1 branch .. //depot/projects/sio/bin/rmail/Makefile#1 branch .. //depot/projects/sio/bin/rmdir/Makefile#1 branch .. //depot/projects/sio/bin/rmdir/rmdir.1#1 branch .. //depot/projects/sio/bin/rmdir/rmdir.c#1 branch .. //depot/projects/sio/bin/setfacl/Makefile#1 branch .. //depot/projects/sio/bin/setfacl/file.c#1 branch .. //depot/projects/sio/bin/setfacl/mask.c#1 branch .. //depot/projects/sio/bin/setfacl/merge.c#1 branch .. //depot/projects/sio/bin/setfacl/remove.c#1 branch .. //depot/projects/sio/bin/setfacl/setfacl.1#1 branch .. //depot/projects/sio/bin/setfacl/setfacl.c#1 branch .. //depot/projects/sio/bin/setfacl/setfacl.h#1 branch .. //depot/projects/sio/bin/setfacl/util.c#1 branch .. //depot/projects/sio/bin/sh/Makefile#1 branch .. //depot/projects/sio/bin/sh/TOUR#1 branch .. //depot/projects/sio/bin/sh/alias.c#1 branch .. //depot/projects/sio/bin/sh/alias.h#1 branch .. //depot/projects/sio/bin/sh/arith.h#1 branch .. //depot/projects/sio/bin/sh/arith.y#1 branch .. //depot/projects/sio/bin/sh/arith_lex.l#1 branch .. //depot/projects/sio/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/sio/bin/sh/bltin/echo.1#1 branch .. //depot/projects/sio/bin/sh/bltin/echo.c#1 branch .. //depot/projects/sio/bin/sh/builtins.def#1 branch .. //depot/projects/sio/bin/sh/cd.c#1 branch .. //depot/projects/sio/bin/sh/cd.h#1 branch .. //depot/projects/sio/bin/sh/error.c#1 branch .. //depot/projects/sio/bin/sh/error.h#1 branch .. //depot/projects/sio/bin/sh/eval.c#1 branch .. //depot/projects/sio/bin/sh/eval.h#1 branch .. //depot/projects/sio/bin/sh/exec.c#1 branch .. //depot/projects/sio/bin/sh/exec.h#1 branch .. //depot/projects/sio/bin/sh/expand.c#1 branch .. //depot/projects/sio/bin/sh/expand.h#1 branch .. //depot/projects/sio/bin/sh/funcs/cmv#1 branch .. //depot/projects/sio/bin/sh/funcs/dirs#1 branch .. //depot/projects/sio/bin/sh/funcs/kill#1 branch .. //depot/projects/sio/bin/sh/funcs/login#1 branch .. //depot/projects/sio/bin/sh/funcs/newgrp#1 branch .. //depot/projects/sio/bin/sh/funcs/popd#1 branch .. //depot/projects/sio/bin/sh/funcs/pushd#1 branch .. //depot/projects/sio/bin/sh/funcs/suspend#1 branch .. //depot/projects/sio/bin/sh/histedit.c#1 branch .. //depot/projects/sio/bin/sh/init.h#1 branch .. //depot/projects/sio/bin/sh/input.c#1 branch .. //depot/projects/sio/bin/sh/input.h#1 branch .. //depot/projects/sio/bin/sh/jobs.c#1 branch .. //depot/projects/sio/bin/sh/jobs.h#1 branch .. //depot/projects/sio/bin/sh/mail.c#1 branch .. //depot/projects/sio/bin/sh/mail.h#1 branch .. //depot/projects/sio/bin/sh/main.c#1 branch .. //depot/projects/sio/bin/sh/main.h#1 branch .. //depot/projects/sio/bin/sh/memalloc.c#1 branch .. //depot/projects/sio/bin/sh/memalloc.h#1 branch .. //depot/projects/sio/bin/sh/miscbltin.c#1 branch .. //depot/projects/sio/bin/sh/mkbuiltins#1 branch .. //depot/projects/sio/bin/sh/mkinit.c#1 branch .. //depot/projects/sio/bin/sh/mknodes.c#1 branch .. //depot/projects/sio/bin/sh/mksyntax.c#1 branch .. //depot/projects/sio/bin/sh/mktokens#1 branch .. //depot/projects/sio/bin/sh/myhistedit.h#1 branch .. //depot/projects/sio/bin/sh/mystring.c#1 branch .. //depot/projects/sio/bin/sh/mystring.h#1 branch .. //depot/projects/sio/bin/sh/nodes.c.pat#1 branch .. //depot/projects/sio/bin/sh/nodetypes#1 branch .. //depot/projects/sio/bin/sh/options.c#1 branch .. //depot/projects/sio/bin/sh/options.h#1 branch .. //depot/projects/sio/bin/sh/output.c#1 branch .. //depot/projects/sio/bin/sh/output.h#1 branch .. //depot/projects/sio/bin/sh/parser.c#1 branch .. //depot/projects/sio/bin/sh/parser.h#1 branch .. //depot/projects/sio/bin/sh/redir.c#1 branch .. //depot/projects/sio/bin/sh/redir.h#1 branch .. //depot/projects/sio/bin/sh/sh.1#1 branch .. //depot/projects/sio/bin/sh/shell.h#1 branch .. //depot/projects/sio/bin/sh/show.c#1 branch .. //depot/projects/sio/bin/sh/show.h#1 branch .. //depot/projects/sio/bin/sh/trap.c#1 branch .. //depot/projects/sio/bin/sh/trap.h#1 branch .. //depot/projects/sio/bin/sh/var.c#1 branch .. //depot/projects/sio/bin/sh/var.h#1 branch .. //depot/projects/sio/bin/sleep/Makefile#1 branch .. //depot/projects/sio/bin/sleep/sleep.1#1 branch .. //depot/projects/sio/bin/sleep/sleep.c#1 branch .. //depot/projects/sio/bin/stty/Makefile#1 branch .. //depot/projects/sio/bin/stty/cchar.c#1 branch .. //depot/projects/sio/bin/stty/extern.h#1 branch .. //depot/projects/sio/bin/stty/gfmt.c#1 branch .. //depot/projects/sio/bin/stty/key.c#1 branch .. //depot/projects/sio/bin/stty/modes.c#1 branch .. //depot/projects/sio/bin/stty/print.c#1 branch .. //depot/projects/sio/bin/stty/stty.1#1 branch .. //depot/projects/sio/bin/stty/stty.c#1 branch .. //depot/projects/sio/bin/stty/stty.h#1 branch .. //depot/projects/sio/bin/stty/util.c#1 branch .. //depot/projects/sio/bin/sync/Makefile#1 branch .. //depot/projects/sio/bin/sync/sync.8#1 branch .. //depot/projects/sio/bin/sync/sync.c#1 branch .. //depot/projects/sio/bin/test/Makefile#1 branch .. //depot/projects/sio/bin/test/TEST.README#1 branch .. //depot/projects/sio/bin/test/TEST.csh#1 branch .. //depot/projects/sio/bin/test/TEST.sh#1 branch .. //depot/projects/sio/bin/test/test.1#1 branch .. //depot/projects/sio/bin/test/test.c#1 branch .. //depot/projects/sio/contrib/amd/AUTHORS#1 branch .. //depot/projects/sio/contrib/amd/BUGS#1 branch .. //depot/projects/sio/contrib/amd/COPYING#1 branch .. //depot/projects/sio/contrib/amd/ChangeLog#1 branch .. //depot/projects/sio/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/sio/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/sio/contrib/amd/INSTALL#1 branch .. //depot/projects/sio/contrib/amd/MIRRORS#1 branch .. //depot/projects/sio/contrib/amd/NEWS#1 branch .. //depot/projects/sio/contrib/amd/README#1 branch .. //depot/projects/sio/contrib/amd/README.ldap#1 branch .. //depot/projects/sio/contrib/amd/README.y2k#1 branch .. //depot/projects/sio/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amd.8#1 branch .. //depot/projects/sio/contrib/amd/amd/amd.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amd.h#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/sio/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/sio/contrib/amd/amd/autil.c#1 branch .. //depot/projects/sio/contrib/amd/amd/clock.c#1 branch .. //depot/projects/sio/contrib/amd/amd/conf.c#1 branch .. //depot/projects/sio/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/sio/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/sio/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/sio/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/sio/contrib/amd/amd/map.c#1 branch .. //depot/projects/sio/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/sio/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/sio/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/sio/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_autofs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/sio/contrib/amd/amd/opts.c#1 branch .. //depot/projects/sio/contrib/amd/amd/restart.c#1 branch .. //depot/projects/sio/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/sio/contrib/amd/amd/sched.c#1 branch .. //depot/projects/sio/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/sio/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/sio/contrib/amd/amq/amq.8#1 branch .. //depot/projects/sio/contrib/amd/amq/amq.c#1 branch .. //depot/projects/sio/contrib/amd/amq/amq.h#1 branch .. //depot/projects/sio/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/sio/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/sio/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/sio/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/sio/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/sio/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/sio/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/sio/contrib/amd/conf/hn_dref/hn_dref_default.h#1 branch .. //depot/projects/sio/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/sio/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#1 branch .. //depot/projects/sio/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/sio/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/sio/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/sio/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/sio/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/sio/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/sio/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/sio/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/sio/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/sio/contrib/amd/doc/version.texi#1 branch .. //depot/projects/sio/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/sio/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/sio/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/sio/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/sio/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/sio/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/sio/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/sio/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/sio/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/sio/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/sio/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/sio/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/sio/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/sio/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/sio/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/sio/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/sio/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/sio/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/sio/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/sio/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/util.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/sio/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/sio/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/sio/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/sio/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/sio/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/sio/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/sio/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/sio/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/sio/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/lostaltmail.conf-sample#1 branch .. //depot/projects/sio/contrib/amd/scripts/lostaltmail.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/sio/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/sio/contrib/amd/tasks#1 branch .. //depot/projects/sio/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/sio/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/sio/contrib/bc/AUTHORS#1 branch .. //depot/projects/sio/contrib/bc/ChangeLog#1 branch .. //depot/projects/sio/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/sio/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/sio/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/sio/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/sio/contrib/bc/FAQ#1 branch .. //depot/projects/sio/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/sio/contrib/bc/INSTALL#1 branch .. //depot/projects/sio/contrib/bc/Makefile.am#1 branch .. //depot/projects/sio/contrib/bc/Makefile.in#1 branch .. //depot/projects/sio/contrib/bc/NEWS#1 branch .. //depot/projects/sio/contrib/bc/README#1 branch .. //depot/projects/sio/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/sio/contrib/bc/Test/array.b#1 branch .. //depot/projects/sio/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/sio/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/sio/contrib/bc/Test/atan.b#1 branch .. //depot/projects/sio/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/sio/contrib/bc/Test/div.b#1 branch .. //depot/projects/sio/contrib/bc/Test/exp.b#1 branch .. //depot/projects/sio/contrib/bc/Test/fact.b#1 branch .. //depot/projects/sio/contrib/bc/Test/jn.b#1 branch .. //depot/projects/sio/contrib/bc/Test/ln.b#1 branch .. //depot/projects/sio/contrib/bc/Test/mul.b#1 branch .. //depot/projects/sio/contrib/bc/Test/raise.b#1 branch .. //depot/projects/sio/contrib/bc/Test/signum#1 branch .. //depot/projects/sio/contrib/bc/Test/sine.b#1 branch .. //depot/projects/sio/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/sio/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/sio/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/sio/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/sio/contrib/bc/Test/timetest#1 branch .. //depot/projects/sio/contrib/bc/acconfig.h#1 branch .. //depot/projects/sio/contrib/bc/aclocal.m4#1 branch .. //depot/projects/sio/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/sio/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/sio/contrib/bc/bc/bc.y#1 branch .. //depot/projects/sio/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/sio/contrib/bc/bc/const.h#1 branch .. //depot/projects/sio/contrib/bc/bc/execute.c#1 branch .. //depot/projects/sio/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/sio/contrib/bc/bc/global.c#1 branch .. //depot/projects/sio/contrib/bc/bc/global.h#1 branch .. //depot/projects/sio/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/sio/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/sio/contrib/bc/bc/load.c#1 branch .. //depot/projects/sio/contrib/bc/bc/main.c#1 branch .. //depot/projects/sio/contrib/bc/bc/proto.h#1 branch .. //depot/projects/sio/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/sio/contrib/bc/bc/scan.l#1 branch .. //depot/projects/sio/contrib/bc/bc/storage.c#1 branch .. //depot/projects/sio/contrib/bc/bc/util.c#1 branch .. //depot/projects/sio/contrib/bc/config.h.in#1 branch .. //depot/projects/sio/contrib/bc/configure#1 branch .. //depot/projects/sio/contrib/bc/configure.in#1 branch .. //depot/projects/sio/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/sio/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/sio/contrib/bc/dc/array.c#1 branch .. //depot/projects/sio/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/sio/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/sio/contrib/bc/dc/dc.c#1 branch .. //depot/projects/sio/contrib/bc/dc/dc.h#1 branch .. //depot/projects/sio/contrib/bc/dc/eval.c#1 branch .. //depot/projects/sio/contrib/bc/dc/misc.c#1 branch .. //depot/projects/sio/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/sio/contrib/bc/dc/stack.c#1 branch .. //depot/projects/sio/contrib/bc/dc/string.c#1 branch .. //depot/projects/sio/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/sio/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/sio/contrib/bc/doc/bc.1#1 branch .. //depot/projects/sio/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/sio/contrib/bc/doc/dc.1#1 branch .. //depot/projects/sio/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/sio/contrib/bc/h/getopt.h#1 branch .. //depot/projects/sio/contrib/bc/h/number.h#1 branch .. //depot/projects/sio/contrib/bc/install-sh#1 branch .. //depot/projects/sio/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/sio/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/sio/contrib/bc/lib/getopt.c#1 branch .. //depot/projects/sio/contrib/bc/lib/getopt1.c#1 branch .. //depot/projects/sio/contrib/bc/lib/number.c#1 branch .. //depot/projects/sio/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/sio/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/sio/contrib/bc/missing#1 branch .. //depot/projects/sio/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/sio/contrib/bc/stamp-h.in#1 branch .. //depot/projects/sio/contrib/bind/CHANGES#1 branch .. //depot/projects/sio/contrib/bind/DNSSEC#1 branch .. //depot/projects/sio/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/sio/contrib/bind/FREEBSD-Xlist#1 branch .. //depot/projects/sio/contrib/bind/INSTALL#1 branch .. //depot/projects/sio/contrib/bind/LICENSE#1 branch .. //depot/projects/sio/contrib/bind/Makefile#1 branch .. //depot/projects/sio/contrib/bind/README#1 branch .. //depot/projects/sio/contrib/bind/SUPPORT#1 branch .. //depot/projects/sio/contrib/bind/TODO#1 branch .. //depot/projects/sio/contrib/bind/Version#1 branch .. //depot/projects/sio/contrib/bind/bin/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/addr/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/addr/addr.c#1 branch .. //depot/projects/sio/contrib/bind/bin/dig/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/dig/dig.c#1 branch .. //depot/projects/sio/contrib/bind/bin/dnskeygen/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch .. //depot/projects/sio/contrib/bind/bin/dnsquery/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/dnsquery/dnsquery.c#1 branch .. //depot/projects/sio/contrib/bind/bin/host/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/host/host.c#1 branch .. //depot/projects/sio/contrib/bind/bin/irpd/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/irpd/irpd.c#1 branch .. //depot/projects/sio/contrib/bind/bin/irpd/irs-irpd.conf#1 branch .. //depot/projects/sio/contrib/bind/bin/irpd/version.c#1 branch .. //depot/projects/sio/contrib/bind/bin/mkservdb/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/mkservdb/mkservdb.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch .. //depot/projects/sio/contrib/bind/bin/named-bootconf/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch .. //depot/projects/sio/contrib/bind/bin/named-bootconf/test.boot#1 branch .. //depot/projects/sio/contrib/bind/bin/named-xfer/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/named-xfer/named-xfer.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_defs.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_dump.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_func.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_glob.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_glue.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_ixfr.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_load.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_lookup.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_save.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_sec.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_tsig.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/db_update.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/named.conf#1 branch .. //depot/projects/sio/contrib/bind/bin/named/named.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_config.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_ctl.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_defs.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_forw.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_func.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_glob.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_glue.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_init.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_ixfr.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_lexer.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_lexer.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_main.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_maint.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_ncache.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_notify.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_parser.y#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_parseutil.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_parseutil.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_req.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_resp.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_signal.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_sort.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_stats.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_udp.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_update.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/ns_xfr.c#1 branch .. //depot/projects/sio/contrib/bind/bin/named/pathtemplate.h#1 branch .. //depot/projects/sio/contrib/bind/bin/named/test/127.0.0.zone#1 branch .. //depot/projects/sio/contrib/bind/bin/named/test/localhost.zone#1 branch .. //depot/projects/sio/contrib/bind/bin/named/test/named.conf#1 branch .. //depot/projects/sio/contrib/bind/bin/named/test/root.hint#1 branch .. //depot/projects/sio/contrib/bind/bin/named/version.c#1 branch .. //depot/projects/sio/contrib/bind/bin/ndc/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/ndc/ndc.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/commands.l#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/debug.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/getinfo.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/list.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/main.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/nslookup.help#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/pathnames.h#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/res.h#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/send.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/skip.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nslookup/subr.c#1 branch .. //depot/projects/sio/contrib/bind/bin/nsupdate/Makefile#1 branch .. //depot/projects/sio/contrib/bind/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/sio/contrib/bind/doc/html/acl.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/address_list.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/comments.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/config.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/controls.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/docdef.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/example.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/include.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/index.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/key.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/logging.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/master.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/options.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/server.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/trusted-keys.html#1 branch .. //depot/projects/sio/contrib/bind/doc/html/zone.html#1 branch .. //depot/projects/sio/contrib/bind/doc/man/Makefile#1 branch .. //depot/projects/sio/contrib/bind/doc/man/dig.1#1 branch .. //depot/projects/sio/contrib/bind/doc/man/dnskeygen.1#1 branch .. //depot/projects/sio/contrib/bind/doc/man/dnsquery.1#1 branch .. //depot/projects/sio/contrib/bind/doc/man/getaddrinfo.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/gethostbyname.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/getipnodebyname.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/getnameinfo.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/getnetent.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/hesiod.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/host.1#1 branch .. //depot/projects/sio/contrib/bind/doc/man/hostname.7#1 branch .. //depot/projects/sio/contrib/bind/doc/man/inet_cidr.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/irs.conf.5#1 branch .. //depot/projects/sio/contrib/bind/doc/man/mailaddr.7#1 branch .. //depot/projects/sio/contrib/bind/doc/man/mkdep.1#1 branch .. //depot/projects/sio/contrib/bind/doc/man/named-bootconf.8#1 branch .. //depot/projects/sio/contrib/bind/doc/man/named-xfer.8#1 branch .. //depot/projects/sio/contrib/bind/doc/man/named.8#1 branch .. //depot/projects/sio/contrib/bind/doc/man/named.conf.5#1 branch .. //depot/projects/sio/contrib/bind/doc/man/ndc.8#1 branch .. //depot/projects/sio/contrib/bind/doc/man/nslookup.8#1 branch .. //depot/projects/sio/contrib/bind/doc/man/nsupdate.8#1 branch .. //depot/projects/sio/contrib/bind/doc/man/resolver.3#1 branch .. //depot/projects/sio/contrib/bind/doc/man/resolver.5#1 branch .. //depot/projects/sio/contrib/bind/doc/man/tsig.3#1 branch .. //depot/projects/sio/contrib/bind/doc/misc/DynamicUpdate#1 branch .. //depot/projects/sio/contrib/bind/doc/misc/FAQ.1of2#1 branch .. //depot/projects/sio/contrib/bind/doc/misc/FAQ.2of2#1 branch .. //depot/projects/sio/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/sio/contrib/bind/doc/misc/style.txt#1 branch .. //depot/projects/sio/contrib/bind/include/Makefile#1 branch .. //depot/projects/sio/contrib/bind/include/arpa/Makefile#1 branch .. //depot/projects/sio/contrib/bind/include/arpa/inet.h#1 branch .. //depot/projects/sio/contrib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/sio/contrib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/sio/contrib/bind/include/fd_setsize.h#1 branch .. //depot/projects/sio/contrib/bind/include/hesiod.h#1 branch .. //depot/projects/sio/contrib/bind/include/irp.h#1 branch .. //depot/projects/sio/contrib/bind/include/irs.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/Makefile#1 branch .. //depot/projects/sio/contrib/bind/include/isc/assertions.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/ctl.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/dst.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/heap.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/list.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/logging.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/misc.h#1 branch .. //depot/projects/sio/contrib/bind/include/isc/tree.h#1 branch .. //depot/projects/sio/contrib/bind/include/netdb.h#1 branch .. //depot/projects/sio/contrib/bind/include/netgroup.h#1 branch .. //depot/projects/sio/contrib/bind/include/res_update.h#1 branch .. //depot/projects/sio/contrib/bind/include/resolv.h#1 branch .. //depot/projects/sio/contrib/bind/lib/Makefile#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/Makefile#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/README#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/bsafe_link.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/cylink_link.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/dst_api.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/dst_internal.h#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/eay_dss_link.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/hmac_link.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/md5.h#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/md5_dgst.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/md5_locl.h#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/prandom.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/rsaref_link.c#1 branch .. //depot/projects/sio/contrib/bind/lib/dst/support.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/Makefile#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_addr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_cidr_pton.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_data.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_lnaof.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_makeaddr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_net_ntop.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_net_pton.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_neta.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_netof.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_network.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_ntoa.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_ntop.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/inet_pton.c#1 branch .. //depot/projects/sio/contrib/bind/lib/inet/nsap_addr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/Makefile#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/Makefile.BSD#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/README#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_gr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_ho.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_nw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_pr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_pw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/dns_sv.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gai_strerror.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_gr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_ho.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_ng.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_nw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_pr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_pw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gen_sv.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getgrent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getgrent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gethostent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/gethostent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getnameinfo.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getnetent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getnetent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getnetgrent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getnetgrent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getprotoent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getprotoent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getpwent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getpwent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getservent.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/getservent_r.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/hesiod.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/hesiod_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_gr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_ho.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_ng.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_nw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_pr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_pw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irp_sv.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irpmarshall.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irs_data.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irs_data.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/irs_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_gr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_ho.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_ng.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_nw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_pr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_pw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/lcl_sv.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_gr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_ho.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_ng.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_nw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_pr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_pw.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nis_sv.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/nul_ng.c#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/pathnames.h#1 branch .. //depot/projects/sio/contrib/bind/lib/irs/util.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/Makefile#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/assertions.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/assertions.mdoc#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/base64.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/bitncmp.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/bitncmp.mdoc#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ctl_clnt.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ctl_p.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ctl_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ctl_srvr.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ev_connects.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ev_files.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ev_streams.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ev_timers.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/ev_waits.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/eventlib.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/eventlib.mdoc#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/eventlib_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/heap.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/heap.mdoc#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/hex.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/logging.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/logging.mdoc#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/logging_p.h#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/memcluster.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/memcluster.mdoc#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/movefile.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/tree.c#1 branch .. //depot/projects/sio/contrib/bind/lib/isc/tree.mdoc#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 13:57:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F7AB37B405; Thu, 1 May 2003 13:57:29 -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 F063D37B401 for ; Thu, 1 May 2003 13:57:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6874443FE3 for ; Thu, 1 May 2003 13:57:27 -0700 (PDT) (envelope-from marcel@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 h41KvR0U090150 for ; Thu, 1 May 2003 13:57:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41KvQSw090147 for perforce@freebsd.org; Thu, 1 May 2003 13:57:26 -0700 (PDT) Date: Thu, 1 May 2003 13:57:26 -0700 (PDT) Message-Id: <200305012057.h41KvQSw090147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30343 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 20:57:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30343 Change 30343 by marcel@marcel_nfs on 2003/05/01 13:57:09 Integrate (using -I) all sio changes on the ia64 branch with this branch. Two exceptions: files.i386 and files.ia64 were edited because they contained vga(4) changes. The changes manually made in files.ia64 are identical to those on the ia64 branch. The changes made in files.i386 include the addition of a second sio_isa.c rule: sio_isa.c needs to be included if both the sio and acpi options are defined, irrespective of whether isa is defined. This merge includes: o Seperation of the sio(4) low-level console code in sio_cons.c. We use a static softc for the UART used as console and replace the dynamic softc with the static softc when we find the sio during bus enumeration. This guarantees that we preserve state and also automagically avoids that we have to know in advance which sio device is the console (since we don't care anymore). o Addition of sio_machdep.c to provide the low-level console code with tag and handle information (among other things) to keep MI code clean. The MD code can use whatever means suitable to come up with the right tag and handle: on i386 this is done by using the hints, on ia64 we use the HCDP table first and then the hints and on alpha we use the console structures for that. Support of sparc64, amd64 and powerpc. needs to be added when appropriate. o Add code to detect the (receiver) FIFO size. This avoids having to fiddle with hints and flags. The assumption is that the transmitter FIFO is at least the same size currently (we don't try to detect that seperately). o Add support for hint.sio.X.baud so that we can step away from depending on pre-compiled default baudrates. o In case it's not clear already: this merge adds support for memory mapped I/O. The driver is fully newbusified, except for the barriers. This merge axes (either permanently or temporarily): o Remove support for multi-port cards. The intend is to us puc(4) for that. The sio driver is to remain pure as much as possible. Handling multi-port cards somewhere else also avoids adding MD code in an otherwise MI driver. o Remove most of the sio flags. Some are redundant now, other need to find there way back. Hopefully we can avoid the same mess. o Remove support for GDB. This definitely has to come back, but needs to be done in the same MI/MD way as for the console. On ia64 (at least) the firmware can provide the port to use for debugging, which makes it a dynamic property that should be handled pretty much the same as the console itself. NOTE: pc98 seems to be the odd-ball due to having the sio driver in pc98 specific source files. I don't know to what extend sio/pc98 is different and whether we can integrate it here. NOTE ALSO: most (if not all) if this change the interaction with the hardware, not the high level code that deals with it being a tty. Provided the hardware is properly accessed, nothing should change functionally. NOTE ALSO WIK: this driver has so far been used successfully on ia64 and has had testing on both i386 and alpha. Affected files ... .. //depot/projects/sio/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/sio/sys/alpha/alpha/sio_machdep.c#1 branch .. //depot/projects/sio/sys/conf/files#2 integrate .. //depot/projects/sio/sys/conf/files.alpha#2 integrate .. //depot/projects/sio/sys/conf/files.i386#2 edit .. //depot/projects/sio/sys/conf/files.ia64#2 edit .. //depot/projects/sio/sys/conf/files.sparc64#2 integrate .. //depot/projects/sio/sys/dev/puc/puc.c#2 integrate .. //depot/projects/sio/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/sio/sys/dev/sio/sio_cons.c#1 branch .. //depot/projects/sio/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/sio/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/sio/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/sio/sys/dev/sio/siovar.h#2 integrate .. //depot/projects/sio/sys/ia64/ia64/sio_machdep.c#1 branch Differences ... ==== //depot/projects/sio/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -55,8 +55,6 @@ void api_up1000_init(void); static void api_up1000_cons_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -81,30 +79,13 @@ struct ctb *ctb; irongate_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/dec_1000a.c#2 (text+ko) ==== @@ -93,11 +93,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_1000a_init(int); static void dec_1000a_cons_init(void); @@ -112,8 +107,6 @@ static void dec_1000a_intr_enable(int); static void dec_1000a_intr_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); @@ -185,35 +178,12 @@ apecs_init(); } -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -51,10 +51,6 @@ #include #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; void dec_2100_a50_init(void); static void dec_2100_a50_cons_init(void); @@ -63,8 +59,6 @@ void sio_intr_disestablish(int); void sio_intr_setup(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); const struct alpha_variation_table dec_2100_a50_variations[] = { @@ -110,32 +104,12 @@ apecs_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - /* - * Force a comconsole on com1 if the SRM has a serial console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/dec_2100_a500.c#2 (text+ko) ==== @@ -44,17 +44,11 @@ #include #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; void dec_2100_a500_init(int); static void dec_2100_a500_cons_init(void); static void dec_2100_a500_intr_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -97,29 +91,11 @@ struct ctb *ctb; t2_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; break; case 3: ==== //depot/projects/sio/sys/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -48,17 +48,11 @@ #include #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); static int dec_axppci_33_intr_route (device_t, device_t, int); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); const struct alpha_variation_table dec_axppci_33_variations[] = { @@ -121,32 +115,12 @@ lca_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -47,11 +47,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_eb164_init(void); static void dec_eb164_cons_init(void); static void eb164_intr_init(void); @@ -60,8 +55,6 @@ extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -95,35 +88,12 @@ cia_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -67,11 +67,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_eb64plus_init(void); static void dec_eb64plus_cons_init(void); static void dec_eb64plus_intr_init(void); @@ -82,7 +77,6 @@ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach(int, int); extern int sccnattach(void); const struct alpha_variation_table dec_eb64plus_variations[] = { @@ -131,26 +125,7 @@ switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - - /* - * force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: #ifdef DEV_SC ==== //depot/projects/sio/sys/alpha/alpha/dec_kn20aa.c#2 (text+ko) ==== @@ -49,11 +49,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_kn20aa_init(void); static void dec_kn20aa_cons_init(void); static void dec_kn20aa_intr_init(void); @@ -61,8 +56,6 @@ static void dec_kn20aa_intr_disable(int); static void dec_kn20aa_intr_enable(int); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); #if 0 @@ -104,29 +97,12 @@ cia_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/dec_kn300.c#2 (text+ko) ==== @@ -57,11 +57,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_kn300_init(void); void dec_kn300_cons_init(void); @@ -73,8 +68,6 @@ }; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -103,26 +96,12 @@ struct ctb *ctb; mcbus_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; break; case 3: ==== //depot/projects/sio/sys/alpha/alpha/dec_st550.c#2 (text+ko) ==== @@ -54,11 +54,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void st550_init(void); static void st550_cons_init(void); static void st550_intr_init(void); @@ -70,8 +65,6 @@ #define ST550_PCI_IRQ_BEGIN 8 #define ST550_PCI_MAX_IRQ 47 -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -102,27 +95,11 @@ cia_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; break; case 3: ==== //depot/projects/sio/sys/alpha/alpha/dec_st6600.c#2 (text+ko) ==== @@ -46,11 +46,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void st6600_init(void); static void st6600_cons_init(void); static void st6600_intr_init(void); @@ -58,8 +53,6 @@ #define ST6600_PCI_IRQ_BEGIN 8 #define ST6600_PCI_MAX_IRQ 63 -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -85,30 +78,13 @@ struct ctb *ctb; tsunami_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/sio/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -119,6 +119,7 @@ #include #include #include +#include #include #include #include @@ -579,10 +580,11 @@ * Initalize the real console, so the the bootstrap console is * no longer necessary. */ - if (platform.cons_init) { + if (platform.cons_init) platform.cons_init(); - promcndetach(); - } + promcndetach(); + cninit(); + /* NO MORE FIRMWARE ACCESS ALLOWED */ #ifdef _PMAP_MAY_USE_PROM_CONSOLE /* ==== //depot/projects/sio/sys/conf/files#2 (text+ko) ==== @@ -649,6 +649,8 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci +dev/sio/sio.c optional sio +dev/sio/sio_cons.c optional sio dev/sio/sio_ebus.c optional sio ebus dev/sio/sio_pccard.c optional sio card dev/sio/sio_pccard.c optional sio pccard ==== //depot/projects/sio/sys/conf/files.alpha#2 (text+ko) ==== @@ -78,6 +78,7 @@ alpha/alpha/promcons.c standard alpha/alpha/prom_disp.s standard alpha/alpha/sgmap.c standard +alpha/alpha/sio_machdep.c optional sio alpha/alpha/support.s standard alpha/alpha/swtch.s standard alpha/alpha/sys_machdep.c standard @@ -178,7 +179,6 @@ dev/kbd/kbd.c optional kbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd -dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc ==== //depot/projects/sio/sys/conf/files.i386#2 (text+ko) ==== @@ -131,7 +131,7 @@ dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci -dev/sio/sio.c optional sio +dev/sio/sio_isa.c optional sio acpi dev/sio/sio_isa.c optional sio isa dev/sr/if_sr_isa.c optional sr isa dev/syscons/apm/apm_saver.c optional apm_saver apm @@ -230,6 +230,7 @@ i386/i386/perfmon.c optional perfmon i386/i386/perfmon.c optional perfmon profiling-routine i386/i386/pmap.c standard +i386/i386/sio_machdep.c optional sio i386/i386/support.s standard i386/i386/swtch.s standard i386/i386/sys_machdep.c standard ==== //depot/projects/sio/sys/conf/files.ia64#2 (text+ko) ==== @@ -34,7 +34,7 @@ dev/kbd/kbd.c optional kbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd -dev/sio/sio.c optional sio +dev/sio/sio_isa.c optional sio acpi dev/sio/sio_isa.c optional sio isa dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc @@ -85,6 +85,7 @@ ia64/ia64/sal.c standard ia64/ia64/sapic.c standard ia64/ia64/setjmp.s standard +ia64/ia64/sio_machdep.c optional sio ia64/ia64/ssc.c optional ski ia64/ia64/sscdisk.c optional ski ia64/ia64/support.s standard ==== //depot/projects/sio/sys/conf/files.sparc64#2 (text+ko) ==== @@ -15,7 +15,6 @@ dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard dev/ofw/openfirmio.c standard -dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa geom/geom_bsd.c standard geom/geom_bsd_enc.c standard ==== //depot/projects/sio/sys/dev/puc/puc.c#2 (text+ko) ==== @@ -315,9 +315,6 @@ continue; } device_set_ivars(sc->sc_ports[i].dev, pdev); - device_set_desc(sc->sc_ports[i].dev, sc->sc_desc->name); - if (!bootverbose) - device_quiet(sc->sc_ports[i].dev); #ifdef PUC_DEBUG printf("puc: type %d, bar %x, offset %x\n", sc->sc_desc->ports[i].type, ==== //depot/projects/sio/sys/dev/puc/pucdata.c#2 (text+ko) ==== @@ -49,6 +49,17 @@ const struct puc_device_description puc_devices[] = { + { "Diva Serial [GSP] Multiport UART", + NULL, + { 0x103c, 0x1048, 0x103c, 0x1282 }, + { 0xffff, 0xffff, 0xffff, 0xffff }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, 0, PUC_FLAGS_MEMORY }, + { PUC_PORT_TYPE_COM, 0x10, 0x38, 0, PUC_FLAGS_MEMORY }, + }, + }, + { "Comtrol RocketPort 550/4 RJ45", NULL, { 0x11fe, 0x8014, 0, 0 }, ==== //depot/projects/sio/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -34,6 +34,9 @@ #include #include +#include + +#include #include @@ -55,11 +58,9 @@ static driver_t sio_ebus_driver = { sio_driver_name, sio_ebus_methods, - 0, + sizeof(struct com_s), }; -DRIVER_MODULE(sio, ebus, sio_ebus_driver, sio_devclass, 0, 0); - /* Needed for EBus attach and sparc64 console support */ char *sio_ofw_names[] = { "serial", @@ -91,23 +92,31 @@ } static int -sio_ebus_probe(dev) - device_t dev; +sio_ebus_probe(device_t dev) { - char *n; + struct com_s *com; + char *n; n = ebus_get_name(dev); if (!sio_ofw_inlist(n, sio_ofw_names) && (strcmp(n, "serial") != 0 || !sio_ofw_inlist(ebus_get_compat(dev), sio_ofw_compat))) return (ENXIO); - /* Do not probe IRQ - isa_irq_pending() does not work for ebus. */ - return (sioprobe(dev, 0, 0UL, 1)); + + com = device_get_softc(dev); + com->addr_rid = 0; + com->addr_type = SYS_RES_IOPORT; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) + return (ENXIO); + return (sioprobe(dev)); } static int -sio_ebus_attach(dev) - device_t dev; +sio_ebus_attach(device_t dev) { - return (sioattach(dev, 0, 0UL)); + return (sioattach(dev)); } + +DRIVER_MODULE(sio, ebus, sio_ebus_driver, sio_devclass, 0, 0); ==== //depot/projects/sio/sys/dev/sio/sio_isa.c#2 (text+ko) ==== @@ -24,6 +24,8 @@ * $FreeBSD: src/sys/dev/sio/sio_isa.c,v 1.10 2003/03/11 16:49:06 takawata Exp $ */ +#include "opt_isa.h" + #include #include #include @@ -33,10 +35,13 @@ #include #include #include +#include #include -#include + #include -#include +#include + +#include #include @@ -50,14 +55,13 @@ /* Device interface */ DEVMETHOD(device_probe, sio_isa_probe), DEVMETHOD(device_attach, sio_isa_attach), - { 0, 0 } }; static driver_t sio_isa_driver = { sio_driver_name, sio_isa_methods, - 0, + sizeof(struct com_s), }; static struct isa_pnp_id sio_ids[] = { @@ -148,21 +152,38 @@ }; static int -sio_isa_probe(dev) - device_t dev; +sio_isa_probe(device_t dev) { + struct com_s *com; + /* Check isapnp ids */ if (ISA_PNP_PROBE(device_get_parent(dev), dev, sio_ids) == ENXIO) return (ENXIO); - return (sioprobe(dev, 0, 0UL, 0)); + + com = device_get_softc(dev); + com->addr_rid = 0; + com->addr_type = SYS_RES_IOPORT; + com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, + 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) { + com->addr_rid = 0; + com->addr_type = SYS_RES_MEMORY; + com->addr_res = bus_alloc_resource(dev, com->addr_type, + &com->addr_rid, 0, ~0, 8, RF_ACTIVE); + if (com->addr_res == NULL) + return (ENXIO); + } + return (sioprobe(dev)); } static int -sio_isa_attach(dev) - device_t dev; +sio_isa_attach(device_t dev) { - return (sioattach(dev, 0, 0UL)); + + return (sioattach(dev)); } +DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); +#ifdef DEV_ISA DRIVER_MODULE(sio, isa, sio_isa_driver, sio_devclass, 0, 0); -DRIVER_MODULE(sio, acpi, sio_isa_driver, sio_devclass, 0, 0); +#endif ==== //depot/projects/sio/sys/dev/sio/sio_puc.c#2 (text+ko) ==== @@ -36,9 +36,10 @@ #include #include #include -#include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 13:59:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F81437B407; Thu, 1 May 2003 13:59: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 A1E3737B404 for ; Thu, 1 May 2003 13:59:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9399243FB1 for ; Thu, 1 May 2003 13:59:31 -0700 (PDT) (envelope-from marcel@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 h41KxV0U090294 for ; Thu, 1 May 2003 13:59:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41KxUvh090291 for perforce@freebsd.org; Thu, 1 May 2003 13:59:30 -0700 (PDT) Date: Thu, 1 May 2003 13:59:30 -0700 (PDT) Message-Id: <200305012059.h41KxUvh090291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30345 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 20:59:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30345 Change 30345 by marcel@marcel_nfs on 2003/05/01 13:59:30 This got dropped from the previous change (30343) due to merge conflicts. Files have been copied from the ia64 brach after accepting the conflicting merge. This should be ok... Affected files ... .. //depot/projects/sio/sys/dev/sio/sio.c#2 edit .. //depot/projects/sio/sys/dev/sio/sio_pccard.c#2 edit .. //depot/projects/sio/sys/dev/sio/sio_pci.c#2 edit .. //depot/projects/sio/sys/dev/sio/sioreg.h#2 edit Differences ... ==== //depot/projects/sio/sys/dev/sio/sio.c#2 (text+ko) ==== @@ -36,7 +36,6 @@ */ #include "opt_comconsole.h" -#include "opt_compat.h" #include "opt_ddb.h" #include "opt_sio.h" @@ -66,24 +65,18 @@ #include #include #include -#include #include #include #include #include - -#include +#include #include +#include #include #include -#ifdef COM_ESP -#include -#endif -#include - #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define CALLOUT_MASK 0x80 @@ -96,19 +89,6 @@ #define UNIT_TO_MINOR(unit) ((((unit) & ~0x1fU) << (8 + 3)) \ | ((unit) & 0x1f)) -#ifdef COM_MULTIPORT -/* checks in flags for multiport and which is multiport "master chip" - * for a given card - */ -#define COM_ISMULTIPORT(flags) ((flags) & 0x01) -#define COM_MPMASTER(flags) (((flags) >> 8) & 0x0ff) -#define COM_NOTAST4(flags) ((flags) & 0x04) -#else -#define COM_ISMULTIPORT(flags) (0) -#endif /* COM_MULTIPORT */ - -#define COM_CONSOLE(flags) ((flags) & 0x10) -#define COM_FORCECONSOLE(flags) ((flags) & 0x20) #define COM_LLCONSOLE(flags) ((flags) & 0x40) #define COM_DEBUGGER(flags) ((flags) & 0x80) #define COM_LOSESOUTINTS(flags) ((flags) & 0x08) @@ -123,11 +103,6 @@ #define COM_TI16754(flags) ((flags) & 0x200000) #define COM_FIFOSIZE(flags) (((flags) & 0xff000000) >> 24) -#define sio_getreg(com, off) \ - (bus_space_read_1((com)->bst, (com)->bsh, (off))) -#define sio_setreg(com, off, value) \ - (bus_space_write_1((com)->bst, (com)->bsh, (off), (value))) - /* * com state bits. * (CS_BUSY | CS_TTGO) and (CS_BUSY | CS_TTGO | CS_ODEVREADY) must be higher @@ -163,125 +138,9 @@ "tty-level buffer overflow", }; -#define CE_NTYPES 3 #define CE_RECORD(com, errnum) (++(com)->delta_error_counts[errnum]) -/* types. XXX - should be elsewhere */ -typedef u_int Port_t; /* hardware port */ -typedef u_char bool_t; /* boolean */ - -/* queue of linear buffers */ -struct lbq { - u_char *l_head; /* next char to process */ - u_char *l_tail; /* one past the last char to process */ - struct lbq *l_next; /* next in queue */ - bool_t l_queued; /* nonzero if queued */ -}; - -/* com device structure */ -struct com_s { - u_int flags; /* Copy isa device flags */ - u_char state; /* miscellaneous flag bits */ - bool_t active_out; /* nonzero if the callout device is open */ - u_char cfcr_image; /* copy of value written to CFCR */ -#ifdef COM_ESP - bool_t esp; /* is this unit a hayes esp board? */ -#endif - u_char extra_state; /* more flag bits, separate for order trick */ - u_char fifo_image; /* copy of value written to FIFO */ - bool_t hasfifo; /* nonzero for 16550 UARTs */ - bool_t st16650a; /* Is a Startech 16650A or RTS/CTS compat */ - bool_t loses_outints; /* nonzero if device loses output interrupts */ - u_char mcr_image; /* copy of value written to MCR */ -#ifdef COM_MULTIPORT - bool_t multiport; /* is this unit part of a multiport device? */ -#endif /* COM_MULTIPORT */ - bool_t no_irq; /* nonzero if irq is not attached */ - bool_t gone; /* hardware disappeared */ - bool_t poll; /* nonzero if polling is required */ - bool_t poll_output; /* nonzero if polling for output is required */ - int unit; /* unit number */ - int dtr_wait; /* time to hold DTR down on close (* 1/hz) */ - u_int tx_fifo_size; - u_int wopeners; /* # processes waiting for DCD in open() */ - - /* - * The high level of the driver never reads status registers directly - * because there would be too many side effects to handle conveniently. - * Instead, it reads copies of the registers stored here by the - * interrupt handler. - */ - u_char last_modem_status; /* last MSR read by intr handler */ - u_char prev_modem_status; /* last MSR handled by high level */ - - u_char hotchar; /* ldisc-specific char to be handled ASAP */ - u_char *ibuf; /* start of input buffer */ - u_char *ibufend; /* end of input buffer */ - u_char *ibufold; /* old input buffer, to be freed */ - u_char *ihighwater; /* threshold in input buffer */ - u_char *iptr; /* next free spot in input buffer */ - int ibufsize; /* size of ibuf (not include error bytes) */ - int ierroff; /* offset of error bytes in ibuf */ - - struct lbq obufq; /* head of queue of output buffers */ - struct lbq obufs[2]; /* output buffers */ - - bus_space_tag_t bst; - bus_space_handle_t bsh; - - Port_t data_port; /* i/o ports */ -#ifdef COM_ESP - Port_t esp_port; -#endif - Port_t int_id_port; - Port_t modem_ctl_port; - Port_t line_status_port; - Port_t modem_status_port; - Port_t intr_ctl_port; /* Ports of IIR register */ - - struct tty *tp; /* cross reference */ - - /* Initial state. */ - struct termios it_in; /* should be in struct tty */ - struct termios it_out; - - /* Lock state. */ - struct termios lt_in; /* should be in struct tty */ - struct termios lt_out; - - bool_t do_timestamp; - bool_t do_dcd_timestamp; - struct timeval timestamp; - struct timeval dcd_timestamp; - struct pps_state pps; - int pps_bit; - - u_long bytes_in; /* statistics */ - u_long bytes_out; - u_int delta_error_counts[CE_NTYPES]; - u_long error_counts[CE_NTYPES]; - - u_long rclk; - - struct resource *irqres; - struct resource *ioportres; - void *cookie; - dev_t devs[6]; - - /* - * Data area for output buffers. Someday we should build the output - * buffer queue without copying data. - */ - u_char obuf1[256]; - u_char obuf2[256]; -}; - -#ifdef COM_ESP -static int espattach(struct com_s *com, Port_t esp_port); -#endif - static timeout_t siobusycheck; -static u_int siodivisor(u_long rclk, speed_t speed); static timeout_t siodtrwakeup; static void comhardclose(struct com_s *com); static void sioinput(struct com_s *com); @@ -327,18 +186,16 @@ .d_kqfilter = ttykqfilter, }; -static int comconsole = -1; -static volatile speed_t comdefaultrate = CONSPEED; -static u_long comdefaultrclk = DEFAULT_RCLK; +speed_t comdefaultrate = CONSPEED; + +u_long comdefaultrclk = DEFAULT_RCLK; SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, ""); -static speed_t gdbdefaultrate = GDBSPEED; -SYSCTL_UINT(_machdep, OID_AUTO, gdbspeed, CTLFLAG_RW, - &gdbdefaultrate, GDBSPEED, ""); + +static speed_t gdbdefaultrate = GDBSPEED; +SYSCTL_ULONG(_machdep, OID_AUTO, gdbspeed, CTLFLAG_RW, &gdbdefaultrate, + GDBSPEED, ""); + static u_int com_events; /* input chars + weighted output completions */ -static Port_t siocniobase; -static int siocnunit = -1; -static Port_t siogdbiobase; -static int siogdbunit = -1; static void *sio_slow_ih; static void *sio_fast_ih; static int sio_timeout; @@ -347,13 +204,6 @@ = CALLOUT_HANDLE_INITIALIZER(&sio_timeout_handle); static int sio_numunits; -#ifdef COM_ESP -/* XXX configure this properly. */ -/* XXX quite broken for new-bus. */ -static Port_t likely_com_ports[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, }; -static Port_t likely_esp_ports[] = { 0x140, 0x180, 0x280, 0 }; -#endif - /* * handle sysctl read/write requests for console speed * @@ -380,13 +230,10 @@ comdefaultrate = newspeed; - if (comconsole < 0) /* serial console not selected? */ + com = &sio_console; + if (com->consdev == NULL) return (0); - com = com_addr(comconsole); - if (com == NULL) - return (ENXIO); - /* * set the initial and lock rates for /dev/ttydXX and /dev/cuaXX * (note, the lock rates really are boolean -- if non-zero, disallow @@ -415,544 +262,498 @@ 0, 0, sysctl_machdep_comdefaultrate, "I", ""); /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ -#define SET_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) | (bit)) -#define CLR_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) & ~(bit)) +#ifdef SIO_DEBUG +static void +siodebug(struct com_s *com, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (com != NULL) + device_print_prettyname(com->dev); + vprintf(fmt, ap); + va_end(ap); +} +#else +static __inline void +siodebug(struct com_s *com, const char *fmt, ...) +{ +} +#endif /* - * Unload the driver and clear the table. - * XXX this is mostly wrong. - * XXX TODO: - * This is usually called when the card is ejected, but - * can be caused by a kldunload of a controller driver. - * The idea is to reset the driver's view of the device - * and ensure that any driver entry points such as - * read and write do not hang. + * Flush the UART. Flush the transmitter FIFO and shift register first, then + * flush the receiver FIFO. In this order flushing works correctly even when + * the UART is in loopback mode. Bad timing may cause at most one character + * to remain in the receiver FIFO/buffer after we're done flushing. This + * would be the character that is (partly) in the receiver shift register. */ -int -siodetach(dev) - device_t dev; +static int +sioflush(struct com_s *com) { - struct com_s *com; - int i; + int delay, limit; + + /* 1/10th the time to transmit 1 character (estimate). */ + delay = 16000000 * com->reg_dl / com->rclk; - com = (struct com_s *) device_get_softc(dev); - if (com == NULL) { - device_printf(dev, "NULL com in siounload\n"); - return (0); + /* Flush the transmitter. */ + limit = (com->fifosize) ? com->fifosize : 1; + limit = (limit + 2) * 10; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) + DELAY(delay); + if (limit == 0) { + siodebug(NULL, "transmitter appears stuck... "); + return (EIO); } - com->gone = 1; - for (i = 0 ; i < 6; i++) - destroy_dev(com->devs[i]); - if (com->irqres) { - bus_teardown_intr(dev, com->irqres, com->cookie); - bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres); + + DELAY(10*delay); + + /* + * Flush the receiver. Pick an arbitrary high limit to avoid + * getting stuck in an infinite loop when the hardware is + * broken. + */ + limit=32768; + while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { + (void)sio_getreg(com, com_data); + /* XXX barrier */ + DELAY(5*delay); } - if (com->ioportres) - bus_release_resource(dev, SYS_RES_IOPORT, 0, com->ioportres); - if (com->tp && (com->tp->t_state & TS_ISOPEN)) { - device_printf(dev, "still open, forcing close\n"); - (*linesw[com->tp->t_line].l_close)(com->tp, 0); - com->tp->t_gen++; - ttyclose(com->tp); - ttwakeup(com->tp); - ttwwakeup(com->tp); - } else { - if (com->ibuf != NULL) - free(com->ibuf, M_DEVBUF); - device_set_softc(dev, NULL); - free(com, M_DEVBUF); + if (limit == 0) { + siodebug(NULL, "receiver appears broken... "); + return (EIO); } + return (0); } -int -sioprobe(dev, xrid, rclk, noprobe) - device_t dev; - int xrid; - u_long rclk; - int noprobe; +/* + * Initialize the FIFOs and determine the size of the receiver FIFO. We + * assume that the transmitter FIFO has the same size. First we set DMA + * mode (mode 1) with the highest trigger level. In combination with + * loopback this allows us to determine the size of the receiver FIFO. + * After that we re-initialize with a medium high trigger level. This + * function is expected to be called with FIFOs disabled. + */ +static int +sioinitfifo(struct com_s *com) { -#if 0 - static bool_t already_init; - device_t xdev; -#endif - struct com_s *com; - u_int divisor; - bool_t failures[10]; - int fn; - device_t idev; - Port_t iobase; - intrmask_t irqmap[4]; - intrmask_t irqs; - u_char mcr_image; - int result; - u_long xirq; - u_int flags = device_get_flags(dev); - int rid; - struct resource *port; + int count, delay, limit; + + com->hasfifo = 0; + com->fifosize = 0; - rid = xrid; - port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0, ~0, IO_COMSIZE, RF_ACTIVE); - if (!port) - return (ENXIO); + /* 1/10th the time to transmit 1 character (estimate). */ + delay = 16000000 * com->reg_dl / com->rclk; - com = malloc(sizeof(*com), M_DEVBUF, M_NOWAIT | M_ZERO); - if (com == NULL) - return (ENOMEM); - device_set_softc(dev, com); - com->bst = rman_get_bustag(port); - com->bsh = rman_get_bushandle(port); - if (rclk == 0) - rclk = DEFAULT_RCLK; - com->rclk = rclk; + /* + * Make sure the transmitter is idle before we play with the + * FIFOs. We don't wait more than roughly three times as long + * as needed to send a single character. Given that we may need + * to wait for both the THR and the TSR to clear, this leaves + * us roughly 1 character time slack. + */ + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { + if (delay) + DELAY(delay); + } + if (limit == 0) { + siodebug(NULL, "transmitter appears stuck"); + return (EIO); + } - while (sio_inited != 2) - if (atomic_cmpset_int(&sio_inited, 0, 1)) { - mtx_init(&sio_lock, sio_driver_name, NULL, - (comconsole != -1) ? - MTX_SPIN | MTX_QUIET : MTX_SPIN); - atomic_store_rel_int(&sio_inited, 2); - } + /* + * Set loopback mode. This avoids having garbage on the wire and + * also allows us send and receive data. We set DTR and RTS to + * avoid the possibility that automatic flow-control prevents + * any data from being sent. + */ + sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK|MCR_DTR|MCR_RTS); + /* XXX barrier */ -#if 0 /* - * XXX this is broken - when we are first called, there are no - * previously configured IO ports. We could hard code - * 0x3f8, 0x2f8, 0x3e8, 0x2e8 etc but that's probably worse. - * This code has been doing nothing since the conversion since - * "count" is zero the first time around. + * Enable FIFOs. Set DMA mode with the highest trigger level so + * that we can determine the FIFO size. Since this is the first + * time we enable the FIFOs, reset them. */ - if (!already_init) { - /* - * Turn off MCR_IENABLE for all likely serial ports. An unused - * port with its MCR_IENABLE gate open will inhibit interrupts - * from any used port that shares the interrupt vector. - * XXX the gate enable is elsewhere for some multiports. - */ - device_t *devs; - int count, i, xioport; + com->reg_fcr = FCR_ENABLE | FCR_DMA_MODE | FCR_RX_HIGH; + sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); + /* XXX barrier */ - devclass_get_devices(sio_devclass, &devs, &count); - for (i = 0; i < count; i++) { - xdev = devs[i]; - if (device_is_enabled(xdev) && - bus_get_resource(xdev, SYS_RES_IOPORT, 0, &xioport, - NULL) == 0) - outb(xioport + com_mcr, 0); - } - free(devs, M_TEMP); - already_init = TRUE; + /* Check if the UART has FIFOs. If not, we're done. */ + com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; + if (!com->hasfifo) { + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + siodebug(NULL, "no FIFOs... "); + return (0); } -#endif - if (COM_LLCONSOLE(flags)) { - printf("sio%d: reserved for low-level i/o\n", - device_get_unit(dev)); - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); - device_set_softc(dev, NULL); - free(com, M_DEVBUF); - return (ENXIO); + /* We have FIFOs. Flush the transmitter and receiver. */ + if (sioflush(com)) { + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + goto fallback; } + sio_setreg(com, com_ier, IER_ERXRDY); + /* XXX barrier */ + /* - * If the device is on a multiport card and has an AST/4 - * compatible interrupt control register, initialize this - * register and prepare to leave MCR_IENABLE clear in the mcr. - * Otherwise, prepare to set MCR_IENABLE in the mcr. - * Point idev to the device struct giving the correct id_irq. - * This is the struct for the master device if there is one. + * We should have a sufficiently clean "pipe" to determine the + * size of the FIFOs. We send as much characters as is reasonable + * and wait for the the RX interrupt to be asserted, counting the + * characters as we send them. Based on that count we know the + * FIFO size. */ - idev = dev; - mcr_image = MCR_IENABLE; -#ifdef COM_MULTIPORT - if (COM_ISMULTIPORT(flags)) { - Port_t xiobase; - u_long io; + count = 0; + while ((sio_getreg(com, com_iir) & IIR_RXRDY) == 0 && count < 1030) { + sio_setreg(com, com_data, 0); + /* XXX barrier */ + count++; - idev = devclass_get_device(sio_devclass, COM_MPMASTER(flags)); - if (idev == NULL) { - printf("sio%d: master device %d not configured\n", - device_get_unit(dev), COM_MPMASTER(flags)); - idev = dev; + limit = 30; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { + if (delay) + DELAY(delay); } - if (!COM_NOTAST4(flags)) { - if (bus_get_resource(idev, SYS_RES_IOPORT, 0, &io, - NULL) == 0) { - xiobase = io; - if (bus_get_resource(idev, SYS_RES_IRQ, 0, - NULL, NULL) == 0) - outb(xiobase + com_scr, 0x80); - else - outb(xiobase + com_scr, 0); - } - mcr_image = 0; + if (limit == 0) { + sio_setreg(com, com_ier, 0); + /* XXX barrier */ + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + siodebug(NULL, "can't determine FIFO size... "); + goto fallback; } } -#endif /* COM_MULTIPORT */ - if (bus_get_resource(idev, SYS_RES_IRQ, 0, NULL, NULL) != 0) - mcr_image = 0; + + sio_setreg(com, com_ier, 0); + /* XXX barrier */ + + /* Reset FIFOs. */ + com->reg_fcr = FCR_ENABLE; + sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); + /* XXX barrier */ + + sio_setreg(com, com_mcr, com->reg_mcr); + /* XXX barrier */ + + if (count >= 14 && count < 16) + com->fifosize = 16; /* 16550 */ + else if (count >= 28 && count < 32) + com->fifosize = 32; /* 16650 */ + else if (count >= 56 && count < 64) + com->fifosize = 64; /* 16750 */ + else if (count >= 112 && count < 128) + com->fifosize = 128; /* 16950 */ + else + com->fifosize = 1; /* XXX */ - bzero(failures, sizeof failures); - iobase = rman_get_start(port); + siodebug(NULL, "count=%d; FIFO=%d... ", count, com->fifosize); + return (0); - /* - * We don't want to get actual interrupts, just masked ones. - * Interrupts from this line should already be masked in the ICU, - * but mask them in the processor as well in case there are some - * (misconfigured) shared interrupts. - */ - mtx_lock_spin(&sio_lock); -/* EXTRA DELAY? */ +fallback: + siodebug(NULL, "disabling FIFOs... "); + com->hasfifo = 0; + return (0); +} - /* - * For the TI16754 chips, set prescaler to 1 (4 is often the - * default after-reset value) as otherwise it's impossible to - * get highest baudrates. - */ - if (COM_TI16754(flags)) { - u_char cfcr, efr; +static void +siodescribe(struct com_s *com) +{ + int has_spr; + u_char spr; - cfcr = sio_getreg(com, com_cfcr); - sio_setreg(com, com_cfcr, CFCR_EFR_ENABLE); - efr = sio_getreg(com, com_efr); - /* Unlock extended features to turn off prescaler. */ - sio_setreg(com, com_efr, efr | EFR_EFE); - /* Disable EFR. */ - sio_setreg(com, com_cfcr, (cfcr != CFCR_EFR_ENABLE) ? cfcr : 0); - /* Turn off prescaler. */ - sio_setreg(com, com_mcr, - sio_getreg(com, com_mcr) & ~MCR_PRESCALE); - sio_setreg(com, com_cfcr, CFCR_EFR_ENABLE); - sio_setreg(com, com_efr, efr); - sio_setreg(com, com_cfcr, cfcr); + if (com->hasfifo) { + /* + * NS16550 or higher. The minimum FIFO size is 16 bytes for + * the NS16550. The ST16C650 has 32 bytes FIFOs and the + * NS16750 has 64 bytes FIFOs. + */ + switch (com->fifosize) { + case 16: + /* + * XXX Should we try to see if we have a broken + * 16550 or a fixed 16550A? + */ + device_set_desc(com->dev, "16550 or compatible"); + break; + case 32: + /* XXX Should we check features? */ + device_set_desc(com->dev, "16650 or compatible"); + break; + case 64: + /* XXX Should we check features? */ + device_set_desc(com->dev, "16750 or compatible"); + break; + case 128: + /* XXX Should we check features? */ + device_set_desc(com->dev, "16950 or compatible"); + break; + default: + /* XXX Probably not right. */ + device_set_desc(com->dev, + "Non-standard or broken UART with FIFO"); + break; + } + } else { + /* + * NS16450 or lower. Use the Scratch Pad Register (SPR) to + * differentiate the NS16450 from the INS8250. + */ + spr = sio_getreg(com, com_scr); + sio_setreg(com, com_scr, ~spr); + /* XXX barrier */ + has_spr = (sio_getreg(com, com_scr) == ~spr) ? 1 : 0; + /* XXX barrier */ + sio_setreg(com, com_scr, spr); + /* XXX barrier */ + if (!has_spr) + device_set_desc(com->dev, "8250 or compatible"); + else + device_set_desc(com->dev, "16450 or compatible"); } +} + +u_int +siodivisor(u_long rclk, u_long speed) +{ + long actual_speed; + u_int divisor; + int error; + + if (speed == 0) + return (0); +#if UINT_MAX > (ULONG_MAX - 1) / 8 + if (speed > (ULONG_MAX - 1) / 8) + return (0); +#endif + divisor = (rclk / (8UL * speed) + 1) / 2; + if (divisor == 0 || divisor >= 65536) + return (0); + actual_speed = rclk / (16UL * divisor); - /* - * Initialize the speed and the word size and wait long enough to - * drain the maximum of 16 bytes of junk in device output queues. - * The speed is undefined after a master reset and must be set - * before relying on anything related to output. There may be - * junk after a (very fast) soft reboot and (apparently) after - * master reset. - * XXX what about the UART bug avoided by waiting in comparam()? - * We don't want to to wait long enough to drain at 2 bps. - */ - if (iobase == siocniobase) - DELAY((16 + 1) * 1000000 / (comdefaultrate / 10)); - else { - sio_setreg(com, com_cfcr, CFCR_DLAB | CFCR_8BITS); - divisor = siodivisor(rclk, SIO_TEST_SPEED); - sio_setreg(com, com_dlbl, divisor & 0xff); - sio_setreg(com, com_dlbh, divisor >> 8); - sio_setreg(com, com_cfcr, CFCR_8BITS); - DELAY((16 + 1) * 1000000 / (SIO_TEST_SPEED / 10)); - } + /* 10 times error in percent: */ + error = ((actual_speed - (long)speed) * 2000 / (long)speed + 1) / 2; - /* - * Enable the interrupt gate and disable device interupts. This - * should leave the device driving the interrupt line low and - * guarantee an edge trigger if an interrupt can be generated. - */ -/* EXTRA DELAY? */ - sio_setreg(com, com_mcr, mcr_image); - sio_setreg(com, com_ier, 0); - DELAY(1000); /* XXX */ - irqmap[0] = isa_irq_pending(); + /* 3.0% maximum error tolerance: */ + if (error < -30 || error > 30) + return (0); - /* - * Attempt to set loopback mode so that we can send a null byte - * without annoying any external device. - */ -/* EXTRA DELAY? */ - sio_setreg(com, com_mcr, mcr_image | MCR_LOOPBACK); + return (divisor); +} - /* - * Attempt to generate an output interrupt. On 8250's, setting - * IER_ETXRDY generates an interrupt independent of the current - * setting and independent of whether the THR is empty. On 16450's, - * setting IER_ETXRDY generates an interrupt independent of the - * current setting. On 16550A's, setting IER_ETXRDY only - * generates an interrupt when IER_ETXRDY is not already set. - */ - sio_setreg(com, com_ier, IER_ETXRDY); +/* + * Do some non-destructive (for this device that is) tests + * to make sure we have something that looks like an UART. + */ +int sioprobe1(struct com_s *com) +{ + u_char lcr, val; - /* - * On some 16x50 incompatibles, setting IER_ETXRDY doesn't generate - * an interrupt. They'd better generate one for actually doing - * output. Loopback may be broken on the same incompatibles but - * it's unlikely to do more than allow the null byte out. - */ - sio_setreg(com, com_data, 0); - DELAY((1 + 2) * 1000000 / (SIO_TEST_SPEED / 10)); + lcr = sio_getreg(com, com_lcr); + sio_setreg(com, com_lcr, lcr & ~LCR_DLAB); - /* - * Turn off loopback mode so that the interrupt gate works again - * (MCR_IENABLE was hidden). This should leave the device driving - * an interrupt line high. It doesn't matter if the interrupt - * line oscillates while we are not looking at it, since interrupts - * are disabled. - */ -/* EXTRA DELAY? */ - sio_setreg(com, com_mcr, mcr_image); - - /* - * It seems my Xircom CBEM56G Cardbus modem wants to be reset - * to 8 bits *again*, or else probe test 0 will fail. - * gwk@sgi.com, 4/19/2001 - */ - sio_setreg(com, com_cfcr, CFCR_8BITS); + /* Check known 0 bits that don't depend on DLAB. */ + val = sio_getreg(com, com_iir); + if (val & 0x30) + goto fail; + val = sio_getreg(com, com_mcr); + if (val & 0xe0) + goto fail; - /* - * Some pcmcia cards have the "TXRDY bug", so we check everyone - * for IIR_TXRDY implementation ( Palido 321s, DC-1S... ) - */ - if (noprobe) { - /* Reading IIR register twice */ - for (fn = 0; fn < 2; fn ++) { - DELAY(10000); - failures[6] = sio_getreg(com, com_iir); - } - /* Check IIR_TXRDY clear ? */ - result = 0; - if (failures[6] & IIR_TXRDY) { - /* No, Double check with clearing IER */ - sio_setreg(com, com_ier, 0); - if (sio_getreg(com, com_iir) & IIR_NOPEND) { - /* Ok. We discovered TXRDY bug! */ - SET_FLAG(dev, COM_C_IIR_TXRDYBUG); - } else { - /* Unknown, Just omit this chip.. XXX */ - result = ENXIO; - sio_setreg(com, com_mcr, 0); - } - } else { - /* OK. this is well-known guys */ - CLR_FLAG(dev, COM_C_IIR_TXRDYBUG); - } - sio_setreg(com, com_ier, 0); - sio_setreg(com, com_cfcr, CFCR_8BITS); - mtx_unlock_spin(&sio_lock); - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); - if (iobase == siocniobase) - result = 0; - if (result != 0) { - device_set_softc(dev, NULL); - free(com, M_DEVBUF); - } - return (result); - } + /* Check known 0 bits that depend on !DLAB. */ + val = sio_getreg(com, com_ier); + if (val & 0xf0) + goto fail; - /* - * Check that - * o the CFCR, IER and MCR in UART hold the values written to them - * (the values happen to be all distinct - this is good for - * avoiding false positive tests from bus echoes). - * o an output interrupt is generated and its vector is correct. - * o the interrupt goes away when the IIR in the UART is read. - */ -/* EXTRA DELAY? */ - failures[0] = sio_getreg(com, com_cfcr) - CFCR_8BITS; - failures[1] = sio_getreg(com, com_ier) - IER_ETXRDY; - failures[2] = sio_getreg(com, com_mcr) - mcr_image; - DELAY(10000); /* Some internal modems need this time */ - irqmap[1] = isa_irq_pending(); - failures[4] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_TXRDY; - DELAY(1000); /* XXX */ - irqmap[2] = isa_irq_pending(); - failures[6] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_NOPEND; + /* XXX we can do more. */ - /* - * Turn off all device interrupts and check that they go off properly. - * Leave MCR_IENABLE alone. For ports without a master port, it gates - * the OUT2 output of the UART to - * the ICU input. Closing the gate would give a floating ICU input - * (unless there is another device driving it) and spurious interrupts. - * (On the system that this was first tested on, the input floats high - * and gives a (masked) interrupt as soon as the gate is closed.) - */ sio_setreg(com, com_ier, 0); - sio_setreg(com, com_cfcr, CFCR_8BITS); /* dummy to avoid bus echo */ - failures[7] = sio_getreg(com, com_ier); - DELAY(1000); /* XXX */ - irqmap[3] = isa_irq_pending(); - failures[9] = (sio_getreg(com, com_iir) & IIR_IMASK) - IIR_NOPEND; + /* XXX barrier */ + sio_setreg(com, com_lcr, lcr); + /* XXX barrier */ + return (0); + + fail: + sio_setreg(com, com_lcr, lcr); + /* XXX barrier */ + return (ENXIO); +} + +/* + * Unload the driver and clear the table. + * XXX this is mostly wrong. + * XXX TODO: + * This is usually called when the card is ejected, but + * can be caused by a kldunload of a controller driver. + * The idea is to reset the driver's view of the device + * and ensure that any driver entry points such as + * read and write do not hang. + */ +int +siodetach(device_t dev) +{ + struct com_s *com; + int i; - mtx_unlock_spin(&sio_lock); + com = (struct com_s *)device_get_softc(dev); + com->gone = 1; - irqs = irqmap[1] & ~irqmap[0]; - if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 && - ((1 << xirq) & irqs) == 0) { - printf( - "sio%d: configured irq %ld not in bitmap of probed irqs %#x\n", - device_get_unit(dev), xirq, irqs); - printf( - "sio%d: port may not be enabled\n", - device_get_unit(dev)); + if (com->tp && (com->tp->t_state & TS_ISOPEN)) { + device_printf(dev, "still open, forcing close\n"); + (*linesw[com->tp->t_line].l_close)(com->tp, 0); + com->tp->t_gen++; + ttyclose(com->tp); + ttwakeup(com->tp); + ttwwakeup(com->tp); } - if (bootverbose) - printf("sio%d: irq maps: %#x %#x %#x %#x\n", - device_get_unit(dev), - irqmap[0], irqmap[1], irqmap[2], irqmap[3]); - - result = 0; - for (fn = 0; fn < sizeof failures; ++fn) - if (failures[fn]) { - sio_setreg(com, com_mcr, 0); - result = ENXIO; - if (bootverbose) { - printf("sio%d: probe failed test(s):", - device_get_unit(dev)); - for (fn = 0; fn < sizeof failures; ++fn) - if (failures[fn]) - printf(" %d", fn); - printf("\n"); - } - break; - } - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); - if (iobase == siocniobase) - result = 0; - if (result != 0) { - device_set_softc(dev, NULL); - free(com, M_DEVBUF); + if (com->irq_res) { + bus_teardown_intr(dev, com->irq_res, com->irq_cookie); + bus_release_resource(dev, SYS_RES_IRQ, 0, com->irq_res); } - return (result); + bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); + for (i = 0 ; i < 6; i++) + destroy_dev(com->devs[i]); + if (com->ibuf != NULL) + free(com->ibuf, M_DEVBUF); + return (0); } -#ifdef COM_ESP -static int -espattach(com, esp_port) - struct com_s *com; - Port_t esp_port; +int +sioprobe(device_t dev) { - u_char dips; - u_char val; + struct com_s *com; + int error; + u_int flags; + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 14:11:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69D6F37B404; Thu, 1 May 2003 14:11:49 -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 06A1037B401 for ; Thu, 1 May 2003 14:11:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2CA843F3F for ; Thu, 1 May 2003 14:11:48 -0700 (PDT) (envelope-from des@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 h41LBm0U091879 for ; Thu, 1 May 2003 14:11:48 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41LBmD8091876 for perforce@freebsd.org; Thu, 1 May 2003 14:11:48 -0700 (PDT) Date: Thu, 1 May 2003 14:11:48 -0700 (PDT) Message-Id: <200305012111.h41LBmD8091876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30348 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 21:11:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30348 Change 30348 by des@des.at.des.thinksec.com on 2003/05/01 14:10:49 Constify the return value from pam_getenv(3). This violates XSSO, but I consider that a bug in the spec. Affected files ... .. //depot/projects/openpam/include/security/pam_appl.h#11 edit .. //depot/projects/openpam/lib/pam_getenv.c#13 edit Differences ... ==== //depot/projects/openpam/include/security/pam_appl.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_appl.h#10 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#11 $ */ #ifndef _PAM_APPL_H_INCLUDED @@ -83,7 +83,7 @@ const char **_user, const char *_prompt); -char * +const char * pam_getenv(pam_handle_t *_pamh, const char *_name); ==== //depot/projects/openpam/lib/pam_getenv.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#13 $ */ #include @@ -48,7 +48,7 @@ * Retrieve the value of a PAM environment variable */ -char * +const char * pam_getenv(pam_handle_t *pamh, const char *name) { From owner-p4-projects@FreeBSD.ORG Thu May 1 15:12:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 052C437B404; Thu, 1 May 2003 15:12:15 -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 8ABC937B401 for ; Thu, 1 May 2003 15:12:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C24D343F85 for ; Thu, 1 May 2003 15:12:12 -0700 (PDT) (envelope-from marcel@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 h41MCC0U095696 for ; Thu, 1 May 2003 15:12:12 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41MC7qo095693 for perforce@freebsd.org; Thu, 1 May 2003 15:12:07 -0700 (PDT) Date: Thu, 1 May 2003 15:12:07 -0700 (PDT) Message-Id: <200305012212.h41MC7qo095693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30353 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 22:12:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=30353 Change 30353 by marcel@marcel_nfs on 2003/05/01 15:12:04 IFC @30351 Affected files ... .. //depot/projects/sio/Makefile.inc1#2 integrate .. //depot/projects/sio/bin/chflags/chflags.c#2 integrate .. //depot/projects/sio/bin/chio/chio.c#2 integrate .. //depot/projects/sio/bin/chmod/chmod.c#2 integrate .. //depot/projects/sio/bin/cp/cp.c#2 integrate .. //depot/projects/sio/bin/dd/dd.c#2 integrate .. //depot/projects/sio/bin/df/df.c#2 integrate .. //depot/projects/sio/bin/domainname/domainname.c#2 integrate .. //depot/projects/sio/bin/echo/echo.c#2 integrate .. //depot/projects/sio/bin/ed/main.c#2 integrate .. //depot/projects/sio/bin/hostname/hostname.c#2 integrate .. //depot/projects/sio/bin/kill/kill.c#2 integrate .. //depot/projects/sio/bin/ln/ln.c#2 integrate .. //depot/projects/sio/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/sio/bin/mv/mv.c#2 integrate .. //depot/projects/sio/bin/pax/tar.1#2 integrate .. //depot/projects/sio/bin/pwd/pwd.c#2 integrate .. //depot/projects/sio/bin/rcp/rcp.c#2 integrate .. //depot/projects/sio/bin/rm/rm.c#2 integrate .. //depot/projects/sio/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/sio/bin/sh/arith.y#2 integrate .. //depot/projects/sio/bin/sh/arith_lex.l#2 integrate .. //depot/projects/sio/bin/sh/mknodes.c#2 integrate .. //depot/projects/sio/bin/sh/mksyntax.c#2 integrate .. //depot/projects/sio/bin/sleep/sleep.c#2 integrate .. //depot/projects/sio/bin/stty/stty.c#2 integrate .. //depot/projects/sio/bin/sync/sync.c#2 integrate .. //depot/projects/sio/contrib/groff/ChangeLog#2 integrate .. //depot/projects/sio/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/sio/contrib/groff/INSTALL#2 integrate .. //depot/projects/sio/contrib/groff/MANIFEST#2 integrate .. //depot/projects/sio/contrib/groff/Makefile.ccpg#2 integrate .. //depot/projects/sio/contrib/groff/Makefile.comm#2 integrate .. //depot/projects/sio/contrib/groff/Makefile.dev#2 integrate .. //depot/projects/sio/contrib/groff/Makefile.in#2 integrate .. //depot/projects/sio/contrib/groff/Makefile.lib#2 integrate .. //depot/projects/sio/contrib/groff/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/NEWS#2 integrate .. //depot/projects/sio/contrib/groff/PROBLEMS#2 integrate .. //depot/projects/sio/contrib/groff/REVISION#2 integrate .. //depot/projects/sio/contrib/groff/VERSION#2 integrate .. //depot/projects/sio/contrib/groff/aclocal.m4#2 integrate .. //depot/projects/sio/contrib/groff/configure#2 integrate .. //depot/projects/sio/contrib/groff/configure.ac#2 integrate .. //depot/projects/sio/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/sio/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/sio/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/sio/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mm/ChangeLog#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mm/groff_mm.man#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mm/m.tmac#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mm/mm/4.MT#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/examples/typeset.mom#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/sio/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/sio/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/sio/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/sio/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-10#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-11#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-4#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-5#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-6#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-7#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-8#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff-9#2 integrate .. //depot/projects/sio/contrib/groff/doc/groff.texinfo#2 integrate .. //depot/projects/sio/contrib/groff/doc/pic.ms#2 integrate .. //depot/projects/sio/contrib/groff/doc/texinfo.tex#2 integrate .. //depot/projects/sio/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/CBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/NB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/NBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/NI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/NR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100-12/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/CBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/NB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/NBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/NI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/NR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX100/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/CBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/NB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/NBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/NI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/NR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75-12/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/CBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/NB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/NBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/NI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/NR#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devX75/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devascii/R.proto#2 integrate .. //depot/projects/sio/contrib/groff/font/devcp1047/R.proto#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/CW#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/CWEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/CWI#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/CWIEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/CWITC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/CWTC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/EX#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HBEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HBIEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HBITC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HBTC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HIEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HITC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HREC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/HRTC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/MI#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TBEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TBIEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TBITC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TBTC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TIEC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TITC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TREC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/TRTC#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/Makefile#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/ec.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/tc.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/texb.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/texex.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/texi.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/texmi.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/texr.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/texsy.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devdvi/generate/textt.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devhtml/DESC.proto#2 integrate .. //depot/projects/sio/contrib/groff/font/devhtml/R.proto#2 integrate .. //depot/projects/sio/contrib/groff/font/devlatin1/R.proto#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/EB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/EI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/ER#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HNB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HNBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HNI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HNR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlbp/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/ALBB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/ALBR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/AOB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/AOI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/AOR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/CBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/CLARENDON#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/CORONET#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/GB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/GBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/GI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/GR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/LGB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/LGI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/LGR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/MARIGOLD#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/OB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/OBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/OI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/OR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UCB#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UCBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UCI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UCR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UI#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/UR#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devlj4/generate/text.map#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/AB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/ABI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/AI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/AR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/BMB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/BMBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/BMI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/BMR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/CB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/CBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/CI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/CR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HNB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HNBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HNI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HNR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/HR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/NB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/NBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/NI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/NR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/PB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/PBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/PI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/PR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/S#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/TB#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/TBI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/TI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/TR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/ZCMI#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/ZD#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/ZDR#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/download#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/generate/Makefile#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/generate/symbolchars#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/generate/textmap#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/prologue.ps#2 integrate .. //depot/projects/sio/contrib/groff/font/devps/symbolmap#2 integrate .. //depot/projects/sio/contrib/groff/font/devutf8/NOTES#2 integrate .. //depot/projects/sio/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/sio/contrib/groff/man/groff.man#2 integrate .. //depot/projects/sio/contrib/groff/man/groff_char.man#2 integrate .. //depot/projects/sio/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/sio/contrib/groff/man/groff_font.man#2 integrate .. //depot/projects/sio/contrib/groff/man/groff_out.man#2 integrate .. //depot/projects/sio/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/sio/contrib/groff/man/roff.man#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grodvi/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grodvi/dvi.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grodvi/grodvi.man#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grohtml/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grohtml/html-table.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grohtml/html-text.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grohtml/html-text.h#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grohtml/output.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grohtml/post-html.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grolbp/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grolbp/charset.h#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grolbp/lbp.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grolbp/lbp.h#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grolj4/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grolj4/lj4.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grops/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grops/TODO#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grops/grops.man#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grops/ps.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grops/ps.h#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grops/psrm.cc#2 delete .. //depot/projects/sio/contrib/groff/src/devices/grotty/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/devices/grotty/tty.cc#2 delete .. //depot/projects/sio/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/sio/contrib/groff/src/include/driver.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/html-strings.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/lib.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/nonposix.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/printer.h#2 integrate .. //depot/projects/sio/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/sio/contrib/groff/src/libs/libbib/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/libs/libbib/common.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libbib/index.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libbib/linear.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libbib/search.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libdriver/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/libs/libdriver/input.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libdriver/printer.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/libs/libgroff/assert.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/change_lf.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/cmap.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/color.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/cset.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/device.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/errarg.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/error.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/fatal.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/filename.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/font.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/fontfile.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/geometry.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/htmlhint.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/invalid.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/lf.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/lineno.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/macropath.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/maxfilename.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/mksdir.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/mkstemp.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/nametoindex.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/new.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/paper.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/prime.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/progname.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/ptable.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/searchpath.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/string.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/strsave.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/tmpfile.cc#2 delete .. //depot/projects/sio/contrib/groff/src/libs/libgroff/tmpname.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/eqn/box.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/delim.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/lex.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/limit.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/list.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/main.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/mark.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/eqn/other.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/over.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/pile.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/script.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/special.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/sqrt.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/eqn/text.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/grn/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/grn/README#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/grn/hdb.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/grn/hgraph.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/grn/hpoint.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/grn/main.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/html/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/html/pre-html.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/html/pushback.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/pic/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/pic/common.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/pic/lex.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/pic/main.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/pic/object.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/pic/pic.h#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/pic/pic.man#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/pic/pic.y#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/pic/tex.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/pic/troff.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/refer/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/refer/command.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/refer/ref.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/refer/refer.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/refer/token.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/soelim/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/soelim/soelim.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/tbl/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/preproc/tbl/main.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/tbl/table.cc#2 delete .. //depot/projects/sio/contrib/groff/src/preproc/tbl/tbl.man#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/groff/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/groff/groff.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/groff/groff.man#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/groff/pipeline.c#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/grog/grog.man#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/nroff/nroff.man#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/nroff/nroff.sh#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/charinfo.h#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/column.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/dictionary.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/div.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/div.h#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/env.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/input.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/node.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/node.h#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/number.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/reg.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/symbol.cc#2 delete .. //depot/projects/sio/contrib/groff/src/roff/troff/token.h#2 integrate .. //depot/projects/sio/contrib/groff/src/roff/troff/troff.man#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/addftinfo/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/addftinfo/addftinfo.cc#2 delete .. //depot/projects/sio/contrib/groff/src/utils/addftinfo/guess.cc#2 delete .. //depot/projects/sio/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/afmtodit/afmtodit.man#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/afmtodit/afmtodit.pl#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/hpftodit/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/hpftodit/hpftodit.cc#2 delete .. //depot/projects/sio/contrib/groff/src/utils/hpftodit/hpftodit.man#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/indxbib/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/indxbib/indxbib.cc#2 delete .. //depot/projects/sio/contrib/groff/src/utils/lkbib/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/lkbib/lkbib.cc#2 delete .. //depot/projects/sio/contrib/groff/src/utils/lookbib/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/lookbib/lookbib.cc#2 delete .. //depot/projects/sio/contrib/groff/src/utils/pfbtops/pfbtops.c#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/pfbtops/pfbtops.man#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/tfmtodit/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#2 delete .. //depot/projects/sio/contrib/groff/src/xditview/ChangeLog#2 integrate .. //depot/projects/sio/contrib/groff/src/xditview/DviChar.c#2 integrate .. //depot/projects/sio/contrib/groff/src/xditview/Imakefile.in#2 integrate .. //depot/projects/sio/contrib/groff/src/xditview/draw.c#2 integrate .. //depot/projects/sio/contrib/groff/tmac/Makefile.sub#2 integrate .. //depot/projects/sio/contrib/groff/tmac/README#2 integrate .. //depot/projects/sio/contrib/groff/tmac/X.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/Xps.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/a4.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/cp1047.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/sio/contrib/groff/tmac/doc-ditroff#2 integrate .. //depot/projects/sio/contrib/groff/tmac/doc-nroff#2 integrate .. //depot/projects/sio/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/dvi.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/ec.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/eqnrc#2 integrate .. //depot/projects/sio/contrib/groff/tmac/groff_man.man#2 integrate .. //depot/projects/sio/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/sio/contrib/groff/tmac/html.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/hyphen.us#2 integrate .. //depot/projects/sio/contrib/groff/tmac/latin1.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/lbp.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/lj4.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/ps.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/pspic.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/troffrc#2 integrate .. //depot/projects/sio/contrib/groff/tmac/troffrc-end#2 integrate .. //depot/projects/sio/contrib/groff/tmac/tty-char.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/tty.tmac#2 integrate .. //depot/projects/sio/contrib/groff/tmac/www.tmac#2 integrate .. //depot/projects/sio/contrib/groff/win32-diffs#2 delete .. //depot/projects/sio/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/sio/crypto/openssh/auth-krb4.c#2 integrate .. //depot/projects/sio/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/sio/crypto/openssh/auth2-pam.c#2 integrate .. //depot/projects/sio/crypto/openssh/authfd.c#2 integrate .. //depot/projects/sio/crypto/openssh/authfile.c#2 integrate .. //depot/projects/sio/crypto/openssh/canohost.c#2 integrate .. //depot/projects/sio/crypto/openssh/channels.c#2 integrate .. //depot/projects/sio/crypto/openssh/channels.h#2 integrate .. //depot/projects/sio/crypto/openssh/cipher.c#2 integrate .. //depot/projects/sio/crypto/openssh/compat.h#2 integrate .. //depot/projects/sio/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/sio/crypto/openssh/key.c#2 integrate .. //depot/projects/sio/crypto/openssh/rijndael.c#2 integrate .. //depot/projects/sio/crypto/openssh/scp.c#2 integrate .. //depot/projects/sio/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/sio/crypto/openssh/session.h#2 integrate .. //depot/projects/sio/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/sio/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/sio/crypto/openssh/ssh.h#2 integrate .. //depot/projects/sio/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/sio/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/sio/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/sio/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/sio/crypto/openssh/sshlogin.h#2 integrate .. //depot/projects/sio/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/sio/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/Makefile.inc#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/font/Makefile.dev#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/font/devdvi/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/font/devps/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/devices/grodvi/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/devices/grolbp/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/devices/grolj4/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/devices/grops/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/devices/grotty/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/include/config.h#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/libs/libbib/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/libs/libdriver/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/libs/libgroff/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/eqn/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/grn/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/pic/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/refer/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/preproc/tbl/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/roff/groff/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/roff/troff/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/utils/indxbib/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/utils/lkbib/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/utils/lookbib/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/tmac/Makefile#2 integrate .. //depot/projects/sio/kerberos5/Makefile.inc#2 integrate .. //depot/projects/sio/lib/Makefile#2 integrate .. //depot/projects/sio/lib/libc/gen/arc4random.3#2 integrate .. //depot/projects/sio/lib/libc/gen/check_utility_compat.c#2 integrate .. //depot/projects/sio/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/sio/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/sio/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/sio/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/sio/lib/libc/include/namespace.h#2 integrate .. //depot/projects/sio/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/sio/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/sio/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/sio/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/sio/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/sio/lib/libc/net/hesiod.c#2 integrate .. //depot/projects/sio/lib/libc/net/if_nametoindex.c#2 integrate .. //depot/projects/sio/lib/libc/nls/msgcat.c#2 integrate .. //depot/projects/sio/lib/libc/rpc/rpc_soc.c#2 integrate .. //depot/projects/sio/lib/libc/stdlib/realpath.c#2 integrate .. //depot/projects/sio/lib/libc/string/strerror.c#2 integrate .. //depot/projects/sio/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/sio/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/sio/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/sio/lib/libfetch/Makefile#2 integrate .. //depot/projects/sio/lib/libpam/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/sio/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/sio/libexec/Makefile#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#2 integrate .. //depot/projects/sio/sbin/dump/Makefile#2 integrate .. //depot/projects/sio/sbin/dump/dump.8#2 integrate .. //depot/projects/sio/sbin/dump/dumprmt.c#2 integrate .. //depot/projects/sio/sbin/dump/main.c#2 integrate .. //depot/projects/sio/sbin/fdisk_pc98/Makefile#2 integrate .. //depot/projects/sio/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/sio/sbin/restore/Makefile#2 integrate .. //depot/projects/sio/sbin/restore/main.c#2 integrate .. //depot/projects/sio/sbin/restore/restore.8#2 integrate .. //depot/projects/sio/sbin/vinum/Makefile#2 integrate .. //depot/projects/sio/sbin/vinum/commands.c#2 integrate .. //depot/projects/sio/sbin/vinum/list.c#2 integrate .. //depot/projects/sio/sbin/vinum/v.c#2 integrate .. //depot/projects/sio/sbin/vinum/vext.h#2 integrate .. //depot/projects/sio/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/sio/share/man/man9/ifnet.9#2 integrate .. //depot/projects/sio/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/sio/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/sio/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/sio/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/sio/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/sio/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/elf_freebsd.c#2 delete .. //depot/projects/sio/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/sio/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/sio/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/sio/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/sio/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/sio/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/sio/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/sio/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/sio/sys/conf/files#3 integrate .. //depot/projects/sio/sys/conf/files.amd64#2 integrate .. //depot/projects/sio/sys/conf/files.pc98#2 integrate .. //depot/projects/sio/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/sio/sys/conf/options.amd64#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/sio/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/sio/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/sio/sys/dev/fb/vga.c#2 integrate .. //depot/projects/sio/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/sio/sys/dev/kbd/atkbdc.c#2 integrate .. //depot/projects/sio/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/sio/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/request.h#2 integrate .. //depot/projects/sio/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/sio/sys/geom/geom.h#2 integrate .. //depot/projects/sio/sys/geom/geom_event.c#2 integrate .. //depot/projects/sio/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/sio/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/sio/sys/geom/geom_subr.c#2 integrate .. //depot/projects/sio/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/sio/sys/i386/include/elf.h#2 integrate .. //depot/projects/sio/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/sio/sys/isa/vga_isa.c#2 integrate .. //depot/projects/sio/sys/kern/init_main.c#2 integrate .. //depot/projects/sio/sys/kern/kern_acct.c#2 integrate .. //depot/projects/sio/sys/kern/kern_exit.c#2 integrate .. //depot/projects/sio/sys/kern/kern_fork.c#2 integrate .. //depot/projects/sio/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/sio/sys/kern/kern_proc.c#2 integrate .. //depot/projects/sio/sys/kern/kern_prot.c#2 integrate .. //depot/projects/sio/sys/kern/kern_synch.c#2 integrate .. //depot/projects/sio/sys/kern/kern_thread.c#2 integrate .. //depot/projects/sio/sys/kern/vfs_default.c#2 integrate .. //depot/projects/sio/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/sio/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/sio/sys/pci/if_dc.c#2 integrate .. //depot/projects/sio/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/sio/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/sio/sys/sparc64/include/metadata.h#2 integrate .. //depot/projects/sio/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/sio/sys/sys/diskpc98.h#2 integrate .. //depot/projects/sio/sys/sys/linker.h#2 integrate .. //depot/projects/sio/sys/sys/proc.h#2 integrate .. //depot/projects/sio/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/sio/sys/vm/vm_object.c#2 integrate .. //depot/projects/sio/tools/tools/tinderbox/tbmaster.pl#2 integrate .. //depot/projects/sio/usr.bin/Makefile#2 integrate .. //depot/projects/sio/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/sio/usr.bin/m4/eval.c#2 integrate .. //depot/projects/sio/usr.sbin/apm/apm.8#2 integrate .. //depot/projects/sio/usr.sbin/fwcontrol/fwcontrol.8#2 integrate Differences ... ==== //depot/projects/sio/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -640,7 +640,7 @@ _strfile= games/fortune/strfile .endif -.if ${BOOTSTRAPPING} < 500042 +.if ${BOOTSTRAPPING} < 500113 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/sio/bin/chflags/chflags.c#2 (text+ko) ==== @@ -31,20 +31,20 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif -#if 0 #ifndef lint static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.17 2003/02/18 19:51:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.18 2003/05/01 14:45:27 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/chio/chio.c#2 (text+ko) ==== @@ -35,13 +35,15 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; #endif /* not lint */ +#endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.25 2002/07/01 10:46:39 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/chmod/chmod.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.28 2003/01/29 21:46:12 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.29 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/cp/cp.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.47 2003/04/13 08:47:30 bde Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); /* * Cp copies source files to target files. ==== //depot/projects/sio/bin/dd/dd.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.39 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/df/df.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ @@ -43,12 +44,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/domainname/domainname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.17 2003/05/01 16:58:55 obrien Exp $"); #include ==== //depot/projects/sio/bin/echo/echo.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.15 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/ed/main.c#2 (text+ko) ==== @@ -27,13 +27,15 @@ */ #ifndef lint +#if 0 static const char copyright[] = "@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\ All rights reserved.\n"; +#endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.25 2002/08/25 13:01:43 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.26 2003/05/01 16:58:55 obrien Exp $"); /* * CREDITS ==== //depot/projects/sio/bin/hostname/hostname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.14 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.15 2003/05/01 16:58:55 obrien Exp $"); #include ==== //depot/projects/sio/bin/kill/kill.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.15 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.16 2003/05/01 16:58:55 obrien Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 15:16:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4420537B405; Thu, 1 May 2003 15:16:19 -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 ED87B37B401 for ; Thu, 1 May 2003 15:16:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5A50143FAF for ; Thu, 1 May 2003 15:16:18 -0700 (PDT) (envelope-from marcel@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 h41MGI0U095955 for ; Thu, 1 May 2003 15:16:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h41MGH1r095952 for perforce@freebsd.org; Thu, 1 May 2003 15:16:17 -0700 (PDT) Date: Thu, 1 May 2003 15:16:17 -0700 (PDT) Message-Id: <200305012216.h41MGH1r095952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30354 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 22:16:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30354 Change 30354 by marcel@marcel_nfs on 2003/05/01 15:15:49 Bah, missed this one in the wholesale sio integ... Affected files ... .. //depot/projects/sio/sys/i386/i386/sio_machdep.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 1 17:27:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4701237B404; Thu, 1 May 2003 17:27:02 -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 E981037B401 for ; Thu, 1 May 2003 17:27:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 081E843F93 for ; Thu, 1 May 2003 17:27:00 -0700 (PDT) (envelope-from marcel@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 h420Qx0U008021 for ; Thu, 1 May 2003 17:26:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h420QtR4008018 for perforce@freebsd.org; Thu, 1 May 2003 17:26:55 -0700 (PDT) Date: Thu, 1 May 2003 17:26:55 -0700 (PDT) Message-Id: <200305020026.h420QtR4008018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30355 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: Fri, 02 May 2003 00:27:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=30355 Change 30355 by marcel@marcel_pluto1 on 2003/05/01 17:26:12 IFC @30352 Affected files ... .. //depot/projects/ia64/Makefile.inc1#58 integrate .. //depot/projects/ia64/bin/chflags/chflags.c#2 integrate .. //depot/projects/ia64/bin/chio/chio.c#5 integrate .. //depot/projects/ia64/bin/chmod/chmod.c#6 integrate .. //depot/projects/ia64/bin/cp/cp.c#13 integrate .. //depot/projects/ia64/bin/dd/dd.c#6 integrate .. //depot/projects/ia64/bin/df/df.c#13 integrate .. //depot/projects/ia64/bin/domainname/domainname.c#4 integrate .. //depot/projects/ia64/bin/echo/echo.c#5 integrate .. //depot/projects/ia64/bin/ed/main.c#6 integrate .. //depot/projects/ia64/bin/hostname/hostname.c#4 integrate .. //depot/projects/ia64/bin/kill/kill.c#5 integrate .. //depot/projects/ia64/bin/ln/ln.c#8 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/ia64/bin/mv/mv.c#7 integrate .. //depot/projects/ia64/bin/pwd/pwd.c#5 integrate .. //depot/projects/ia64/bin/rcp/rcp.c#9 integrate .. //depot/projects/ia64/bin/rm/rm.c#8 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.c#4 integrate .. //depot/projects/ia64/bin/sh/arith.y#3 integrate .. //depot/projects/ia64/bin/sh/arith_lex.l#3 integrate .. //depot/projects/ia64/bin/sh/mknodes.c#4 integrate .. //depot/projects/ia64/bin/sh/mksyntax.c#5 integrate .. //depot/projects/ia64/bin/sleep/sleep.c#5 integrate .. //depot/projects/ia64/bin/stty/stty.c#4 integrate .. //depot/projects/ia64/bin/sync/sync.c#4 integrate .. //depot/projects/ia64/contrib/groff/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/groff/INSTALL#3 integrate .. //depot/projects/ia64/contrib/groff/MANIFEST#2 integrate .. //depot/projects/ia64/contrib/groff/Makefile.ccpg#3 integrate .. //depot/projects/ia64/contrib/groff/Makefile.comm#3 integrate .. //depot/projects/ia64/contrib/groff/Makefile.dev#2 integrate .. //depot/projects/ia64/contrib/groff/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/groff/Makefile.lib#2 integrate .. //depot/projects/ia64/contrib/groff/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/NEWS#3 integrate .. //depot/projects/ia64/contrib/groff/PROBLEMS#3 integrate .. //depot/projects/ia64/contrib/groff/REVISION#3 integrate .. //depot/projects/ia64/contrib/groff/VERSION#3 integrate .. //depot/projects/ia64/contrib/groff/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/groff/configure#3 integrate .. //depot/projects/ia64/contrib/groff/configure.ac#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/README#1 branch .. //depot/projects/ia64/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/groff_mm.man#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/m.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/contrib/mm/mm/4.MT#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/examples/typeset.mom#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/ia64/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-10#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-11#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-4#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-5#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-6#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-7#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-8#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff-9#2 integrate .. //depot/projects/ia64/contrib/groff/doc/groff.texinfo#3 integrate .. //depot/projects/ia64/contrib/groff/doc/pic.ms#3 integrate .. //depot/projects/ia64/contrib/groff/doc/texinfo.tex#3 integrate .. //depot/projects/ia64/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/CBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/HBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/HR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/NB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/NBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/NI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/NR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100-12/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/CBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/HBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/HR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/NB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/NBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/NI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/NR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX100/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/CBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/HBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/HR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/NB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/NBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/NI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/NR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75-12/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/CBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/HBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/HR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/NB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/NBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/NI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/NR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devX75/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devascii/R.proto#3 integrate .. //depot/projects/ia64/contrib/groff/font/devcp1047/R.proto#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/CW#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/CWEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/CWI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/CWIEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/CWITC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/CWTC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/EX#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HBEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HBI#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HBIEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HBITC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HBTC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HIEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HITC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HR#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HREC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/HRTC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/MI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/SC#1 branch .. //depot/projects/ia64/contrib/groff/font/devdvi/TB#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TBEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TBI#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TBIEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TBITC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TBTC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TI#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TIEC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TITC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TR#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TREC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/TRTC#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/Makefile#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/ec.map#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/tc.map#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/texb.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/texex.map#2 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/texi.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/texmi.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/texr.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/texsy.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/textex.map#1 branch .. //depot/projects/ia64/contrib/groff/font/devdvi/generate/textt.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devhtml/DESC.proto#3 integrate .. //depot/projects/ia64/contrib/groff/font/devhtml/R.proto#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlatin1/R.proto#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/EB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/EI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/ER#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HNB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HNBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HNI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HNR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/HR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlbp/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/ALBB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/ALBR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AOB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AOI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/AOR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CLARENDON#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CORONET#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/GR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/LGB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/LGI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/LGR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/MARIGOLD#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/OR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UCR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/UR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/ia64/contrib/groff/font/devlj4/generate/text.map#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/AB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/ABI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/AI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/AR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/BMB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/BMBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/BMI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/BMR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/CB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/CBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/CI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/CR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/EURO#1 branch .. //depot/projects/ia64/contrib/groff/font/devps/HB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HNR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/HR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/NR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/PR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/S#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TB#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TBI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/TR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/ZCMI#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/ZD#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/ZDR#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/download#2 integrate .. //depot/projects/ia64/contrib/groff/font/devps/freeeuro.afm#1 branch .. //depot/projects/ia64/contrib/groff/font/devps/freeeuro.pfa#1 branch .. //depot/projects/ia64/contrib/groff/font/devps/generate/Makefile#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/generate/freeeuro.sfd#1 branch .. //depot/projects/ia64/contrib/groff/font/devps/generate/sfdtopfa.pe#1 branch .. //depot/projects/ia64/contrib/groff/font/devps/generate/symbolchars#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/generate/textmap#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/prologue.ps#3 integrate .. //depot/projects/ia64/contrib/groff/font/devps/symbolmap#3 integrate .. //depot/projects/ia64/contrib/groff/font/devutf8/NOTES#3 integrate .. //depot/projects/ia64/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/ia64/contrib/groff/man/groff.man#3 integrate .. //depot/projects/ia64/contrib/groff/man/groff_char.man#3 integrate .. //depot/projects/ia64/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/ia64/contrib/groff/man/groff_font.man#3 integrate .. //depot/projects/ia64/contrib/groff/man/groff_out.man#4 integrate .. //depot/projects/ia64/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/ia64/contrib/groff/man/roff.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grodvi/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grodvi/dvi.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grodvi/dvi.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grodvi/grodvi.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-table.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-table.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-text.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-text.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/html-text.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/output.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/output.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/post-html.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grohtml/post-html.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/charset.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/lbp.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/lbp.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grolbp/lbp.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/lj4.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grolj4/lj4.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grops/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/TODO#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/grops.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/ps.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grops/ps.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grops/ps.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grops/psrm.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/devices/grops/psrm.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/devices/grotty/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/devices/grotty/tty.cc#4 delete .. //depot/projects/ia64/contrib/groff/src/devices/grotty/tty.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/driver.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/include/html-strings.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/lib.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/nonposix.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/printer.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libbib/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libbib/common.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libbib/common.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libbib/index.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libbib/index.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libbib/linear.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libbib/linear.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libbib/search.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libbib/search.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/input.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/input.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/printer.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libdriver/printer.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/assert.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/assert.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/change_lf.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/change_lf.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/cmap.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/cmap.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/color.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/color.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/cset.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/cset.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/device.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/device.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/errarg.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/errarg.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/error.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/error.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fatal.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fatal.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/filename.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/filename.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/font.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/font.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fontfile.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/fontfile.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/geometry.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/geometry.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/htmlhint.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/htmlhint.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/invalid.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/invalid.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/lf.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/lf.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/lineno.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/lineno.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/macropath.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/macropath.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/maxfilename.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/maxfilename.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/mksdir.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/mksdir.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/mkstemp.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/mkstemp.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/nametoindex.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/nametoindex.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/new.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/new.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/paper.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/paper.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/prime.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/prime.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/progname.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/progname.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/ptable.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/ptable.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/searchpath.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/searchpath.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strcasecmp.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/string.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/string.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strncasecmp.c#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strsave.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/strsave.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/tmpfile.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/tmpfile.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/tmpname.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/tmpname.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/box.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/box.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/delim.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/delim.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/lex.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/lex.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/limit.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/limit.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/list.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/list.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/main.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/main.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/mark.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/mark.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/other.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/other.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/over.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/over.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/pile.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/pile.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/script.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/script.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/special.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/special.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/sqrt.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/sqrt.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/text.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/eqn/text.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/grn/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/README#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hdb.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hdb.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hgraph.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hgraph.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hpoint.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/grn/hpoint.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/grn/main.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/grn/main.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/html/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/html/pre-html.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/html/pre-html.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/html/pushback.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/html/pushback.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/common.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/pic/common.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/pic/lex.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/pic/lex.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/pic/main.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/pic/main.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/pic/object.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/pic/object.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/pic/pic.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/pic.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/pic.y#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/pic/tex.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/pic/tex.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/pic/troff.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/pic/troff.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/refer/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/command.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/refer/command.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/refer/ref.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/refer/ref.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/refer/refer.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/refer/refer.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/refer/token.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/refer/token.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/soelim.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/soelim.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/main.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/main.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/table.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/table.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/preproc/tbl/tbl.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/groff.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/groff/groff.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/groff/groff.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/groff/pipeline.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/grog/grog.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/nroff/nroff.sh#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/charinfo.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/column.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/column.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/dictionary.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/dictionary.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/div.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/div.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/div.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/env.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/env.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/glyphuni.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/input.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/input.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/node.cc#4 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/node.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/node.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/number.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/number.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/reg.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/reg.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/symbol.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/roff/troff/symbol.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/token.h#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/troff.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/roff/troff/unicode.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/unicode.h#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/uniglyph.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/roff/troff/uniuni.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/addftinfo.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/addftinfo.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/guess.cc#2 delete .. //depot/projects/ia64/contrib/groff/src/utils/addftinfo/guess.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/afmtodit/afmtodit.man#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/afmtodit/afmtodit.pl#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/hpftodit.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/hpftodit.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/hpftodit/hpftodit.man#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/indxbib/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/indxbib/indxbib.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/utils/indxbib/indxbib.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/lkbib/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/lkbib/lkbib.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/utils/lkbib/lkbib.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/lookbib/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/lookbib/lookbib.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/utils/lookbib/lookbib.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/utils/pfbtops/pfbtops.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/pfbtops/pfbtops.man#2 integrate .. //depot/projects/ia64/contrib/groff/src/utils/tfmtodit/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#3 delete .. //depot/projects/ia64/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#1 branch .. //depot/projects/ia64/contrib/groff/src/xditview/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/groff/src/xditview/DviChar.c#3 integrate .. //depot/projects/ia64/contrib/groff/src/xditview/Imakefile.in#3 integrate .. //depot/projects/ia64/contrib/groff/src/xditview/draw.c#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/Makefile.sub#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/README#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/X.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/Xps.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/a4.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/an-old.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/composite.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/cp1047.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#9 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-ditroff#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-nroff#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/dvi.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/ec.tmac#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/eqnrc#2 integrate .. //depot/projects/ia64/contrib/groff/tmac/europs.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/groff_man.man#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#6 integrate .. //depot/projects/ia64/contrib/groff/tmac/html-end.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/html.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/hyphen.us#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/hyphenex.pl#1 branch .. //depot/projects/ia64/contrib/groff/tmac/hyphenex.us#1 branch .. //depot/projects/ia64/contrib/groff/tmac/latin1.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/latin2.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/latin9.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/lbp.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/lj4.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/papersize.tmac#1 branch .. //depot/projects/ia64/contrib/groff/tmac/ps.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/pspic.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/troffrc#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/troffrc-end#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/tmac/www.tmac#3 integrate .. //depot/projects/ia64/contrib/groff/win32-diffs#3 delete .. //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#11 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb4.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pam.c#7 integrate .. //depot/projects/ia64/crypto/openssh/authfd.c#7 integrate .. //depot/projects/ia64/crypto/openssh/authfile.c#7 integrate .. //depot/projects/ia64/crypto/openssh/canohost.c#6 integrate .. //depot/projects/ia64/crypto/openssh/channels.c#8 integrate .. //depot/projects/ia64/crypto/openssh/channels.h#6 integrate .. //depot/projects/ia64/crypto/openssh/cipher.c#7 integrate .. //depot/projects/ia64/crypto/openssh/compat.h#6 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.c#5 integrate .. //depot/projects/ia64/crypto/openssh/key.c#7 integrate .. //depot/projects/ia64/crypto/openssh/rijndael.c#5 integrate .. //depot/projects/ia64/crypto/openssh/scp.c#6 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#7 integrate .. //depot/projects/ia64/crypto/openssh/session.h#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.c#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh.h#6 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#7 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect1.c#5 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect2.c#8 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.c#7 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.h#6 integrate .. //depot/projects/ia64/crypto/openssh/sshpty.c#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#15 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/Makefile.inc#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devdvi/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/devps/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grodvi/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolbp/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grops/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grotty/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/libs/libbib/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/libs/libdriver/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/libs/libgroff/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/eqn/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/grn/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/html/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/pic/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/refer/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/soelim/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/tbl/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/roff/groff/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/roff/troff/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lkbib/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lookbib/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/Makefile#23 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/alloca.S#1 branch .. //depot/projects/ia64/lib/libc/gen/arc4random.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/check_utility_compat.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/confstr.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/fmtmsg.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#10 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#12 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#11 integrate .. //depot/projects/ia64/lib/libc/include/un-namespace.h#9 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.c#6 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#12 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#8 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.c#6 integrate .. //depot/projects/ia64/lib/libc/net/hesiod.c#5 integrate .. //depot/projects/ia64/lib/libc/net/if_nametoindex.c#5 integrate .. //depot/projects/ia64/lib/libc/nls/msgcat.c#6 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_soc.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/realpath.c#7 integrate .. //depot/projects/ia64/lib/libc/string/strerror.c#10 integrate .. //depot/projects/ia64/lib/libc/string/strlcat.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strlcpy.c#5 integrate .. //depot/projects/ia64/lib/libc/yp/yplib.c#6 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#13 integrate .. //depot/projects/ia64/lib/libpam/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libpam/libpam/Makefile#18 integrate .. //depot/projects/ia64/lib/libpam/libpam/security/pam_mod_misc.h#3 integrate .. //depot/projects/ia64/libexec/Makefile#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#46 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#85 integrate .. //depot/projects/ia64/sbin/dump/Makefile#7 integrate .. //depot/projects/ia64/sbin/dump/dump.8#15 integrate .. //depot/projects/ia64/sbin/dump/dumprmt.c#5 integrate .. //depot/projects/ia64/sbin/dump/main.c#17 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/Makefile#3 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#9 integrate .. //depot/projects/ia64/sbin/restore/Makefile#4 integrate .. //depot/projects/ia64/sbin/restore/main.c#7 integrate .. //depot/projects/ia64/sbin/restore/restore.8#8 integrate .. //depot/projects/ia64/sbin/vinum/Makefile#3 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#35 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#7 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#12 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/ia64/sys/conf/files#76 integrate .. //depot/projects/ia64/sys/conf/files.pc98#30 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#10 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbxface.c#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#11 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#31 integrate .. //depot/projects/ia64/sys/dev/ppbus/vpo.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/request.h#2 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#11 integrate .. //depot/projects/ia64/sys/geom/geom.h#28 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#19 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/ia64/sys/geom/geom_subr.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#21 integrate .. //depot/projects/ia64/sys/kern/init_main.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#43 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#37 integrate .. //depot/projects/ia64/sys/kern/kern_kthread.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#44 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#14 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#33 integrate .. //depot/projects/ia64/sys/sys/diskpc98.h#5 integrate .. //depot/projects/ia64/sys/sys/proc.h#62 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#33 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#5 integrate .. //depot/projects/ia64/usr.bin/Makefile#44 integrate .. //depot/projects/ia64/usr.bin/fetch/Makefile#6 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.8#6 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#5 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#58 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -640,7 +640,7 @@ _strfile= games/fortune/strfile .endif -.if ${BOOTSTRAPPING} < 500042 +.if ${BOOTSTRAPPING} < 500113 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/ia64/bin/chflags/chflags.c#2 (text+ko) ==== @@ -31,20 +31,20 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif -#if 0 #ifndef lint static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.17 2003/02/18 19:51:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.18 2003/05/01 14:45:27 obrien Exp $"); #include #include ==== //depot/projects/ia64/bin/chio/chio.c#5 (text+ko) ==== @@ -35,13 +35,15 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; #endif /* not lint */ +#endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.25 2002/07/01 10:46:39 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/ia64/bin/chmod/chmod.c#6 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.28 2003/01/29 21:46:12 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.29 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/ia64/bin/cp/cp.c#13 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.47 2003/04/13 08:47:30 bde Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); /* * Cp copies source files to target files. ==== //depot/projects/ia64/bin/dd/dd.c#6 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.39 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/ia64/bin/df/df.c#13 (text+ko) ==== @@ -36,6 +36,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ @@ -43,12 +44,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/ia64/bin/domainname/domainname.c#4 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.17 2003/05/01 16:58:55 obrien Exp $"); #include ==== //depot/projects/ia64/bin/echo/echo.c#5 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 17:41:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D149C37B404; Thu, 1 May 2003 17:41:26 -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 5D8A537B401 for ; Thu, 1 May 2003 17:41:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 173F343FBD for ; Thu, 1 May 2003 17:41:24 -0700 (PDT) (envelope-from marcel@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 h420fN0U013849 for ; Thu, 1 May 2003 17:41:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h420fJoq013845 for perforce@freebsd.org; Thu, 1 May 2003 17:41:19 -0700 (PDT) Date: Thu, 1 May 2003 17:41:19 -0700 (PDT) Message-Id: <200305020041.h420fJoq013845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30358 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: Fri, 02 May 2003 00:41:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=30358 Change 30358 by marcel@marcel_pluto1 on 2003/05/01 17:40:31 IFia64 Affected files ... .. //depot/projects/ia64_epc/Makefile.inc1#12 integrate .. //depot/projects/ia64_epc/bin/chflags/chflags.c#2 integrate .. //depot/projects/ia64_epc/bin/chio/chio.c#2 integrate .. //depot/projects/ia64_epc/bin/chmod/chmod.c#2 integrate .. //depot/projects/ia64_epc/bin/cp/cp.c#4 integrate .. //depot/projects/ia64_epc/bin/dd/dd.c#3 integrate .. //depot/projects/ia64_epc/bin/df/df.c#2 integrate .. //depot/projects/ia64_epc/bin/domainname/domainname.c#2 integrate .. //depot/projects/ia64_epc/bin/echo/echo.c#2 integrate .. //depot/projects/ia64_epc/bin/ed/main.c#2 integrate .. //depot/projects/ia64_epc/bin/hostname/hostname.c#2 integrate .. //depot/projects/ia64_epc/bin/kill/kill.c#2 integrate .. //depot/projects/ia64_epc/bin/ln/ln.c#2 integrate .. //depot/projects/ia64_epc/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/ia64_epc/bin/mv/mv.c#2 integrate .. //depot/projects/ia64_epc/bin/pwd/pwd.c#2 integrate .. //depot/projects/ia64_epc/bin/rcp/rcp.c#2 integrate .. //depot/projects/ia64_epc/bin/rm/rm.c#2 integrate .. //depot/projects/ia64_epc/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/ia64_epc/bin/sh/arith.y#2 integrate .. //depot/projects/ia64_epc/bin/sh/arith_lex.l#2 integrate .. //depot/projects/ia64_epc/bin/sh/mknodes.c#2 integrate .. //depot/projects/ia64_epc/bin/sh/mksyntax.c#2 integrate .. //depot/projects/ia64_epc/bin/sleep/sleep.c#2 integrate .. //depot/projects/ia64_epc/bin/stty/stty.c#2 integrate .. //depot/projects/ia64_epc/bin/sync/sync.c#2 integrate .. //depot/projects/ia64_epc/contrib/groff/ChangeLog#2 integrate .. //depot/projects/ia64_epc/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64_epc/contrib/groff/INSTALL#2 integrate .. //depot/projects/ia64_epc/contrib/groff/MANIFEST#2 integrate .. //depot/projects/ia64_epc/contrib/groff/Makefile.ccpg#2 integrate .. //depot/projects/ia64_epc/contrib/groff/Makefile.comm#2 integrate .. //depot/projects/ia64_epc/contrib/groff/Makefile.dev#2 integrate .. //depot/projects/ia64_epc/contrib/groff/Makefile.in#2 integrate .. //depot/projects/ia64_epc/contrib/groff/Makefile.lib#2 integrate .. //depot/projects/ia64_epc/contrib/groff/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/NEWS#2 integrate .. //depot/projects/ia64_epc/contrib/groff/PROBLEMS#2 integrate .. //depot/projects/ia64_epc/contrib/groff/REVISION#2 integrate .. //depot/projects/ia64_epc/contrib/groff/VERSION#2 integrate .. //depot/projects/ia64_epc/contrib/groff/aclocal.m4#2 integrate .. //depot/projects/ia64_epc/contrib/groff/configure#2 integrate .. //depot/projects/ia64_epc/contrib/groff/configure.ac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/groffer/README#1 branch .. //depot/projects/ia64_epc/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mm/ChangeLog#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mm/groff_mm.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mm/m.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mm/mm/4.MT#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/examples/typeset.mom#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-10#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-11#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-4#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-5#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-6#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-7#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-8#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff-9#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/groff.texinfo#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/pic.ms#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/texinfo.tex#2 integrate .. //depot/projects/ia64_epc/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/CBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/NB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/NBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/NI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/NR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100-12/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/CBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/NB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/NBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/NI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/NR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX100/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/CBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/NB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/NBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/NI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/NR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75-12/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/CBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/NB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/NBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/NI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/NR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devX75/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devascii/R.proto#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devcp1047/R.proto#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/CW#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/CWEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/CWI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/CWIEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/CWITC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/CWTC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/EX#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HBEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HBIEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HBITC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HBTC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HIEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HITC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HREC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/HRTC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/MI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/SC#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TBEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TBIEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TBITC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TBTC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TIEC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TITC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TREC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/TRTC#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/Makefile#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/ec.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/tc.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/texb.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/texex.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/texi.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/texmi.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/texr.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/texsy.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/textex.map#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devdvi/generate/textt.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devhtml/DESC.proto#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devhtml/R.proto#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlatin1/R.proto#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/EB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/EI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/ER#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HNB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HNBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HNI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HNR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlbp/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/ALBB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/ALBR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/AOB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/AOI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/AOR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/CBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/CLARENDON#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/CORONET#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/GB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/GBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/GI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/GR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/LGB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/LGI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/LGR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/MARIGOLD#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/OB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/OBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/OI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/OR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UCB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UCBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UCI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UCR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/UR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devlj4/generate/text.map#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/AB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/ABI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/AI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/AR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/BMB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/BMBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/BMI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/BMR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/CB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/CBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/CI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/CR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/EURO#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devps/HB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HNB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HNBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HNI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HNR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/HR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/NB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/NBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/NI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/NR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/PB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/PBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/PI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/PR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/S#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/TB#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/TBI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/TI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/TR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/ZCMI#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/ZD#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/ZDR#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/download#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/freeeuro.afm#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devps/freeeuro.pfa#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devps/generate/Makefile#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/generate/freeeuro.sfd#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devps/generate/sfdtopfa.pe#1 branch .. //depot/projects/ia64_epc/contrib/groff/font/devps/generate/symbolchars#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/generate/textmap#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/prologue.ps#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devps/symbolmap#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devutf8/NOTES#2 integrate .. //depot/projects/ia64_epc/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/ia64_epc/contrib/groff/man/groff.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/man/groff_char.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/man/groff_font.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/man/groff_out.man#3 integrate .. //depot/projects/ia64_epc/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/man/roff.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grodvi/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grodvi/dvi.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grodvi/dvi.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grodvi/grodvi.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/html-table.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/html-table.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/html-text.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/html-text.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/html-text.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/output.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/output.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/post-html.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grohtml/post-html.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolbp/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolbp/charset.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolbp/lbp.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolbp/lbp.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolbp/lbp.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolj4/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolj4/lj4.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grolj4/lj4.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/TODO#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/grops.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/ps.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/ps.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/ps.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/psrm.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grops/psrm.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/devices/grotty/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/devices/grotty/tty.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/devices/grotty/tty.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/driver.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/html-strings.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/lib.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/nonposix.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/printer.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/common.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/common.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/index.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/index.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/linear.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/linear.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/search.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libbib/search.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libdriver/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/libs/libdriver/input.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libdriver/input.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libdriver/printer.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libdriver/printer.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/assert.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/assert.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/change_lf.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/change_lf.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/cmap.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/cmap.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/color.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/color.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/cset.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/cset.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/device.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/device.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/errarg.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/errarg.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/error.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/error.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/fatal.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/fatal.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/filename.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/filename.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/font.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/font.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/fontfile.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/fontfile.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/geometry.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/geometry.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/htmlhint.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/htmlhint.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/invalid.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/invalid.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/lf.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/lf.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/lineno.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/lineno.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/macropath.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/macropath.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/maxfilename.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/maxfilename.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/mksdir.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/mksdir.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/mkstemp.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/mkstemp.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/nametoindex.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/nametoindex.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/new.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/new.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/paper.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/paper.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/prime.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/prime.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/progname.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/progname.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/ptable.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/ptable.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/searchpath.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/searchpath.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/strcasecmp.c#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/string.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/string.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/strncasecmp.c#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/strsave.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/strsave.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/tmpfile.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/tmpfile.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/tmpname.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/libs/libgroff/tmpname.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/box.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/box.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/delim.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/delim.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/lex.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/lex.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/limit.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/limit.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/list.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/list.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/main.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/main.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/mark.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/mark.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/other.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/other.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/over.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/over.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/pile.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/pile.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/script.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/script.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/special.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/special.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/sqrt.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/sqrt.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/text.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/eqn/text.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/README#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/hdb.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/hdb.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/hgraph.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/hgraph.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/hpoint.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/hpoint.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/main.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/grn/main.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/html/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/html/pre-html.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/html/pre-html.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/html/pushback.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/html/pushback.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/common.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/common.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/lex.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/lex.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/main.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/main.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/object.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/object.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/pic.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/pic.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/pic.y#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/tex.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/tex.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/troff.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/pic/troff.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/command.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/command.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/ref.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/ref.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/refer.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/refer.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/token.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/refer/token.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/soelim/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/soelim/soelim.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/soelim/soelim.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/tbl/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/preproc/tbl/main.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/tbl/main.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/tbl/table.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/preproc/tbl/table.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/preproc/tbl/tbl.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/groff/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/groff/groff.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/groff/groff.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/groff/groff.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/groff/pipeline.c#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/grog/grog.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/nroff/nroff.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/nroff/nroff.sh#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/charinfo.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/column.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/column.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/dictionary.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/dictionary.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/div.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/div.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/div.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/env.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/env.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/glyphuni.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/input.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/input.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/node.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/node.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/node.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/number.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/number.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/reg.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/reg.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/symbol.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/symbol.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/token.h#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/troff.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/unicode.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/unicode.h#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/uniglyph.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/roff/troff/uniuni.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/addftinfo/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/addftinfo/addftinfo.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/addftinfo/addftinfo.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/addftinfo/guess.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/addftinfo/guess.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/afmtodit/afmtodit.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/afmtodit/afmtodit.pl#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/hpftodit/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/hpftodit/hpftodit.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/hpftodit/hpftodit.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/hpftodit/hpftodit.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/indxbib/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/indxbib/indxbib.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/indxbib/indxbib.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/lkbib/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/lkbib/lkbib.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/lkbib/lkbib.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/lookbib/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/lookbib/lookbib.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/lookbib/lookbib.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/utils/pfbtops/pfbtops.c#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/pfbtops/pfbtops.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/tfmtodit/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#2 delete .. //depot/projects/ia64_epc/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#1 branch .. //depot/projects/ia64_epc/contrib/groff/src/xditview/ChangeLog#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/xditview/DviChar.c#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/xditview/Imakefile.in#2 integrate .. //depot/projects/ia64_epc/contrib/groff/src/xditview/draw.c#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/Makefile.sub#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/README#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/X.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/Xps.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/a4.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/composite.tmac#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/cp1047.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/doc-ditroff#3 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/doc-nroff#3 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/dvi.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/ec.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/eqnrc#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/europs.tmac#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/groff_man.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/html-end.tmac#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/html.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/hyphen.us#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/hyphenex.pl#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/hyphenex.us#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/latin1.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/latin2.tmac#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/latin9.tmac#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/lbp.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/lj4.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/papersize.tmac#1 branch .. //depot/projects/ia64_epc/contrib/groff/tmac/ps.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/pspic.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/troffrc#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/troffrc-end#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/tty-char.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/tty.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/www.tmac#2 integrate .. //depot/projects/ia64_epc/contrib/groff/win32-diffs#2 delete .. //depot/projects/ia64_epc/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth-krb4.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/auth2-pam.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/authfd.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/authfile.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/canohost.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/channels.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/channels.h#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/cipher.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/compat.h#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/key.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/rijndael.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/scp.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/serverloop.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/session.h#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/ssh-add.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/ssh-keyscan.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/ssh.h#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/ia64_epc/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/sshlogin.h#2 integrate .. //depot/projects/ia64_epc/crypto/openssh/sshpty.c#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/font/Makefile.dev#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/font/devdvi/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/font/devps/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/devices/grodvi/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/devices/grolbp/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/devices/grolj4/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/devices/grops/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/devices/grotty/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/include/config.h#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/libs/libbib/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/libs/libdriver/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/libs/libgroff/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/eqn/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/grn/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/pic/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/refer/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/preproc/tbl/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/roff/groff/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/roff/troff/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/utils/indxbib/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/utils/lkbib/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/utils/lookbib/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/tmac/Makefile#2 integrate .. //depot/projects/ia64_epc/kerberos5/Makefile.inc#3 integrate .. //depot/projects/ia64_epc/lib/Makefile#6 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/gen/alloca.S#1 branch .. //depot/projects/ia64_epc/lib/libc/gen/arc4random.3#2 integrate .. //depot/projects/ia64_epc/lib/libc/gen/check_utility_compat.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/gen/confstr.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/gen/fmtmsg.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/gen/getgrent.c#8 integrate .. //depot/projects/ia64_epc/lib/libc/gen/getpwent.c#8 integrate .. //depot/projects/ia64_epc/lib/libc/include/namespace.h#5 integrate .. //depot/projects/ia64_epc/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/ia64_epc/lib/libc/locale/setlocale.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/ia64_epc/lib/libc/net/gethostbydns.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/net/hesiod.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/net/if_nametoindex.c#4 integrate .. //depot/projects/ia64_epc/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/stdlib/realpath.c#5 integrate .. //depot/projects/ia64_epc/lib/libc/string/strerror.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/string/strlcat.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/string/strlcpy.c#3 integrate .. //depot/projects/ia64_epc/lib/libc/yp/yplib.c#3 integrate .. //depot/projects/ia64_epc/lib/libfetch/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/libpam/Makefile.inc#3 integrate .. //depot/projects/ia64_epc/lib/libpam/libpam/Makefile#3 integrate .. //depot/projects/ia64_epc/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate .. //depot/projects/ia64_epc/libexec/Makefile#4 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate .. //depot/projects/ia64_epc/sbin/dump/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/dump/dump.8#3 integrate .. //depot/projects/ia64_epc/sbin/dump/dumprmt.c#2 integrate .. //depot/projects/ia64_epc/sbin/dump/main.c#4 integrate .. //depot/projects/ia64_epc/sbin/fdisk_pc98/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/ia64_epc/sbin/restore/Makefile#2 integrate .. //depot/projects/ia64_epc/sbin/restore/main.c#2 integrate .. //depot/projects/ia64_epc/sbin/restore/restore.8#2 integrate .. //depot/projects/ia64_epc/sbin/vinum/Makefile#2 integrate .. //depot/projects/ia64_epc/share/man/man5/rc.conf.5#11 integrate .. //depot/projects/ia64_epc/share/man/man9/ifnet.9#3 integrate .. //depot/projects/ia64_epc/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/ia64_epc/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/ia64_epc/sys/conf/files#13 integrate .. //depot/projects/ia64_epc/sys/conf/files.pc98#8 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwsleep.c#3 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/request.h#2 integrate .. //depot/projects/ia64_epc/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/ia64_epc/sys/geom/geom.h#8 integrate .. //depot/projects/ia64_epc/sys/geom/geom_event.c#9 integrate .. //depot/projects/ia64_epc/sys/geom/geom_pc98.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/ia64_epc/sys/geom/geom_subr.c#8 integrate .. //depot/projects/ia64_epc/sys/geom/geom_sunlabel.c#8 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/swtch.s#4 branch .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#14 delete .. //depot/projects/ia64_epc/sys/ia64/include/_regset.h#8 delete .. //depot/projects/ia64_epc/sys/kern/init_main.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_acct.c#5 integrate .. //depot/projects/ia64_epc/sys/kern/kern_exit.c#9 integrate .. //depot/projects/ia64_epc/sys/kern/kern_fork.c#9 integrate .. //depot/projects/ia64_epc/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_proc.c#8 integrate .. //depot/projects/ia64_epc/sys/kern/kern_prot.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#11 integrate .. //depot/projects/ia64_epc/sys/kern/kern_thread.c#17 integrate .. //depot/projects/ia64_epc/sys/nfsclient/nfs_lock.c#5 integrate .. //depot/projects/ia64_epc/sys/pci/if_dc.c#8 integrate .. //depot/projects/ia64_epc/sys/sys/diskpc98.h#2 integrate .. //depot/projects/ia64_epc/sys/sys/proc.h#14 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/ia64_epc/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/ia64_epc/usr.bin/Makefile#6 integrate .. //depot/projects/ia64_epc/usr.bin/fetch/Makefile#2 integrate .. //depot/projects/ia64_epc/usr.sbin/apm/apm.8#2 integrate .. //depot/projects/ia64_epc/usr.sbin/fwcontrol/fwcontrol.8#2 integrate Differences ... ==== //depot/projects/ia64_epc/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -640,7 +640,7 @@ _strfile= games/fortune/strfile .endif -.if ${BOOTSTRAPPING} < 500042 +.if ${BOOTSTRAPPING} < 500113 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/ia64_epc/bin/chflags/chflags.c#2 (text+ko) ==== @@ -31,20 +31,20 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif -#if 0 #ifndef lint static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.17 2003/02/18 19:51:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.18 2003/05/01 14:45:27 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/bin/chio/chio.c#2 (text+ko) ==== @@ -35,13 +35,15 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; #endif /* not lint */ +#endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.25 2002/07/01 10:46:39 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/bin/chmod/chmod.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.28 2003/01/29 21:46:12 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.29 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/bin/cp/cp.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.47 2003/04/13 08:47:30 bde Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); /* * Cp copies source files to target files. ==== //depot/projects/ia64_epc/bin/dd/dd.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.39 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/bin/df/df.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ @@ -43,12 +44,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/bin/domainname/domainname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.17 2003/05/01 16:58:55 obrien Exp $"); #include ==== //depot/projects/ia64_epc/bin/echo/echo.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 1 17:43:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC7B37B404; Thu, 1 May 2003 17:43:28 -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 F14D937B401 for ; Thu, 1 May 2003 17:43:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E4BC43FDF for ; Thu, 1 May 2003 17:43:27 -0700 (PDT) (envelope-from marcel@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 h420hQ0U013962 for ; Thu, 1 May 2003 17:43:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h420hQZe013959 for perforce@freebsd.org; Thu, 1 May 2003 17:43:26 -0700 (PDT) Date: Thu, 1 May 2003 17:43:26 -0700 (PDT) Message-Id: <200305020043.h420hQZe013959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30359 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: Fri, 02 May 2003 00:43:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30359 Change 30359 by marcel@marcel_pluto1 on 2003/05/01 17:42:45 Re-add files removed by previous merge. Version history should be preserved, although they are not branched anymore. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#15 add .. //depot/projects/ia64_epc/sys/ia64/include/_regset.h#9 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 1 19:30:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A88CF37B404; Thu, 1 May 2003 19:30:44 -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 5B1F537B401 for ; Thu, 1 May 2003 19:30:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23E7E43FAF for ; Thu, 1 May 2003 19:30:43 -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 h422Uh0U021733 for ; Thu, 1 May 2003 19:30:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h422Uf5C021721 for perforce@freebsd.org; Thu, 1 May 2003 19:30:41 -0700 (PDT) Date: Thu, 1 May 2003 19:30:41 -0700 (PDT) Message-Id: <200305020230.h422Uf5C021721@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 30365 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: Fri, 02 May 2003 02:30:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=30365 Change 30365 by peter@peter_daintree on 2003/05/01 19:30:21 IFC @30363 Affected files ... .. //depot/projects/hammer/Makefile.inc1#13 integrate .. //depot/projects/hammer/bin/chio/chio.c#2 integrate .. //depot/projects/hammer/bin/chmod/chmod.c#3 integrate .. //depot/projects/hammer/bin/cp/cp.c#7 integrate .. //depot/projects/hammer/bin/dd/dd.c#3 integrate .. //depot/projects/hammer/bin/df/df.c#5 integrate .. //depot/projects/hammer/bin/domainname/domainname.c#2 integrate .. //depot/projects/hammer/bin/echo/echo.c#3 integrate .. //depot/projects/hammer/bin/ed/main.c#3 integrate .. //depot/projects/hammer/bin/hostname/hostname.c#2 integrate .. //depot/projects/hammer/bin/kill/kill.c#2 integrate .. //depot/projects/hammer/bin/ln/ln.c#2 integrate .. //depot/projects/hammer/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/hammer/bin/mv/mv.c#2 integrate .. //depot/projects/hammer/bin/pax/cpio.c#4 integrate .. //depot/projects/hammer/bin/pax/options.c#4 integrate .. //depot/projects/hammer/bin/pax/pax.c#3 integrate .. //depot/projects/hammer/bin/pax/tar.c#3 integrate .. //depot/projects/hammer/bin/ps/Makefile#3 integrate .. //depot/projects/hammer/bin/pwd/pwd.c#2 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#3 integrate .. //depot/projects/hammer/bin/rm/rm.c#3 integrate .. //depot/projects/hammer/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/hammer/bin/sh/arith.y#2 integrate .. //depot/projects/hammer/bin/sh/arith_lex.l#2 integrate .. //depot/projects/hammer/bin/sh/mknodes.c#2 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#3 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#3 integrate .. //depot/projects/hammer/bin/stty/stty.c#2 integrate .. //depot/projects/hammer/bin/sync/sync.c#2 integrate .. //depot/projects/hammer/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/hammer/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/hammer/contrib/texinfo/COPYING#2 integrate .. //depot/projects/hammer/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/hammer/contrib/texinfo/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/texinfo/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/texinfo/INSTALL#2 integrate .. //depot/projects/hammer/contrib/texinfo/INTRODUCTION#2 integrate .. //depot/projects/hammer/contrib/texinfo/NEWS#2 integrate .. //depot/projects/hammer/contrib/texinfo/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/TODO#2 integrate .. //depot/projects/hammer/contrib/texinfo/config.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/config.h.in#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/help2man#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info-stnd.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/info.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/install-info.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/makeinfo.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texindex.1#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/texinfo.txi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/doc/version.texi#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/doc.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/doc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/echo-area.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/filesys.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/funs.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/info.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infodoc.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infomap.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/infomap.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/m-x.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/man.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodes.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/session.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/session.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/termdep.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/terminal.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/terminal.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/variables.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/window.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/getopt1.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/system.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/hammer/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/lib/xstrdup.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/cmds.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/defun.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/hammer/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/hammer/contrib/texinfo/makeinfo/files.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/files.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/footnote.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/html.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/html.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/index.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/insertion.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/insertion.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/lang.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/lang.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/macro.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/makeinfo.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/makeinfo.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/multi.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/node.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/node.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/sectioning.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/toc.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/toc.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/hammer/contrib/texinfo/util/README#2 integrate .. //depot/projects/hammer/contrib/texinfo/util/install-info.c#2 integrate .. //depot/projects/hammer/contrib/texinfo/util/texindex.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/man/catman/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/catman/catman.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/catman/catman.perl#2 delete .. //depot/projects/hammer/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/Makefile#11 integrate .. //depot/projects/hammer/lib/libc/gen/arc4random.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/check_utility_compat.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/fmtmsg.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/getpwent.c#6 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#7 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#6 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.c#3 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#9 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/hammer/lib/libc/net/hesiod.c#4 integrate .. //depot/projects/hammer/lib/libc/net/if_nametoindex.c#4 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#5 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/realpath.c#5 integrate .. //depot/projects/hammer/lib/libc/string/strerror.c#4 integrate .. //depot/projects/hammer/lib/libc/string/strlcat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/strlcpy.c#3 integrate .. //depot/projects/hammer/lib/libc/yp/yplib.c#3 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#5 integrate .. //depot/projects/hammer/libexec/Makefile#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#14 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/hammer/sbin/dump/Makefile#4 integrate .. //depot/projects/hammer/sbin/dump/dump.8#4 integrate .. //depot/projects/hammer/sbin/dump/dumprmt.c#3 integrate .. //depot/projects/hammer/sbin/dump/main.c#7 integrate .. //depot/projects/hammer/sbin/restore/Makefile#2 integrate .. //depot/projects/hammer/sbin/restore/main.c#4 integrate .. //depot/projects/hammer/sbin/restore/restore.8#4 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dbxface.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/psparse.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#11 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumstate.c#2 integrate .. //depot/projects/hammer/sys/geom/geom.h#13 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#4 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#21 integrate .. //depot/projects/hammer/usr.bin/Makefile#10 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -640,7 +640,7 @@ _strfile= games/fortune/strfile .endif -.if ${BOOTSTRAPPING} < 500042 +.if ${BOOTSTRAPPING} < 500113 _groff= gnu/usr.bin/groff .else _groff= gnu/usr.bin/groff/tmac ==== //depot/projects/hammer/bin/chio/chio.c#2 (text+ko) ==== @@ -35,13 +35,15 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; #endif /* not lint */ +#endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.25 2002/07/01 10:46:39 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.26 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/chmod/chmod.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.28 2003/01/29 21:46:12 mux Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.29 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/cp/cp.c#7 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.47 2003/04/13 08:47:30 bde Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.48 2003/05/01 16:58:54 obrien Exp $"); /* * Cp copies source files to target files. ==== //depot/projects/hammer/bin/dd/dd.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.39 2003/02/27 18:04:54 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.40 2003/05/01 16:58:54 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/df/df.c#5 (text+ko) ==== @@ -36,6 +36,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ @@ -43,12 +44,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/domainname/domainname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/domainname/domainname.c,v 1.17 2003/05/01 16:58:55 obrien Exp $"); #include ==== //depot/projects/hammer/bin/echo/echo.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.15 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/ed/main.c#3 (text+ko) ==== @@ -27,13 +27,15 @@ */ #ifndef lint +#if 0 static const char copyright[] = "@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\ All rights reserved.\n"; +#endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.25 2002/08/25 13:01:43 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.26 2003/05/01 16:58:55 obrien Exp $"); /* * CREDITS ==== //depot/projects/hammer/bin/hostname/hostname.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.14 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/hostname/hostname.c,v 1.15 2003/05/01 16:58:55 obrien Exp $"); #include ==== //depot/projects/hammer/bin/kill/kill.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.15 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.16 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/ln/ln.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1987, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.29 2002/07/31 16:53:59 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.30 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/mkdir/mkdir.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1983, 1992, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.26 2002/06/30 05:13:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.27 2003/05/01 16:58:55 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/mv/mv.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.39 2002/07/09 17:45:13 johan Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/pax/cpio.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.20 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.21 2003/05/02 00:03:10 obrien Exp $"); #include #include @@ -188,7 +188,7 @@ /* * do not even try bogus values */ - if ((nsz == 0) || (nsz > sizeof(arcn->name))) { + if ((nsz == 0) || (nsz > (int)sizeof(arcn->name))) { paxwarn(1, "Cpio file name length %d is out of range", nsz); return(-1); } @@ -266,7 +266,7 @@ int cpio_id(char *blk, int size) { - if ((size < sizeof(HD_CPIO)) || + if ((size < (int)sizeof(HD_CPIO)) || (strncmp(blk, AMAGIC, sizeof(AMAGIC) - 1) != 0)) return(-1); return(0); @@ -522,7 +522,7 @@ int vcpio_id(char *blk, int size) { - if ((size < sizeof(HD_VCPIO)) || + if ((size < (int)sizeof(HD_VCPIO)) || (strncmp(blk, AVMAGIC, sizeof(AVMAGIC) - 1) != 0)) return(-1); return(0); @@ -539,8 +539,8 @@ int crc_id(char *blk, int size) { - if ((size < sizeof(HD_VCPIO)) || - (strncmp(blk, AVCMAGIC, sizeof(AVCMAGIC) - 1) != 0)) + if ((size < (int)sizeof(HD_VCPIO)) || + (strncmp(blk, AVCMAGIC, (int)sizeof(AVCMAGIC) - 1) != 0)) return(-1); return(0); } @@ -860,7 +860,7 @@ int bcpio_id(char *blk, int size) { - if (size < sizeof(HD_BCPIO)) + if (size < (int)sizeof(HD_BCPIO)) return(-1); /* ==== //depot/projects/hammer/bin/pax/options.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.27 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.28 2003/05/02 00:03:10 obrien Exp $"); #include #include @@ -188,7 +188,7 @@ pax_options(int argc, char **argv) { int c; - int i; + size_t i; unsigned int flg = 0; unsigned int bflg = 0; char *pt; @@ -1017,7 +1017,8 @@ static void cpio_options(int argc, char **argv) { - int c, i; + int c; + size_t i; char *str; FSUB tmp; FILE *fp; ==== //depot/projects/hammer/bin/pax/pax.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1992, 1993\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.25 2002/08/21 17:32:37 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.26 2003/05/02 00:04:21 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/pax/tar.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.21 2002/08/21 17:32:37 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.22 2003/05/02 00:03:10 obrien Exp $"); #include #include @@ -537,7 +537,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > sizeof(hd->linkname)) { + if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -554,7 +554,7 @@ len = arcn->nlen; if (arcn->type == PAX_DIR) ++len; - if (len >= sizeof(hd->name)) { + if (len >= (int)sizeof(hd->name)) { paxwarn(1, "File name too long for tar %s", arcn->name); return(1); } @@ -903,7 +903,8 @@ * check the length of the linkname */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || - (arcn->type == PAX_HRG)) && (arcn->ln_nlen >= sizeof(hd->linkname))){ + (arcn->type == PAX_HRG)) && + (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } ==== //depot/projects/hammer/bin/ps/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.22 2002/10/24 00:00:57 rwatson Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.23 2003/05/02 01:05:05 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps @@ -9,6 +9,7 @@ # keep ps from being an unnecessary load # on large systems. # +WARNS= 1 WFORMAT=0 CFLAGS+=-DLAZY_PS DPADD= ${LIBM} ${LIBKVM} ==== //depot/projects/hammer/bin/pwd/pwd.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.20 2002/06/30 05:15:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pwd/pwd.c,v 1.21 2003/05/01 16:58:56 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/rcp/rcp.c#3 (text+ko) ==== @@ -38,20 +38,19 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1983, 1990, 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#if 0 #ifndef lint static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #endif /* not lint */ #endif - #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.39 2002/10/16 16:06:46 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/rm/rm.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.42 2002/08/21 17:32:42 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.43 2003/05/01 16:58:56 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/rmdir/rmdir.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.13 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rmdir/rmdir.c,v 1.14 2003/05/01 16:58:56 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/sh/arith.y#2 (text+ko) ==== @@ -93,9 +93,9 @@ #if 0 static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD: src/bin/sh/arith.y,v 1.13 2002/02/02 06:50:45 imp Exp $"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.14 2003/05/01 16:58:56 obrien Exp $"); #include "shell.h" #include "error.h" ==== //depot/projects/hammer/bin/sh/arith_lex.l#2 (text+ko) ==== @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD: src/bin/sh/arith_lex.l,v 1.17 2002/02/02 06:50:46 imp Exp $"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.18 2003/05/01 16:58:56 obrien Exp $"); #include "y.tab.h" #include "error.h" ==== //depot/projects/hammer/bin/sh/mknodes.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.15 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.16 2003/05/01 16:58:56 obrien Exp $"); /* * This program reads the nodetypes file and nodes.c.pat file. It generates ==== //depot/projects/hammer/bin/sh/mksyntax.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mksyntax.c 8.2 (Berkeley) 5/4/95"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.21 2002/10/02 09:57:54 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.22 2003/05/01 16:58:56 obrien Exp $"); /* * This program creates syntax.h and syntax.c. ==== //depot/projects/hammer/bin/sleep/sleep.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.16 2003/05/01 16:58:56 obrien Exp $"); #include #include ==== //depot/projects/hammer/bin/stty/stty.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1991, 1993, 1994\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.20 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/stty.c,v 1.21 2003/05/01 16:58:57 obrien Exp $"); #include ==== //depot/projects/hammer/bin/sync/sync.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1987, 1993\n\ @@ -38,12 +39,11 @@ #endif /* not lint */ #ifndef lint -#if 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 2 07:57:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9242137B404; Fri, 2 May 2003 07:57:31 -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 2E6DB37B401 for ; Fri, 2 May 2003 07:57:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7F6343FB1 for ; Fri, 2 May 2003 07:57:30 -0700 (PDT) (envelope-from des@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 h42EvU0U088526 for ; Fri, 2 May 2003 07:57:30 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42EvUIo088523 for perforce@freebsd.org; Fri, 2 May 2003 07:57:30 -0700 (PDT) Date: Fri, 2 May 2003 07:57:30 -0700 (PDT) Message-Id: <200305021457.h42EvUIo088523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30398 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: Fri, 02 May 2003 14:57:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30398 Change 30398 by des@des.at.des.thinksec.com on 2003/05/02 07:57:28 Change the contact address to des@freebsd.org. Affected files ... .. //depot/projects/openpam/README#5 edit Differences ... ==== //depot/projects/openpam/README#5 (text+ko) ==== @@ -22,6 +22,6 @@ /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; this will be made configurable in a future release. -Please direct bug reports and inquiries to openpam@thinksec.com. +Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/README#4 $ +$P4: //depot/projects/openpam/README#5 $ From owner-p4-projects@FreeBSD.ORG Fri May 2 07:59:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F319937B404; Fri, 2 May 2003 07:59:34 -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 7A08637B401 for ; Fri, 2 May 2003 07:59:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3C6643FBF for ; Fri, 2 May 2003 07:59:33 -0700 (PDT) (envelope-from des@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 h42ExX0U088634 for ; Fri, 2 May 2003 07:59:33 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42ExXCX088631 for perforce@freebsd.org; Fri, 2 May 2003 07:59:33 -0700 (PDT) Date: Fri, 2 May 2003 07:59:33 -0700 (PDT) Message-Id: <200305021459.h42ExXCX088631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 30399 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: Fri, 02 May 2003 14:59:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30399 Change 30399 by des@des.at.des.thinksec.com on 2003/05/02 07:59:28 Roll OpenPAM Dianthus. Affected files ... .. //depot/projects/openpam/HISTORY#18 edit .. //depot/projects/openpam/RELNOTES#15 edit .. //depot/projects/openpam/include/security/openpam_version.h#7 edit Differences ... ==== //depot/projects/openpam/HISTORY#18 (text+ko) ==== @@ -1,3 +1,20 @@ +OpenPAM Dianthus 2003-05-02 + + - BUGFIX: Initialize some potentially uninitialized variables. + + - BUGFIX: Silence some warnings emitted by gcc -std=iso9899:1999. + + - BUGFIX: In pam_getenv(), return a pointer to the stored variable + instead of a freshly allocated copy. + + - ENHANCE: Detect recursion in openpam_borrow_cred() + + - ENHANCE: Make borrowing one's own credentials a no-op. + + - ENHANCE: Further improve debugging support. + + - ENHANCE: Clean up some variable names. +============================================================================ OpenPAM Daffodil 2003-01-06 - ENHANCE: Document dependency on (for size_t) @@ -206,4 +223,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#17 $ +$P4: //depot/projects/openpam/HISTORY#18 $ ==== //depot/projects/openpam/RELNOTES#15 (text+ko) ==== @@ -1,16 +1,13 @@ - Release notes for OpenPAM Daffodil + Release notes for OpenPAM Dianthus ================================== -This is a bugfix release. The previous release, Cyclamen, was rushed -out without sufficient testing, and contained a number of small but -serious errors. +This is a maintenance release incorporating a number of minor patches +accumulated since the previous release. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It has also been successfully built on NetBSD 1.6, and -should build with minimal or no changes on OpenBSD. Work is underway -to port OpenPAM to MacOS 10.2. It has not been tested on any other -operating system. +release date. It may or may not build on other platforms; previous +releases have been built on NetBSD and (with partial success) MacOS X. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -27,4 +24,6 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/openpam/RELNOTES#14 $ +Please direct bug reports and inquiries to des@freebsd.org. + +$P4: //depot/projects/openpam/RELNOTES#15 $ ==== //depot/projects/openpam/include/security/openpam_version.h#7 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#6 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#7 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020630 -#define _OPENPAM_RELEASE "Citronella" +#define _OPENPAM_VERSION 20030502 +#define _OPENPAM_RELEASE "Dianthus" #endif From owner-p4-projects@FreeBSD.ORG Fri May 2 09:48:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEFE137B404; Fri, 2 May 2003 09:48:28 -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 4E3D337B401 for ; Fri, 2 May 2003 09:48:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BA4C43FB1 for ; Fri, 2 May 2003 09:48:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h42GmP0U000986 for ; Fri, 2 May 2003 09:48:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42Gm1JM000982 for perforce@freebsd.org; Fri, 2 May 2003 09:48:01 -0700 (PDT) Date: Fri, 2 May 2003 09:48:01 -0700 (PDT) Message-Id: <200305021648.h42Gm1JM000982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30402 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: Fri, 02 May 2003 16:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30402 Change 30402 by rwatson@rwatson_tislabs on 2003/05/02 09:47:26 Integrate TrustedBSD base branch: pull in rcOG removal, KSE updates, AMD64 support, groff and texinfo updates, new Sendmail, new SSH, and countless other bits and pieces. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#15 integrate .. //depot/projects/trustedbsd/base/Makefile#22 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#36 integrate .. //depot/projects/trustedbsd/base/Makefile.upgrade#3 delete .. //depot/projects/trustedbsd/base/UPDATING#29 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.c#9 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#2 integrate .. //depot/projects/trustedbsd/base/bin/chio/chio.c#7 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#7 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#5 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#11 integrate .. //depot/projects/trustedbsd/base/bin/cp/extern.h#6 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#8 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#9 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#13 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.c#5 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.1#2 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ed/main.c#6 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.c#5 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#18 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.1#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#14 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#14 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#13 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.h#6 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.1#6 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.c#7 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#10 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#8 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith.y#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith_lex.l#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/mknodes.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mksyntax.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#11 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#5 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/MANIFEST#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.ccpg#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.comm#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.dev#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.lib#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/PROBLEMS#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/REVISION#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/configure.ac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/README#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/groff_mm.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/m.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mm/mm/4.MT#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/examples/typeset.mom#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-10#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-11#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-4#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-5#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-6#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-7#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-8#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff-9#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/groff.texinfo#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/pic.ms#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/texinfo.tex#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/CBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/HBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/HR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/NB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/NBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/NI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/NR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100-12/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/CBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/HBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/HR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/NB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/NBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/NI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/NR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX100/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/CBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/HBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/HR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/NB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/NBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/NI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/NR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75-12/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/CBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/HBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/HR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/NB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/NBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/NI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/NR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devX75/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devascii/R.proto#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devcp1047/R.proto#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/CW#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/CWEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/CWI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/CWIEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/CWITC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/CWTC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/EX#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HBEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HBI#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HBIEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HBITC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HBTC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HIEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HITC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HR#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HREC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/HRTC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/MI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/SC#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TB#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TBEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TBI#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TBIEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TBITC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TBTC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TI#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TIEC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TITC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TR#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TREC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/TRTC#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/ec.map#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/tc.map#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/texb.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/texex.map#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/texi.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/texmi.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/texr.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/texsy.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/textex.map#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devdvi/generate/textt.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devhtml/DESC.proto#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devhtml/R.proto#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlatin1/R.proto#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/EB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/EI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/ER#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HNB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HNBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HNI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HNR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/HR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlbp/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/ALBB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/ALBR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AOB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AOI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/AOR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CLARENDON#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CORONET#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/GR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/LGB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/LGI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/LGR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/MARIGOLD#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/OR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UCR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/UR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devlj4/generate/text.map#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/AB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/ABI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/AI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/AR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/BMB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/BMBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/BMI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/BMR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/CB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/CBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/CI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/CR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/EURO#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HNR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/HR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/NR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/PR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/S#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TB#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TBI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/TR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/ZCMI#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/ZD#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/ZDR#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/download#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/freeeuro.afm#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/freeeuro.pfa#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/freeeuro.sfd#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/sfdtopfa.pe#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/symbolchars#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/generate/textmap#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/prologue.ps#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devps/symbolmap#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devutf8/NOTES#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/font/devutf8/R.proto#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_char.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_font.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_out.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/man/roff.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grodvi/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grodvi/dvi.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grodvi/dvi.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grodvi/grodvi.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-table.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-table.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-text.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-text.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/html-text.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/output.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/output.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/post-html.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grohtml/post-html.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/charset.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/lbp.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/lbp.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolbp/lbp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/lj4.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grolj4/lj4.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/grops.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/ps.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/ps.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/ps.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/psrm.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grops/psrm.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grotty/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grotty/tty.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/devices/grotty/tty.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/driver.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/html-strings.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/lib.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/nonposix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/printer.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/common.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/common.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/index.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/index.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/linear.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/linear.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/search.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libbib/search.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/input.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/input.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/printer.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libdriver/printer.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/assert.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/assert.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/change_lf.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/change_lf.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/cmap.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/cmap.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/color.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/color.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/cset.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/cset.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/device.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/device.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/errarg.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/errarg.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/error.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/error.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fatal.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fatal.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/filename.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/filename.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/font.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/font.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fontfile.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/fontfile.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/geometry.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/geometry.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/htmlhint.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/htmlhint.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/invalid.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/invalid.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/lf.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/lf.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/lineno.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/lineno.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/macropath.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/macropath.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/maxfilename.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/maxfilename.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/mksdir.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/mksdir.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/mkstemp.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/mkstemp.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/nametoindex.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/nametoindex.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/new.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/new.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/paper.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/paper.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/prime.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/prime.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/progname.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/progname.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/ptable.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/ptable.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/searchpath.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/searchpath.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/string.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/string.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strncasecmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strsave.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/strsave.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/tmpfile.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/tmpfile.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/tmpname.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/libs/libgroff/tmpname.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/box.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/box.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/delim.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/delim.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/lex.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/lex.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/limit.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/limit.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/list.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/list.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/main.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/mark.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/mark.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/other.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/other.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/over.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/over.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/pile.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/pile.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/script.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/script.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/special.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/special.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/sqrt.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/sqrt.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/text.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/eqn/text.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hdb.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hdb.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hgraph.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hgraph.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hpoint.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/hpoint.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/main.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/grn/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pre-html.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pre-html.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pushback.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pushback.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/common.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/common.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/lex.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/lex.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/main.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/object.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/object.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/pic.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/pic.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/pic.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/tex.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/tex.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/troff.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/pic/troff.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/command.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/command.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/ref.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/ref.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/refer.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/refer.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/token.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/refer/token.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/soelim.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/soelim.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/main.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/table.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/table.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/preproc/tbl/tbl.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/groff.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/groff.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/groff.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/groff/pipeline.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/grog/grog.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/nroff.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/nroff/nroff.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/charinfo.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/column.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/column.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/dictionary.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/dictionary.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/div.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/div.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/div.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/env.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/env.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/glyphuni.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/input.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/input.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/node.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/node.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/node.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/number.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/number.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/reg.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/reg.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/symbol.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/symbol.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/token.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/troff.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/unicode.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/unicode.h#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/uniglyph.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/roff/troff/uniuni.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/addftinfo.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/addftinfo.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/guess.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/addftinfo/guess.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/afmtodit/afmtodit.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/afmtodit/afmtodit.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/hpftodit.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/hpftodit.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/hpftodit/hpftodit.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/indxbib/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/indxbib/indxbib.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/indxbib/indxbib.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lkbib/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lkbib/lkbib.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lkbib/lkbib.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lookbib/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lookbib/lookbib.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/lookbib/lookbib.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/pfbtops/pfbtops.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/pfbtops/pfbtops.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/tfmtodit/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#3 delete .. //depot/projects/trustedbsd/base/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/DviChar.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/Imakefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/src/xditview/draw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/X.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/Xps.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/a4.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/an-old.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/composite.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/cp1047.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#10 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-ditroff#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-nroff#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc.tmac#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/dvi.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/ec.tmac#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/eqnrc#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/europs.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_man.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#8 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/html-end.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/html.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/hyphen.us#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/hyphenex.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/hyphenex.us#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/latin1.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/latin2.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/latin9.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/lbp.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/lj4.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/papersize.tmac#1 branch .. //depot/projects/trustedbsd/base/contrib/groff/tmac/ps.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/pspic.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#7 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc-end#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty-char.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/tty.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/www.tmac#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/win32-diffs#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/cfhead.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/usenet.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/buildvirtuser#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/editmap/editmap.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/index.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/installation.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/overview.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/sample.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_getsymval.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setreply.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/config.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sm_resolve.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/COPYING#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/INTRODUCTION#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/NEWS#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/TODO#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/help2man#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info-stnd.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/install-info.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/makeinfo.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texindex.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.txi#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version-stnd.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/display.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/doc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/doc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/echo-area.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/filesys.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/funs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/indices.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infodoc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/m-x.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/man.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodes.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/search.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/session.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/session.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/termdep.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/terminal.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/terminal.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/variables.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/window.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt1.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/system.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/xstrdup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/footnote.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/macro.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/multi.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/sectioning.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.dtd#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.xsl#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/install-info.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/texindex.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-tricks#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/TODO#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb4.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam-freebsd.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.guess#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.sub#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/crc32.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/crc32.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/fixpaths#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdh.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhs.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/kexgex.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexc.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/kexgexs.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/base64.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/base64.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/basename.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-getpeereid.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getcwd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getopt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setenv.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setproctitle.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/setproctitle.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-tree.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/vis.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-getpeereid.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-ptrace.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-timeout.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/keygen-change.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/proxy-connect.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-batch.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-cmds.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com-client.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com-keygen.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com-sftp.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/ssh-com.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rijndael.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-int.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-int.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.1#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 2 11:27:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C001037B42A; Fri, 2 May 2003 11:27:27 -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 5580737B428 for ; Fri, 2 May 2003 11:27:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D44BD43FBD for ; Fri, 2 May 2003 11:27:26 -0700 (PDT) (envelope-from marcel@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 h42IRQ0U029361 for ; Fri, 2 May 2003 11:27:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42IRQPJ029358 for perforce@freebsd.org; Fri, 2 May 2003 11:27:26 -0700 (PDT) Date: Fri, 2 May 2003 11:27:26 -0700 (PDT) Message-Id: <200305021827.h42IRQPJ029358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30405 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: Fri, 02 May 2003 18:27:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=30405 Change 30405 by marcel@marcel_nfs on 2003/05/02 11:27:14 Replace the barrier comments with real barriers. Abstract the bus space interface by using a slightly more convenient sio_barrier() macro. Affected files ... .. //depot/projects/sio/sys/dev/sio/sio.c#3 edit .. //depot/projects/sio/sys/dev/sio/sio_cons.c#2 edit .. //depot/projects/sio/sys/dev/sio/siovar.h#3 edit Differences ... ==== //depot/projects/sio/sys/dev/sio/sio.c#3 (text+ko) ==== @@ -316,7 +316,7 @@ limit=32768; while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { (void)sio_getreg(com, com_data); - /* XXX barrier */ + sio_barrier(com); DELAY(5*delay); } if (limit == 0) { @@ -370,7 +370,7 @@ * any data from being sent. */ sio_setreg(com, com_mcr, com->reg_mcr | MCR_LOOPBACK|MCR_DTR|MCR_RTS); - /* XXX barrier */ + sio_barrier(com); /* * Enable FIFOs. Set DMA mode with the highest trigger level so @@ -379,13 +379,13 @@ */ com->reg_fcr = FCR_ENABLE | FCR_DMA_MODE | FCR_RX_HIGH; sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); - /* XXX barrier */ + sio_barrier(com); /* Check if the UART has FIFOs. If not, we're done. */ com->hasfifo = (sio_getreg(com, com_iir) & IIR_FIFO_MASK) ? 1 : 0; if (!com->hasfifo) { sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + sio_barrier(com); siodebug(NULL, "no FIFOs... "); return (0); } @@ -393,12 +393,12 @@ /* We have FIFOs. Flush the transmitter and receiver. */ if (sioflush(com)) { sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + sio_barrier(com); goto fallback; } sio_setreg(com, com_ier, IER_ERXRDY); - /* XXX barrier */ + sio_barrier(com); /* * We should have a sufficiently clean "pipe" to determine the @@ -410,7 +410,7 @@ count = 0; while ((sio_getreg(com, com_iir) & IIR_RXRDY) == 0 && count < 1030) { sio_setreg(com, com_data, 0); - /* XXX barrier */ + sio_barrier(com); count++; limit = 30; @@ -420,24 +420,24 @@ } if (limit == 0) { sio_setreg(com, com_ier, 0); - /* XXX barrier */ + sio_barrier(com); sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + sio_barrier(com); siodebug(NULL, "can't determine FIFO size... "); goto fallback; } } sio_setreg(com, com_ier, 0); - /* XXX barrier */ + sio_barrier(com); /* Reset FIFOs. */ com->reg_fcr = FCR_ENABLE; sio_setreg(com, com_fcr, com->reg_fcr | FCR_XMT_RST | FCR_RCV_RST); - /* XXX barrier */ + sio_barrier(com); sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + sio_barrier(com); if (count >= 14 && count < 16) com->fifosize = 16; /* 16550 */ @@ -504,11 +504,11 @@ */ spr = sio_getreg(com, com_scr); sio_setreg(com, com_scr, ~spr); - /* XXX barrier */ + sio_barrier(com); has_spr = (sio_getreg(com, com_scr) == ~spr) ? 1 : 0; - /* XXX barrier */ + sio_barrier(com); sio_setreg(com, com_scr, spr); - /* XXX barrier */ + sio_barrier(com); if (!has_spr) device_set_desc(com->dev, "8250 or compatible"); else @@ -571,14 +571,14 @@ /* XXX we can do more. */ sio_setreg(com, com_ier, 0); - /* XXX barrier */ + sio_barrier(com); sio_setreg(com, com_lcr, lcr); - /* XXX barrier */ + sio_barrier(com); return (0); fail: sio_setreg(com, com_lcr, lcr); - /* XXX barrier */ + sio_barrier(com); return (ENXIO); } @@ -678,17 +678,17 @@ com->rclk = DEFAULT_RCLK; sio_setreg(com, com_fcr, 0); - /* XXX barrier */ + sio_barrier(com); sio_setreg(com, com_lcr, LCR_8BITS | LCR_DLAB); - /* XXX barrier */ + sio_barrier(com); com->reg_dl = siodivisor(com->rclk, comdefaultrate); sio_setdreg(com, com_dl, com->reg_dl); - /* XXX barrier */ + sio_barrier(com); sio_setreg(com, com_lcr, LCR_8BITS); - /* XXX barrier */ + sio_barrier(com); com->reg_mcr = MCR_IENABLE; sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ + sio_barrier(com); } /* Initialize the FIFOs. */ ==== //depot/projects/sio/sys/dev/sio/sio_cons.c#2 (text+ko) ==== @@ -139,15 +139,15 @@ /* Set DL and LCR. */ lcr = siocnlcr(&cd); sio_setreg(&sio_console, com_lcr, lcr | LCR_DLAB); - /* XXX barrier */ + sio_barrier(&sio_console); if (cd.baud != 0) { divisor = siodivisor(sio_console.rclk, cd.baud); sio_setdreg(&sio_console, com_dl, divisor); } else divisor = sio_getdreg(&sio_console, com_dl); - /* XXX barrier */ + sio_barrier(&sio_console); sio_setreg(&sio_console, com_lcr, lcr); - /* XXX barrier */ + sio_barrier(&sio_console); sio_console.reg_dl = divisor; @@ -161,17 +161,17 @@ /* Disable all interrupt sources. */ sio_setreg(&sio_console, com_ier, 0); - /* XXX barrier */ + sio_barrier(&sio_console); /* Disable the FIFO (if present). */ sio_console.reg_fcr = 0; sio_setreg(&sio_console, com_fcr, sio_console.reg_fcr); - /* XXX barrier */ + sio_barrier(&sio_console); /* Set MCR. */ sio_console.reg_mcr = MCR_IENABLE | MCR_RTS | MCR_DTR; sio_setreg(&sio_console, com_mcr, sio_console.reg_mcr); - /* XXX barrier */ + sio_barrier(&sio_console); /* * Clear pending interrupts. THRE is cleared by reading IIR. Data @@ -186,10 +186,10 @@ sio_getreg(&sio_console, com_rbr); else if (iir == IIR_MLSC) sio_getreg(&sio_console, com_msr); - /* XXX barrier */ + sio_barrier(&sio_console); iir = sio_getreg(&sio_console, com_iir); } - /* XXX barrier */ + sio_barrier(&sio_console); /* It's official... */ sio_console.consdev = cp; ==== //depot/projects/sio/sys/dev/sio/siovar.h#3 (text+ko) ==== @@ -176,6 +176,10 @@ #define sio_setdreg(com, reg, value) \ bus_space_write_2((com)->bst, (com)->bsh, sio_offset(com, reg), value) +#define sio_barrier(com) \ + bus_space_barrier((com)->bst, (com)->bsh, 0, sio_offset(com, 8), \ + BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE) + #define SET_FLAG(dev, bit) \ device_set_flags(dev, device_get_flags(dev) | (bit)) #define CLR_FLAG(dev, bit) \ From owner-p4-projects@FreeBSD.ORG Fri May 2 13:47:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3841B37B404; Fri, 2 May 2003 13:47:24 -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 B775937B401 for ; Fri, 2 May 2003 13:47:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A44B43FB1 for ; Fri, 2 May 2003 13:47:22 -0700 (PDT) (envelope-from marcel@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 h42KlM0U043439 for ; Fri, 2 May 2003 13:47:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42KlKBn043436 for perforce@freebsd.org; Fri, 2 May 2003 13:47:20 -0700 (PDT) Date: Fri, 2 May 2003 13:47:20 -0700 (PDT) Message-Id: <200305022047.h42KlKBn043436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30413 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: Fri, 02 May 2003 20:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=30413 Change 30413 by marcel@marcel_nfs on 2003/05/02 13:46:50 IFC @30412 Affected files ... .. //depot/projects/sio/UPDATING#2 integrate .. //depot/projects/sio/bin/csh/Makefile#2 integrate .. //depot/projects/sio/bin/pax/cpio.c#2 integrate .. //depot/projects/sio/bin/pax/options.c#2 integrate .. //depot/projects/sio/bin/pax/pax.c#2 integrate .. //depot/projects/sio/bin/pax/tar.c#2 integrate .. //depot/projects/sio/bin/ps/Makefile#2 integrate .. //depot/projects/sio/bin/rcp/rcp.c#3 integrate .. //depot/projects/sio/bin/sh/Makefile#2 integrate .. //depot/projects/sio/contrib/openpam/HISTORY#2 integrate .. //depot/projects/sio/contrib/openpam/README#2 integrate .. //depot/projects/sio/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/sio/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/sio/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/sio/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/sio/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/sio/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/sio/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/sio/contrib/texinfo/COPYING#2 integrate .. //depot/projects/sio/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/sio/contrib/texinfo/ChangeLog#2 integrate .. //depot/projects/sio/contrib/texinfo/FREEBSD-Xlist#2 integrate .. //depot/projects/sio/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/sio/contrib/texinfo/INSTALL#2 integrate .. //depot/projects/sio/contrib/texinfo/INTRODUCTION#2 integrate .. //depot/projects/sio/contrib/texinfo/NEWS#2 integrate .. //depot/projects/sio/contrib/texinfo/README#2 integrate .. //depot/projects/sio/contrib/texinfo/TODO#2 integrate .. //depot/projects/sio/contrib/texinfo/config.h#2 integrate .. //depot/projects/sio/contrib/texinfo/config.h.in#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/README#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/help2man#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/info-stnd.texi#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/info.1#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/info.texi#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/install-info.1#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/makeinfo.1#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/texindex.1#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/texinfo.txi#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/sio/contrib/texinfo/doc/version.texi#2 integrate .. //depot/projects/sio/contrib/texinfo/info/README#2 integrate .. //depot/projects/sio/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/doc.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/doc.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/echo-area.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/filesys.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/funs.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/info.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/info.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/infodoc.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/infomap.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/infomap.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/m-x.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/man.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/nodes.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/session.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/session.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/termdep.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/terminal.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/terminal.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/variables.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/sio/contrib/texinfo/info/window.c#2 integrate .. //depot/projects/sio/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/README#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/getopt.c#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/getopt.h#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/getopt1.c#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/system.h#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/sio/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/sio/contrib/texinfo/lib/xstrdup.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/README#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/cmds.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/defun.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/sio/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/sio/contrib/texinfo/makeinfo/files.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/files.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/footnote.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/html.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/html.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/index.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/insertion.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/insertion.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/lang.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/lang.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/macro.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/makeinfo.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/makeinfo.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/multi.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/node.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/node.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/sectioning.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/toc.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/toc.h#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/sio/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/sio/contrib/texinfo/util/README#2 integrate .. //depot/projects/sio/contrib/texinfo/util/install-info.c#2 integrate .. //depot/projects/sio/contrib/texinfo/util/texindex.c#2 integrate .. //depot/projects/sio/etc/Makefile#2 integrate .. //depot/projects/sio/etc/defaults/rc.conf#2 integrate .. //depot/projects/sio/etc/etc.alpha/rc.alpha#2 delete .. //depot/projects/sio/etc/etc.amd64/rc.amd64#2 delete .. //depot/projects/sio/etc/etc.i386/rc.i386#2 delete .. //depot/projects/sio/etc/etc.ia64/rc.ia64#2 delete .. //depot/projects/sio/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/sio/etc/rc#2 integrate .. //depot/projects/sio/etc/rc.atm#2 delete .. //depot/projects/sio/etc/rc.d/apm#2 integrate .. //depot/projects/sio/etc/rc.d/apmd#2 integrate .. //depot/projects/sio/etc/rc.d/archdep#2 integrate .. //depot/projects/sio/etc/rc.d/devfs#2 integrate .. //depot/projects/sio/etc/rc.devfs#2 delete .. //depot/projects/sio/etc/rc.diskless1#2 delete .. //depot/projects/sio/etc/rc.diskless2#2 delete .. //depot/projects/sio/etc/rc.isdn#2 delete .. //depot/projects/sio/etc/rc.network#2 delete .. //depot/projects/sio/etc/rc.network6#2 delete .. //depot/projects/sio/etc/rc.pccard#2 delete .. //depot/projects/sio/etc/rc.sendmail#2 integrate .. //depot/projects/sio/etc/rc.serial#2 delete .. //depot/projects/sio/etc/rc.syscons#2 delete .. //depot/projects/sio/etc/rc.sysctl#2 delete .. //depot/projects/sio/gnu/usr.bin/groff/Makefile#3 integrate .. //depot/projects/sio/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/sio/gnu/usr.bin/man/catman/Makefile#2 delete .. //depot/projects/sio/gnu/usr.bin/man/catman/catman.1#2 delete .. //depot/projects/sio/gnu/usr.bin/man/catman/catman.perl#2 delete .. //depot/projects/sio/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_cond.c#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/sio/release/i386/dokern.sh#2 integrate .. //depot/projects/sio/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/sio/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/sio/sbin/atm/ilmid/ilmid.c#2 integrate .. //depot/projects/sio/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/sio/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/sio/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/sio/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/sio/sbin/camcontrol/modeedit.c#2 integrate .. //depot/projects/sio/sbin/camcontrol/util.c#2 integrate .. //depot/projects/sio/sbin/devd/devd.cc#2 integrate .. //depot/projects/sio/sbin/dmesg/dmesg.c#2 integrate .. //depot/projects/sio/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/sio/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/sio/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/sio/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/sio/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/sio/sys/dev/fb/vga.c#3 integrate .. //depot/projects/sio/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/sio/sys/dev/md/md.c#2 integrate .. //depot/projects/sio/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/sio/sys/dev/mii/miidevs#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumio.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumstate.c#2 integrate .. //depot/projects/sio/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/sio/sys/geom/geom.h#3 integrate .. //depot/projects/sio/sys/geom/geom_aes.c#2 integrate .. //depot/projects/sio/sys/geom/geom_apple.c#2 integrate .. //depot/projects/sio/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/sio/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/sio/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/sio/sys/geom/geom_dev.c#2 integrate .. //depot/projects/sio/sys/geom/geom_disk.c#2 integrate .. //depot/projects/sio/sys/geom/geom_event.c#3 integrate .. //depot/projects/sio/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/sio/sys/geom/geom_io.c#2 integrate .. //depot/projects/sio/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/sio/sys/geom/geom_mirror.c#2 integrate .. //depot/projects/sio/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/sio/sys/geom/geom_slice.c#2 integrate .. //depot/projects/sio/sys/geom/geom_slice.h#2 integrate .. //depot/projects/sio/sys/geom/geom_subr.c#3 integrate .. //depot/projects/sio/sys/geom/geom_sunlabel.c#3 integrate .. //depot/projects/sio/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/sio/sys/kern/kern_idle.c#2 integrate .. //depot/projects/sio/sys/kern/kern_intr.c#2 integrate .. //depot/projects/sio/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/sio/sys/kern/sched_ule.c#2 integrate .. //depot/projects/sio/sys/kern/subr_mbuf.c#2 integrate .. //depot/projects/sio/sys/kern/subr_prof.c#2 integrate .. //depot/projects/sio/sys/kern/vfs_default.c#3 integrate .. //depot/projects/sio/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/sio/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/sio/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/sio/sys/sys/ata.h#2 integrate .. //depot/projects/sio/sys/sys/mbuf.h#2 integrate .. //depot/projects/sio/sys/sys/param.h#2 integrate .. //depot/projects/sio/sys/sys/proc.h#3 integrate .. //depot/projects/sio/sys/vm/vm_object.c#3 integrate .. //depot/projects/sio/usr.sbin/boot98cfg/boot98cfg.c#2 integrate .. //depot/projects/sio/usr.sbin/mergemaster/mergemaster.8#2 integrate .. //depot/projects/sio/usr.sbin/mergemaster/mergemaster.sh#2 integrate Differences ... ==== //depot/projects/sio/UPDATING#2 (text+ko) ==== @@ -17,11 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. + 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1268,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ ==== //depot/projects/sio/bin/csh/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/sio/bin/pax/cpio.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.20 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/cpio.c,v 1.21 2003/05/02 00:03:10 obrien Exp $"); #include #include @@ -188,7 +188,7 @@ /* * do not even try bogus values */ - if ((nsz == 0) || (nsz > sizeof(arcn->name))) { + if ((nsz == 0) || (nsz > (int)sizeof(arcn->name))) { paxwarn(1, "Cpio file name length %d is out of range", nsz); return(-1); } @@ -266,7 +266,7 @@ int cpio_id(char *blk, int size) { - if ((size < sizeof(HD_CPIO)) || + if ((size < (int)sizeof(HD_CPIO)) || (strncmp(blk, AMAGIC, sizeof(AMAGIC) - 1) != 0)) return(-1); return(0); @@ -522,7 +522,7 @@ int vcpio_id(char *blk, int size) { - if ((size < sizeof(HD_VCPIO)) || + if ((size < (int)sizeof(HD_VCPIO)) || (strncmp(blk, AVMAGIC, sizeof(AVMAGIC) - 1) != 0)) return(-1); return(0); @@ -539,8 +539,8 @@ int crc_id(char *blk, int size) { - if ((size < sizeof(HD_VCPIO)) || - (strncmp(blk, AVCMAGIC, sizeof(AVCMAGIC) - 1) != 0)) + if ((size < (int)sizeof(HD_VCPIO)) || + (strncmp(blk, AVCMAGIC, (int)sizeof(AVCMAGIC) - 1) != 0)) return(-1); return(0); } @@ -860,7 +860,7 @@ int bcpio_id(char *blk, int size) { - if (size < sizeof(HD_BCPIO)) + if (size < (int)sizeof(HD_BCPIO)) return(-1); /* ==== //depot/projects/sio/bin/pax/options.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.27 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.28 2003/05/02 00:03:10 obrien Exp $"); #include #include @@ -188,7 +188,7 @@ pax_options(int argc, char **argv) { int c; - int i; + size_t i; unsigned int flg = 0; unsigned int bflg = 0; char *pt; @@ -1017,7 +1017,8 @@ static void cpio_options(int argc, char **argv) { - int c, i; + int c; + size_t i; char *str; FSUB tmp; FILE *fp; ==== //depot/projects/sio/bin/pax/pax.c#2 (text+ko) ==== @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1992, 1993\n\ @@ -42,12 +43,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; +#endif /* not lint */ #endif -#endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.25 2002/08/21 17:32:37 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pax.c,v 1.26 2003/05/02 00:04:21 obrien Exp $"); #include #include ==== //depot/projects/sio/bin/pax/tar.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.21 2002/08/21 17:32:37 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tar.c,v 1.22 2003/05/02 00:03:10 obrien Exp $"); #include #include @@ -537,7 +537,7 @@ case PAX_SLK: case PAX_HLK: case PAX_HRG: - if (arcn->ln_nlen > sizeof(hd->linkname)) { + if (arcn->ln_nlen > (int)sizeof(hd->linkname)) { paxwarn(1,"Link name too long for tar %s", arcn->ln_name); return(1); } @@ -554,7 +554,7 @@ len = arcn->nlen; if (arcn->type == PAX_DIR) ++len; - if (len >= sizeof(hd->name)) { + if (len >= (int)sizeof(hd->name)) { paxwarn(1, "File name too long for tar %s", arcn->name); return(1); } @@ -903,7 +903,8 @@ * check the length of the linkname */ if (((arcn->type == PAX_SLK) || (arcn->type == PAX_HLK) || - (arcn->type == PAX_HRG)) && (arcn->ln_nlen >= sizeof(hd->linkname))){ + (arcn->type == PAX_HRG)) && + (arcn->ln_nlen >= (int)sizeof(hd->linkname))) { paxwarn(1, "Link name too long for ustar %s", arcn->ln_name); return(1); } ==== //depot/projects/sio/bin/ps/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.22 2002/10/24 00:00:57 rwatson Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.23 2003/05/02 01:05:05 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps @@ -9,6 +9,7 @@ # keep ps from being an unnecessary load # on large systems. # +WARNS= 1 WFORMAT=0 CFLAGS+=-DLAZY_PS DPADD= ${LIBM} ${LIBKVM} ==== //depot/projects/sio/bin/rcp/rcp.c#3 (text+ko) ==== @@ -50,7 +50,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.41 2003/05/02 06:36:52 obrien Exp $"); #include #include @@ -502,7 +502,8 @@ enum { YES, NO, DISPLAYED } wrerr; BUF *bp; off_t i, j, size; - int amt, count, exists, first, mask, mode, ofd, omode; + int amt, exists, first, mask, mode, ofd, omode; + size_t count; int setimes, targisdir, wrerrno = 0; char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ], path[PATH_MAX]; ==== //depot/projects/sio/bin/sh/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.38 2002/10/01 12:12:45 mux Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.40 2003/05/02 06:26:32 obrien Exp $ PROG= sh SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ @@ -21,6 +21,8 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # CFLAGS+= -g -DDEBUG=2 +WARNS= 0 +WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../../bin/test ==== //depot/projects/sio/contrib/openpam/HISTORY#2 (text) ==== @@ -1,3 +1,20 @@ +OpenPAM Dianthus 2003-05-02 + + - BUGFIX: Initialize some potentially uninitialized variables. + + - BUGFIX: Silence some warnings emitted by gcc -std=iso9899:1999. + + - BUGFIX: In pam_getenv(), return a pointer to the stored variable + instead of a freshly allocated copy. + + - ENHANCE: Detect recursion in openpam_borrow_cred() + + - ENHANCE: Make borrowing one's own credentials a no-op. + + - ENHANCE: Further improve debugging support. + + - ENHANCE: Clean up some variable names. +============================================================================ OpenPAM Daffodil 2003-01-06 - ENHANCE: Document dependency on (for size_t) @@ -206,4 +223,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#17 $ +$P4: //depot/projects/openpam/HISTORY#18 $ ==== //depot/projects/sio/contrib/openpam/README#2 (text) ==== @@ -22,6 +22,6 @@ /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; this will be made configurable in a future release. -Please direct bug reports and inquiries to openpam@thinksec.com. +Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/README#4 $ +$P4: //depot/projects/openpam/README#5 $ ==== //depot/projects/sio/contrib/openpam/RELNOTES#2 (text) ==== @@ -1,16 +1,13 @@ - Release notes for OpenPAM Daffodil + Release notes for OpenPAM Dianthus ================================== -This is a bugfix release. The previous release, Cyclamen, was rushed -out without sufficient testing, and contained a number of small but -serious errors. +This is a maintenance release incorporating a number of minor patches +accumulated since the previous release. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It has also been successfully built on NetBSD 1.6, and -should build with minimal or no changes on OpenBSD. Work is underway -to port OpenPAM to MacOS 10.2. It has not been tested on any other -operating system. +release date. It may or may not build on other platforms; previous +releases have been built on NetBSD and (with partial success) MacOS X. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -27,4 +24,6 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/openpam/RELNOTES#14 $ +Please direct bug reports and inquiries to des@freebsd.org. + +$P4: //depot/projects/openpam/RELNOTES#15 $ ==== //depot/projects/sio/contrib/openpam/doc/man/openpam.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_borrow_cred.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_free_data.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_get_option.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_log.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_nullconv.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_restore_cred.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_set_option.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/openpam_ttyconv.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM 3 .Os .Sh NAME @@ -75,7 +75,7 @@ .Fn pam_get_item "pam_handle_t *pamh" "int item_type" "const void **item" .Ft int .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt" -.Ft char * +.Ft const char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" .Ft char ** .Fn pam_getenvlist "pam_handle_t *pamh" ==== //depot/projects/sio/contrib/openpam/doc/man/pam_acct_mgmt.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_authenticate.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_chauthtok.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_close_session.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_end.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_error.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_get_authtok.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_get_data.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_get_item.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_get_user.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_getenv.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GETENV 3 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh SYNOPSIS .In sys/types.h .In security/pam_appl.h -.Ft char * +.Ft const char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" .Sh DESCRIPTION The ==== //depot/projects/sio/contrib/openpam/doc/man/pam_getenvlist.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_info.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_open_session.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_prompt.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_putenv.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_set_data.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_set_item.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_setcred.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/sio/contrib/openpam/doc/man/pam_setenv.3#2 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SETENV 3 .Os .Sh NAME >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 2 15:12:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 602D837B404; Fri, 2 May 2003 15:12:37 -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 04D1F37B401; Fri, 2 May 2003 15:12:37 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C7F743F3F; Fri, 2 May 2003 15:12:36 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 3121A2A7EA; Fri, 2 May 2003 15:12:36 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin In-Reply-To: Date: Fri, 02 May 2003 15:12:36 -0700 From: Peter Wemm Message-Id: <20030502221236.3121A2A7EA@canning.wemm.org> cc: Perforce Change Reviews Subject: Re: PERFORCE change 29745 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: Fri, 02 May 2003 22:12:38 -0000 John Baldwin wrote: > > On 25-Apr-2003 Peter Wemm wrote: > > http://perforce.freebsd.org/chv.cgi?CH=29745 > > > > Change 29745 by peter@peter_daintree on 2003/04/25 16:01:39 > > > > Add a pcb flag to indicate that a full trapframe restore > > is required, even from syscall.. eg: a sigreturn(2). > > I'm not sure if this is the right place for it. mdthread > > perhaps? Anyway, it'll do for now. > > mdthread sounds right. Alpha uses a flags field on the trapframe to > accomplish this: > > sys/alpha/include/frame.h > #define FRAME_FLAGS 27 > #define FRAME_FLAGS_SYSCALL 1 /* partial frame for syscalls */ They put the frames in the space reserved for the 'zero' register if I recall correctly. On a side note, there are times when I'd like to move the pcb stuff into mdthread.. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Fri May 2 15:33:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9011737B404; Fri, 2 May 2003 15:33:34 -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 12C9F37B401 for ; Fri, 2 May 2003 15:33:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE9B43FBF for ; Fri, 2 May 2003 15:33:33 -0700 (PDT) (envelope-from marcel@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 h42MXX0U050702 for ; Fri, 2 May 2003 15:33:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42MXW8u050699 for perforce@freebsd.org; Fri, 2 May 2003 15:33:32 -0700 (PDT) Date: Fri, 2 May 2003 15:33:32 -0700 (PDT) Message-Id: <200305022233.h42MXW8u050699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30415 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: Fri, 02 May 2003 22:33:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30415 Change 30415 by marcel@marcel_nfs on 2003/05/02 15:33:02 Update documentation: COM_FORCECONSOLE is gone. Use boot -h or set boot_serial=YES. COM_LLCONSOLE is gone. Remote GDB support is going to be handled like the console support, which makes this flag obsolete. COM_ESP is gone. This driver is for UARTs. Enhanced serial ports are better off with their own driver. The ESP support was limited to UART compatibility only anyway. COM_MULTIPORT is gone. Multiport cards are going to be handled by puc(4). This needs more work of course. COM_ST6650* is gone. We'll detect at runtime (now only FIFO size, but based on that we can also probe other features). Document hint.sio.0.baud as a way to set the default baudrate. This makes compile-time defaults mostly redundant. Both CONSPEED and GDBSPEED have been retained for now. Affected files ... .. //depot/projects/sio/sys/conf/NOTES#2 edit Differences ... ==== //depot/projects/sio/sys/conf/NOTES#2 (text+ko) ==== @@ -1411,23 +1411,22 @@ device sio hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" +hint.sio.0.baud="9600" hint.sio.0.flags="0x10" hint.sio.0.irq="4" +hint.sio.0.port="0x3F8" # -# `flags' for serial drivers that support consoles (only for sio now): -# 0x10 enable console support for this unit. The other console flags -# are ignored unless this is set. Enabling console support does -# not make the unit the preferred console - boot with -h or set -# the 0x20 flag for that. Currently, at most one unit can have -# console support; the first one (in config file order) with -# this flag set is preferred. Setting this flag for sio0 gives -# the old behaviour. -# 0x20 force this unit to be the console (unless there is another -# higher priority console). This replaces the COMCONSOLE option. -# 0x40 reserve this unit for low level console operations. Do not -# access the device in any normal way. +# `flags' for serial drivers that support consoles: +# 0x10 enable console support for this unit. Enabling console +# support does not automaticly make the unit the preferred +# console - boot with -h or set boot_serial="YES" in the +# loader configuration file. On some architectures the +# firmware will provide the information as to whether there's +# a serial port for use as a console. On those architectures +# this flag is only used when the firmware does not provide +# the necessary information. Currently the first sio device +# which has this flag set will battle for the console. # 0x80 use this port for serial line gdb support in ddb. # # PnP `flags' @@ -1438,22 +1437,14 @@ # Options for serial drivers that support consoles (only for sio now): options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to #DDB, if available. -options CONSPEED=115200 # speed for serial console - # (default 9600) +options CONSPEED=9600 # default speed for serial consoles +options GDBSPEED=CONSPEED # default speed for remote GDB # Solaris implements a new BREAK which is initiated by a character # sequence CR ~ ^b which is similar to a familiar pattern used on # Sun servers by the Remote Console. options ALT_BREAK_TO_DEBUGGER -# Options for sio: -options COM_ESP #code for Hayes ESP -options COM_MULTIPORT #code for some cards with shared IRQs - -# Other flags for sio that aren't documented in the man page. -# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for -# ST16650A-compatible UARTs. - # PCI Universal Communications driver # Supports various single and multi port PCI serial cards. Maybe later # also the parallel ports on combination serial/parallel cards. New cards From owner-p4-projects@FreeBSD.ORG Fri May 2 15:35:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9019737B404; Fri, 2 May 2003 15:35:39 -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 2C9A637B401 for ; Fri, 2 May 2003 15:35:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D19AD43FAF for ; Fri, 2 May 2003 15:35:37 -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 h42MZb0U050905 for ; Fri, 2 May 2003 15:35:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42MZa8v050902 for perforce@freebsd.org; Fri, 2 May 2003 15:35:36 -0700 (PDT) Date: Fri, 2 May 2003 15:35:36 -0700 (PDT) Message-Id: <200305022235.h42MZa8v050902@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 30416 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: Fri, 02 May 2003 22:35:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=30416 Change 30416 by peter@peter_daintree on 2003/05/02 15:34:58 IFC @30414 Affected files ... .. //depot/projects/hammer/UPDATING#9 integrate .. //depot/projects/hammer/bin/csh/Makefile#2 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#4 integrate .. //depot/projects/hammer/bin/sh/Makefile#3 integrate .. //depot/projects/hammer/contrib/openpam/HISTORY#3 integrate .. //depot/projects/hammer/contrib/openpam/README#3 integrate .. //depot/projects/hammer/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/hammer/contrib/openpam/include/security/pam_constants.h#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dispatch.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_log.c#3 integrate .. //depot/projects/hammer/contrib/openpam/lib/pam_getenv.c#3 integrate .. //depot/projects/hammer/etc/Makefile#10 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#10 integrate .. //depot/projects/hammer/etc/etc.alpha/rc.alpha#2 delete .. //depot/projects/hammer/etc/etc.amd64/rc.amd64#4 delete .. //depot/projects/hammer/etc/etc.i386/rc.i386#3 delete .. //depot/projects/hammer/etc/etc.ia64/rc.ia64#2 delete .. //depot/projects/hammer/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/hammer/etc/rc#10 integrate .. //depot/projects/hammer/etc/rc.atm#3 delete .. //depot/projects/hammer/etc/rc.d/apm#2 integrate .. //depot/projects/hammer/etc/rc.d/apmd#4 integrate .. //depot/projects/hammer/etc/rc.d/archdep#4 integrate .. //depot/projects/hammer/etc/rc.d/devfs#3 integrate .. //depot/projects/hammer/etc/rc.devfs#3 delete .. //depot/projects/hammer/etc/rc.diskless1#3 delete .. //depot/projects/hammer/etc/rc.diskless2#4 delete .. //depot/projects/hammer/etc/rc.isdn#2 delete .. //depot/projects/hammer/etc/rc.network#6 delete .. //depot/projects/hammer/etc/rc.network6#2 delete .. //depot/projects/hammer/etc/rc.pccard#2 delete .. //depot/projects/hammer/etc/rc.sendmail#2 integrate .. //depot/projects/hammer/etc/rc.serial#2 delete .. //depot/projects/hammer/etc/rc.syscons#2 delete .. //depot/projects/hammer/etc/rc.sysctl#2 delete .. //depot/projects/hammer/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/hammer/release/i386/dokern.sh#10 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#5 integrate .. //depot/projects/hammer/sbin/atm/ilmid/ilmid.c#6 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/hammer/sbin/camcontrol/Makefile#3 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/hammer/sbin/camcontrol/modeedit.c#4 integrate .. //depot/projects/hammer/sbin/camcontrol/util.c#3 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#4 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#7 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#11 integrate .. //depot/projects/hammer/sys/dev/md/md.c#11 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/hammer/sys/geom/geom.h#14 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_apple.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_mirror.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_slice.h#7 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_vol_ffs.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_mbuf.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#11 integrate .. //depot/projects/hammer/sys/sys/ata.h#4 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#10 integrate .. //depot/projects/hammer/sys/sys/param.h#12 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#15 integrate .. //depot/projects/hammer/usr.sbin/boot98cfg/boot98cfg.c#3 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#4 integrate Differences ... ==== //depot/projects/hammer/UPDATING#9 (text+ko) ==== @@ -17,11 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. + 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1268,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ ==== //depot/projects/hammer/bin/csh/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/hammer/bin/rcp/rcp.c#4 (text+ko) ==== @@ -50,7 +50,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.41 2003/05/02 06:36:52 obrien Exp $"); #include #include @@ -502,7 +502,8 @@ enum { YES, NO, DISPLAYED } wrerr; BUF *bp; off_t i, j, size; - int amt, count, exists, first, mask, mode, ofd, omode; + int amt, exists, first, mask, mode, ofd, omode; + size_t count; int setimes, targisdir, wrerrno = 0; char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ], path[PATH_MAX]; ==== //depot/projects/hammer/bin/sh/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 -# $FreeBSD: src/bin/sh/Makefile,v 1.38 2002/10/01 12:12:45 mux Exp $ +# $FreeBSD: src/bin/sh/Makefile,v 1.40 2003/05/02 06:26:32 obrien Exp $ PROG= sh SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ @@ -21,6 +21,8 @@ CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # CFLAGS+= -g -DDEBUG=2 +WARNS= 0 +WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../../bin/test ==== //depot/projects/hammer/contrib/openpam/HISTORY#3 (text) ==== @@ -1,3 +1,20 @@ +OpenPAM Dianthus 2003-05-02 + + - BUGFIX: Initialize some potentially uninitialized variables. + + - BUGFIX: Silence some warnings emitted by gcc -std=iso9899:1999. + + - BUGFIX: In pam_getenv(), return a pointer to the stored variable + instead of a freshly allocated copy. + + - ENHANCE: Detect recursion in openpam_borrow_cred() + + - ENHANCE: Make borrowing one's own credentials a no-op. + + - ENHANCE: Further improve debugging support. + + - ENHANCE: Clean up some variable names. +============================================================================ OpenPAM Daffodil 2003-01-06 - ENHANCE: Document dependency on (for size_t) @@ -206,4 +223,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#17 $ +$P4: //depot/projects/openpam/HISTORY#18 $ ==== //depot/projects/hammer/contrib/openpam/README#3 (text) ==== @@ -22,6 +22,6 @@ /usr/local/etc/pam.d/ and /usr/local/etc/pam.conf, in that order; this will be made configurable in a future release. -Please direct bug reports and inquiries to openpam@thinksec.com. +Please direct bug reports and inquiries to des@freebsd.org. -$P4: //depot/projects/openpam/README#4 $ +$P4: //depot/projects/openpam/README#5 $ ==== //depot/projects/hammer/contrib/openpam/RELNOTES#3 (text) ==== @@ -1,16 +1,13 @@ - Release notes for OpenPAM Daffodil + Release notes for OpenPAM Dianthus ================================== -This is a bugfix release. The previous release, Cyclamen, was rushed -out without sufficient testing, and contained a number of small but -serious errors. +This is a maintenance release incorporating a number of minor patches +accumulated since the previous release. This release corresponds to the code used in FreeBSD-CURRENT as of the -release date. It has also been successfully built on NetBSD 1.6, and -should build with minimal or no changes on OpenBSD. Work is underway -to port OpenPAM to MacOS 10.2. It has not been tested on any other -operating system. +release date. It may or may not build on other platforms; previous +releases have been built on NetBSD and (with partial success) MacOS X. The library itself is complete. Documentation exists in the form of man pages for the library functions. These man pages are generated by @@ -27,4 +24,6 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/openpam/RELNOTES#14 $ +Please direct bug reports and inquiries to des@freebsd.org. + +$P4: //depot/projects/openpam/RELNOTES#15 $ ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_borrow_cred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_free_data.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_get_option.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_log.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_nullconv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_restore_cred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_set_option.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/openpam_ttyconv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM 3 .Os .Sh NAME @@ -75,7 +75,7 @@ .Fn pam_get_item "pam_handle_t *pamh" "int item_type" "const void **item" .Ft int .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt" -.Ft char * +.Ft const char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" .Ft char ** .Fn pam_getenvlist "pam_handle_t *pamh" ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_acct_mgmt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_authenticate.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_chauthtok.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_close_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_end.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_error.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_authtok.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_data.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_item.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_get_user.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_getenv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GETENV 3 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh SYNOPSIS .In sys/types.h .In security/pam_appl.h -.Ft char * +.Ft const char * .Fn pam_getenv "pam_handle_t *pamh" "const char *name" .Sh DESCRIPTION The ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_getenvlist.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_info.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_open_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_prompt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_putenv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_set_data.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_set_item.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_setcred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_setenv.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_authenticate.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_close_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_open_session.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_sm_setcred.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_start.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_strerror.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_verror.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_vinfo.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/doc/man/pam_vprompt.3#3 (text) ==== @@ -33,7 +33,7 @@ .\" .\" $P4$ .\" -.Dd January 6, 2003 +.Dd May 2, 2003 .Dt PAM_VPROMPT 3 .Os .Sh NAME ==== //depot/projects/hammer/contrib/openpam/include/security/openpam_version.h#2 (text) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#6 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#7 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020630 -#define _OPENPAM_RELEASE "Citronella" +#define _OPENPAM_VERSION 20030502 +#define _OPENPAM_RELEASE "Dianthus" #endif ==== //depot/projects/hammer/contrib/openpam/include/security/pam_appl.h#2 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_appl.h#10 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#11 $ */ #ifndef _PAM_APPL_H_INCLUDED @@ -83,7 +83,7 @@ const char **_user, const char *_prompt); -char * +const char * pam_getenv(pam_handle_t *_pamh, const char *_name); ==== //depot/projects/hammer/contrib/openpam/include/security/pam_constants.h#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_constants.h#19 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#20 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED @@ -97,7 +97,8 @@ * XSSO 5.4 */ enum { - PAM_SILENT = 0x80000000, + /* some compilers promote 0x8000000 to long */ + PAM_SILENT = (-0x7fffffff - 1), PAM_DISALLOW_NULL_AUTHTOK = 0x1, PAM_ESTABLISH_CRED = 0x1, PAM_DELETE_CRED = 0x2, ==== //depot/projects/hammer/contrib/openpam/lib/openpam_dispatch.c#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#18 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#19 $ */ #include @@ -59,6 +59,9 @@ { pam_chain_t *chain; int err, fail, r; +#ifdef DEBUG + int debug; +#endif ENTER(); if (pamh == NULL) @@ -96,8 +99,6 @@ /* execute */ for (err = fail = 0; chain != NULL; chain = chain->next) { - openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", - _pam_sm_func_name[primitive], chain->module->path); if (chain->module->func[primitive] == NULL) { openpam_log(PAM_LOG_ERROR, "%s: no %s()", chain->module->path, _pam_sm_func_name[primitive]); @@ -105,12 +106,23 @@ } else { pamh->primitive = primitive; pamh->current = chain; +#ifdef DEBUG + debug = (openpam_get_option(pamh, "debug") != NULL); + if (debug) + ++_openpam_debug; + openpam_log(PAM_LOG_DEBUG, "calling %s() in %s", + _pam_sm_func_name[primitive], chain->module->path); +#endif r = (chain->module->func[primitive])(pamh, flags, chain->optc, (const char **)chain->optv); pamh->current = NULL; +#ifdef DEBUG openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", chain->module->path, _pam_sm_func_name[primitive], pam_strerror(pamh, r)); + if (debug) + --_openpam_debug; +#endif } if (r == PAM_IGNORE) ==== //depot/projects/hammer/contrib/openpam/lib/openpam_impl.h#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#21 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -44,6 +44,8 @@ extern const char *_pam_err_name[PAM_NUM_ERRORS]; extern const char *_pam_item_name[PAM_NUM_ITEMS]; +extern int _openpam_debug; + /* * Control flags */ ==== //depot/projects/hammer/contrib/openpam/lib/openpam_log.c#3 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#18 $ */ #include @@ -45,6 +45,8 @@ #include "openpam_impl.h" +int _openpam_debug = 0; + #if defined(openpam_log) /* @@ -62,12 +64,10 @@ switch (level) { case PAM_LOG_DEBUG: -#ifndef DEBUG - return; -#else + if (!_openpam_debug) + return; priority = LOG_DEBUG; break; -#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 2 15:37:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45E7337B405; Fri, 2 May 2003 15:37:42 -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 EE54A37B401 for ; Fri, 2 May 2003 15:37:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43AC243F93 for ; Fri, 2 May 2003 15:37:41 -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 h42Mbe0U050958 for ; Fri, 2 May 2003 15:37:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42MbeHl050955 for perforce@freebsd.org; Fri, 2 May 2003 15:37:40 -0700 (PDT) Date: Fri, 2 May 2003 15:37:40 -0700 (PDT) Message-Id: <200305022237.h42MbeHl050955@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 30417 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: Fri, 02 May 2003 22:37:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30417 Change 30417 by peter@peter_daintree on 2003/05/02 15:37:28 Hmm. sync rcsid after last IFC Affected files ... .. //depot/projects/hammer/etc/rc.sendmail#3 edit Differences ... ==== //depot/projects/hammer/etc/rc.sendmail#3 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.sendmail,v 1.3 2002/04/22 13:44:17 des Exp $ +# $FreeBSD: src/etc/rc.sendmail,v 1.5 2003/05/02 11:05:57 dougb Exp $ # # This script is used by /etc/rc at boot time to start sendmail. It From owner-p4-projects@FreeBSD.ORG Fri May 2 15:45:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 466FA37B405; Fri, 2 May 2003 15:45:54 -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 DB7CF37B401 for ; Fri, 2 May 2003 15:45:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3486543F85 for ; Fri, 2 May 2003 15:45:53 -0700 (PDT) (envelope-from jmallett@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 h42Mjq0U051508 for ; Fri, 2 May 2003 15:45:52 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h42MjqLV051505 for perforce@freebsd.org; Fri, 2 May 2003 15:45:52 -0700 (PDT) Date: Fri, 2 May 2003 15:45:52 -0700 (PDT) Message-Id: <200305022245.h42MjqLV051505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30419 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: Fri, 02 May 2003 22:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=30419 Change 30419 by jmallett@jmallett_dalek on 2003/05/02 15:45:26 Voodoo-free locore.S. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#5 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Juli Mallett + * Copyright (c) 2003 Juli Mallett * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,12 +28,17 @@ #include #include +#incldue + +#include "assym.s" .data /* * Dummy interrupt table to keep sysctl happy until * it's worked out what to do with naming */ +GLOBAL(stackspace) + .space 16384 GLOBAL(intrnames) .asciz "dummy" GLOBAL(eintrnames) @@ -45,49 +50,41 @@ .set noreorder .text - .globl start -start: - # Just keep the boot exception vector and soft reset bits around, - # disable interrupts. - mfc0 t0, MIPS_COP_0_STATUS - and t0, MIPS_SR_BEV | MIPS3_SR_SR - mtc0 t0, MIPS_COP_0_STATUS +ENTRY(btext) +ENTRY(start) + # t0: Bits to preserve if set: + # Soft reset + # Boot exception vectors (firmware-provided) + li t0, MIPS_SR_BEV | MIPS3_SR_SR + # t1: Bits to set explicitly: + # Kernel mode is 64-bit + # Enable FPU + li t1, MIPS3_SR_KX | MIPS_SR_COP_1_BIT + + # Read coprocessor 0 status register, clear bits not + # preserved (namely, clearing interrupt bits), and set + # bits we want to explicitly set. + mfc0 t2, MIPS_COP_0_STATUS + and t2, t0 + or t2, t1 + mtc0 t2, MIPS_COP_0_STATUS COP0_SYNC + # Extra nops for the FPU to spin up. - # Zero the Cause register in case any software interrupt bits are set. + # Clear cause register. mtc0 zero, MIPS_COP_0_CAUSE COP0_SYNC - # If the stack pointer is above this function's address, or more than - # 4K below it, then we should set it to the address of this function - # minus the amount of stack needed to call a function in C, otherwise - # just use it. - la t1, start - bgt sp, t1, 1f - addu t2, t1, -CALLFRAME_SIZ - subu t0, t1, sp - bgt t0, 4096, 1f - nop - move t2, sp -1: move sp, t2 - - # Turn on the FPU. - mfc0 t0, MIPS_COP_0_STATUS - or t0, MIPS_SR_COP_1_BIT - mtc0 t0, MIPS_COP_0_STATUS - nop - nop - nop - nop - COP0_SYNC - - # Get the processor ID from coprocessor 0, and the FPU ID from - # coprocessor 1. + # Read and store the PrID FPU ID for CPU identification. mfc0 t0, MIPS_COP_0_PRID cfc1 t1, MIPS_FPU_ID sw t0, cpu_id sw t1, fpu_id + # Set up our temporary stack. + la sp, stackspace + addu sp, 16384 + # Call the platform-specific startup code. jal platform_start nop @@ -97,3 +94,4 @@ nop # NOTREACHED +END(start) From owner-p4-projects@FreeBSD.ORG Fri May 2 17:33:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04B4037B404; Fri, 2 May 2003 17:33:08 -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 B001A37B401 for ; Fri, 2 May 2003 17:33:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 485C843F75 for ; Fri, 2 May 2003 17:33:07 -0700 (PDT) (envelope-from jmallett@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 h430X70U063950 for ; Fri, 2 May 2003 17:33:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h430X6QG063947 for perforce@freebsd.org; Fri, 2 May 2003 17:33:06 -0700 (PDT) Date: Fri, 2 May 2003 17:33:06 -0700 (PDT) Message-Id: <200305030033.h430X6QG063947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30426 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: Sat, 03 May 2003 00:33:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30426 Change 30426 by jmallett@jmallett_dalek on 2003/05/02 17:32:40 Oops, I seem to have forgotten to submit this file. Affected files ... .. //depot/projects/mips/sys/mips/include/cpuinfo.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri May 2 17:48:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5DA937B404; Fri, 2 May 2003 17:48:27 -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 58A5E37B401 for ; Fri, 2 May 2003 17:48:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6228343F85 for ; Fri, 2 May 2003 17:48:26 -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 h430mQ0U064625 for ; Fri, 2 May 2003 17:48:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h430mPtd064622 for perforce@freebsd.org; Fri, 2 May 2003 17:48:25 -0700 (PDT) Date: Fri, 2 May 2003 17:48:25 -0700 (PDT) Message-Id: <200305030048.h430mPtd064622@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 30427 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: Sat, 03 May 2003 00:48:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30427 Change 30427 by peter@peter_daintree on 2003/05/02 17:47:58 IFC @30425 Affected files ... .. //depot/projects/hammer/etc/Makefile#11 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/hammer/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/hammer/sys/amd64/amd64/exception.s#6 delete .. //depot/projects/hammer/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/hammer/sys/amd64/amd64/locore.s#6 delete .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/hammer/sys/amd64/amd64/sigtramp.s#6 delete .. //depot/projects/hammer/sys/amd64/amd64/support.S#1 branch .. //depot/projects/hammer/sys/amd64/amd64/support.s#6 delete .. //depot/projects/hammer/sys/amd64/amd64/swtch.s#6 delete .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/hammer/sys/amd64/isa/icu_ipl.s#6 delete .. //depot/projects/hammer/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/hammer/sys/amd64/isa/icu_vector.s#6 delete .. //depot/projects/hammer/sys/amd64/isa/vector.S#1 branch .. //depot/projects/hammer/sys/amd64/isa/vector.s#6 delete .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/hammer/sys/conf/files.amd64#7 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/hammer/sys/sys/disklabel.h#10 integrate .. //depot/projects/hammer/usr.bin/xlint/arch/amd64/targparam.h#2 integrate Differences ... ==== //depot/projects/hammer/etc/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.311 2003/05/02 05:27:33 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -12,7 +12,7 @@ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ phones printcap profile protocols \ - rc rc.firewall rc.firewall6 rc.shutdown \ + rc rc.firewall rc.firewall6 rc.sendmail rc.shutdown \ rc.subr remote rpc services \ shells sysctl.conf syslog.conf usbd.conf \ etc.${MACHINE_ARCH}/ttys \ ==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#3 (text+ko) ==== @@ -54,7 +54,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.85 2003/05/02 20:14:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.86 2003/05/02 22:46:44 phk Exp $"); #include #include @@ -413,7 +413,8 @@ (void)lseek(f, (off_t)0, SEEK_SET); if (read(f, bootarea, BBSIZE) < BBSIZE) err(4, "%s", specname); - bsd_disklabel_le_dec((u_char *)bootarea + labeloffset, &lab); + bsd_disklabel_le_dec((u_char *)bootarea + labeloffset, &lab, + MAXPARTITIONS); return (&lab); } ==== //depot/projects/hammer/sys/cam/scsi/scsi_da.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.141 2003/05/01 05:16:13 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.142 2003/05/03 00:21:40 ken Exp $ */ #ifdef _KERNEL @@ -1548,8 +1548,8 @@ softc->state = DA_STATE_PROBE2; free(rdcap, M_TEMP); xpt_release_ccb(done_ccb); - cam_periph_unlock(periph); - break; + xpt_schedule(periph, /*priority*/5); + return; } } else { block_size = scsi_4btoul(rcaplong->length); ==== //depot/projects/hammer/sys/conf/files.amd64#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.11 2003/05/01 02:59:24 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.12 2003/05/03 00:19:42 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -33,21 +33,21 @@ amd64/amd64/autoconf.c standard amd64/amd64/busdma_machdep.c standard +amd64/amd64/cpu_swtch.S standard amd64/amd64/critical.c standard amd64/amd64/dump_machdep.c standard amd64/amd64/elf_machdep.c standard -amd64/amd64/exception.s standard +amd64/amd64/exception.S standard amd64/amd64/identcpu.c standard amd64/amd64/initcpu.c standard amd64/amd64/legacy.c standard -amd64/amd64/locore.s standard no-obj +amd64/amd64/locore.S standard no-obj amd64/amd64/machdep.c standard amd64/amd64/mem.c standard amd64/amd64/nexus.c standard amd64/amd64/pmap.c standard -amd64/amd64/sigtramp.s standard -amd64/amd64/support.s standard -amd64/amd64/swtch.s standard +amd64/amd64/sigtramp.S standard +amd64/amd64/support.S standard amd64/amd64/sys_machdep.c standard amd64/amd64/trap.c standard amd64/amd64/tsc.c standard ==== //depot/projects/hammer/sys/geom/geom_bsd.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.52 2003/05/02 06:33:59 phk Exp $ + * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.53 2003/05/02 22:46:13 phk Exp $ * * This is the method for dealing with BSD disklabels. It has been * extensively (by my standards at least) commented, in the vain hope that @@ -58,6 +58,8 @@ #define ALPHA_LABEL_OFFSET 64 +#define LABELSIZE (148 + 16 * MAXPARTITIONS) + static void g_bsd_hotwrite(void *arg, int flag); /* * Our private data about one instance. All the rest is handled by the @@ -69,123 +71,16 @@ off_t mbroffset; off_t rawoffset; struct disklabel ondisk; - struct disklabel inram; + u_char label[LABELSIZE]; u_char labelsum[16]; }; -static int -g_bsd_ondisk_size(void) -{ - return (148 + 16 * MAXPARTITIONS); -} - -/* - * For reasons which were valid and just in their days, FreeBSD/i386 uses - * absolute disk-addresses in disklabels. The way it works is that the - * p_offset field of all partitions have the first sector number of the - * disk slice added to them. This was hidden kernel-magic, userland did - * not see these offsets. These two functions subtract and add them - * while converting from the "ondisk" to the "inram" labels and vice - * versa. - */ -static void -ondisk2inram(struct g_bsd_softc *sc) -{ - struct partition *ppp; - struct disklabel *dl; - int i; - - sc->inram = sc->ondisk; - dl = &sc->inram; - - /* Basic sanity-check needed to avoid mistakes. */ - if (dl->d_magic != DISKMAGIC || dl->d_magic2 != DISKMAGIC) - return; - if (dl->d_npartitions > MAXPARTITIONS) - return; - - sc->rawoffset = dl->d_partitions[RAW_PART].p_offset; - for (i = 0; i < dl->d_npartitions; i++) { - ppp = &dl->d_partitions[i]; - if (ppp->p_size != 0 && ppp->p_offset < sc->rawoffset) - sc->rawoffset = 0; - } - if (sc->rawoffset > 0) { - for (i = 0; i < dl->d_npartitions; i++) { - ppp = &dl->d_partitions[i]; - if (ppp->p_offset != 0) - ppp->p_offset -= sc->rawoffset; - } - } - dl->d_checksum = 0; - dl->d_checksum = dkcksum(&sc->inram); -} - -static void -inram2ondisk(struct g_bsd_softc *sc) -{ - struct partition *ppp; - int i; - - sc->ondisk = sc->inram; - if (sc->mbroffset != 0) - sc->rawoffset = sc->mbroffset / sc->inram.d_secsize; - if (sc->rawoffset != 0) { - for (i = 0; i < sc->inram.d_npartitions; i++) { - ppp = &sc->ondisk.d_partitions[i]; - if (ppp->p_size > 0) - ppp->p_offset += sc->rawoffset; - else - ppp->p_offset = 0; - } - } - sc->ondisk.d_checksum = 0; - sc->ondisk.d_checksum = dkcksum(&sc->ondisk); -} - -/* - * Check that this looks like a valid disklabel, but be prepared - * to get any kind of junk. The checksum must be checked only - * after this function returns success to prevent a bogus d_npartitions - * value from tripping us up. - */ -static int -g_bsd_checklabel(struct disklabel *dl) -{ - struct partition *ppp; - int i; - - if (dl->d_magic != DISKMAGIC || dl->d_magic2 != DISKMAGIC) - return (EINVAL); - /* - * If the label specifies more partitions than we can handle - * we have to reject it: If people updated the label they would - * trash it, and that would break the checksum. - */ - if (dl->d_npartitions > MAXPARTITIONS) - return (EINVAL); - - for (i = 0; i < dl->d_npartitions; i++) { - ppp = &dl->d_partitions[i]; - /* Cannot extend past unit. */ - if (ppp->p_size != 0 && - ppp->p_offset + ppp->p_size > dl->d_secperunit) { - return (EINVAL); - } - } - return (0); -} - /* * Modify our slicer to match proposed disklabel, if possible. - * First carry out all the simple checks, then lock topology - * and check that no open providers are affected negatively - * then carry out all the changes. - * - * NB: Returns with topology held only if successful return. + * This is where we make sure we don't do something stupid. */ static int -g_bsd_modify(struct g_geom *gp, struct disklabel *dl) +g_bsd_modify(struct g_geom *gp, u_char *label) { int i, error; struct partition *ppp; @@ -193,33 +88,25 @@ struct g_consumer *cp; struct g_bsd_softc *ms; u_int secsize, u; - off_t mediasize; + off_t mediasize, rawoffset, o; + struct disklabel dl; + MD5_CTX md5sum; + + g_topology_assert(); + gsp = gp->softc; + ms = gsp->softc; - /* Basic check that this is indeed a disklabel. */ - error = g_bsd_checklabel(dl); - if (error) + error = bsd_disklabel_le_dec(label, &dl, MAXPARTITIONS); + if (error) { +printf("HERE %s %d\n", __FILE__, __LINE__); return (error); + } - /* Make sure the checksum is OK. */ - if (dkcksum(dl) != 0) - return (EINVAL); - /* Get dimensions of our device. */ cp = LIST_FIRST(&gp->consumer); secsize = cp->provider->sectorsize; mediasize = cp->provider->mediasize; -#ifdef nolonger - /* - * The raw-partition must start at zero. We do not check that the - * size == mediasize because this is overly restrictive. We have - * already tested in g_bsd_checklabel() that it is not longer. - * XXX: RAW_PART is archaic anyway, and we should drop it. - */ - if (dl->d_partitions[RAW_PART].p_offset != 0) - return (EINVAL); -#endif - #ifdef notyet /* * Indications are that the d_secperunit is not correctly @@ -229,71 +116,80 @@ * may be in order. */ /* The label cannot claim a larger size than the media. */ - if ((off_t)dl->d_secperunit * dl->d_secsize > mediasize) + if ((off_t)dl.d_secperunit * dl.d_secsize > mediasize) return (EINVAL); #endif - /* ... or a smaller sector size. */ - if (dl->d_secsize < secsize) + if (dl.d_secsize < secsize) { +printf("HERE %s %d\n", __FILE__, __LINE__); return (EINVAL); + } /* ... or a non-multiple sector size. */ - if (dl->d_secsize % secsize != 0) + if (dl.d_secsize % secsize != 0) { +printf("HERE %s %d\n", __FILE__, __LINE__); return (EINVAL); + } + + /* Historical braindamage... */ + rawoffset = (off_t)dl.d_partitions[RAW_PART].p_offset * dl.d_secsize; + for (i = 0; i < dl.d_npartitions; i++) { + ppp = &dl.d_partitions[i]; + if (ppp->p_size == 0) + continue; + o = (off_t)ppp->p_offset * dl.d_secsize; - g_topology_lock(); + if (o < rawoffset) + rawoffset = 0; + } /* Don't munge open partitions. */ - gsp = gp->softc; - ms = gsp->softc; - for (i = 0; i < dl->d_npartitions; i++) { - ppp = &dl->d_partitions[i]; + for (i = 0; i < dl.d_npartitions; i++) { + ppp = &dl.d_partitions[i]; + o = (off_t)ppp->p_offset * dl.d_secsize; + if (o == 0) + o = rawoffset; error = g_slice_config(gp, i, G_SLICE_CONFIG_CHECK, - (off_t)ppp->p_offset * dl->d_secsize, - (off_t)ppp->p_size * dl->d_secsize, - dl->d_secsize, + o - rawoffset, + (off_t)ppp->p_size * dl.d_secsize, + dl.d_secsize, "%s%c", gp->name, 'a' + i); - if (error) { - g_topology_unlock(); + if (error) return (error); - } } /* Look good, go for it... */ for (u = 0; u < gsp->nslice; u++) { - ppp = &dl->d_partitions[u]; + ppp = &dl.d_partitions[u]; + o = (off_t)ppp->p_offset * dl.d_secsize; + if (o == 0) + o = rawoffset; g_slice_config(gp, u, G_SLICE_CONFIG_SET, - (off_t)ppp->p_offset * dl->d_secsize, - (off_t)ppp->p_size * dl->d_secsize, - dl->d_secsize, + o - rawoffset, + (off_t)ppp->p_size * dl.d_secsize, + dl.d_secsize, "%s%c", gp->name, 'a' + u); } - g_slice_conf_hot(gp, 0, ms->labeloffset, g_bsd_ondisk_size(), - G_SLICE_HOT_ALLOW, G_SLICE_HOT_DENY, G_SLICE_HOT_CALL); - gsp->hot = g_bsd_hotwrite; - return (0); -} + + /* Update our softc */ + ms->ondisk = dl; + if (label != ms->label) + bcopy(label, ms->label, LABELSIZE); + ms->rawoffset = rawoffset; -/* - * Calculate a disklabel checksum for a little-endian byte-stream. - * We need access to the decoded disklabel because the checksum only - * covers the partition data for the first d_npartitions. - */ -static int -g_bsd_lesum(struct disklabel *dl, u_char *p) -{ - u_char *pe; - uint16_t sum; + /* + * In order to avoid recursively attaching to the same + * on-disk label (it's usually visible through the 'c' + * partition) we calculate an MD5 and ask if other BSD's + * below us love that label. If they do, we don't. + */ + MD5Init(&md5sum); + MD5Update(&md5sum, ms->label, sizeof(ms->label)); + MD5Final(ms->labelsum, &md5sum); - pe = p + 148 + 16 * dl->d_npartitions; - sum = 0; - while (p < pe) { - sum ^= le16dec(p); - p += 2; - } - return (sum); + return (0); } /* @@ -323,18 +219,10 @@ /* Decode into our native format. */ dl = &ms->ondisk; - bsd_disklabel_le_dec(buf + secoff, dl); + error = bsd_disklabel_le_dec(buf + secoff, dl, MAXPARTITIONS); + if (!error) + bcopy(buf + secoff, ms->label, LABELSIZE); - ondisk2inram(ms); - - dl = &ms->inram; - /* Does it look like a label at all? */ - if (g_bsd_checklabel(dl)) - error = ENOENT; - /* ... and does the raw data have a good checksum? */ - if (error == 0 && g_bsd_lesum(dl, buf + secoff) != 0) - error = ENOENT; - /* Remember to free the buffer g_read_data() gave us. */ g_free(buf); @@ -357,47 +245,41 @@ struct g_geom *gp; struct g_slicer *gsp; struct g_bsd_softc *ms; - struct disklabel *dl; struct g_ioctl *gio; struct g_consumer *cp; - u_char *buf; + u_char *buf, *label; off_t secoff; u_int secsize; int error, i; uint64_t sum; + g_topology_assert(); bp = arg; if (flag == EV_CANCEL) { g_io_deliver(bp, ENXIO); return; } - /* We don't need topology for now. */ - g_topology_unlock(); gp = bp->bio_to->geom; gsp = gp->softc; ms = gsp->softc; gio = (struct g_ioctl *)bp->bio_data; + label = g_malloc(LABELSIZE, M_WAITOK); + /* The disklabel to set is the ioctl argument. */ - dl = gio->data; + bsd_disklabel_le_enc(label, gio->data); /* Validate and modify our slice instance to match. */ - error = g_bsd_modify(gp, dl); /* Picks up topology lock on success. */ - if (error) { - g_topology_lock(); + error = g_bsd_modify(gp, label); /* Picks up topology lock on success. */ + g_free(label); + if (error || gio->cmd == DIOCSDINFO) { g_io_deliver(bp, error); return; } - /* Update our copy of the disklabel. */ - ms->inram = *dl; - inram2ondisk(ms); + + KASSERT(gio->cmd == DIOCWDINFO, ("Unknown ioctl in g_bsd_ioctl")); - if (gio->cmd == DIOCSDINFO) { - g_io_deliver(bp, 0); - return; - } - KASSERT(gio->cmd == DIOCWDINFO, ("Unknown ioctl in g_bsd_ioctl")); cp = LIST_FIRST(&gp->consumer); /* Get sector size, we need it to read data. */ secsize = cp->provider->sectorsize; @@ -407,8 +289,7 @@ g_io_deliver(bp, error); return; } - dl = &ms->ondisk; - bsd_disklabel_le_enc(buf + secoff, dl); + bcopy(ms->label, buf + secoff, sizeof(ms->label)); if (ms->labeloffset == ALPHA_LABEL_OFFSET) { sum = 0; for (i = 0; i < 63; i++) @@ -430,7 +311,6 @@ struct g_geom *gp; struct g_slicer *gsp; struct g_bsd_softc *ms; - struct disklabel *dl; struct g_consumer *cp; u_char *buf; void *p; @@ -447,33 +327,26 @@ buf = g_malloc(BBSIZE, M_WAITOK); p = *(void **)data; error = copyin(p, buf, BBSIZE); - if (error) { - g_free(buf); - return (error); - } - /* The disklabel to set is the ioctl argument. */ - dl = (void *)(buf + ms->labeloffset); - - DROP_GIANT(); - - /* Validate and modify our slice instance to match. */ - error = g_bsd_modify(gp, dl); /* Picks up topology lock on success. */ if (!error) { - cp = LIST_FIRST(&gp->consumer); - secsize = cp->provider->sectorsize; - dl = &ms->ondisk; - bsd_disklabel_le_enc(buf + ms->labeloffset, dl); - if (ms->labeloffset == ALPHA_LABEL_OFFSET) { - sum = 0; - for (i = 0; i < 63; i++) - sum += le64dec(buf + i * 8); - le64enc(buf + 504, sum); + DROP_GIANT(); + g_topology_lock(); + /* Validate and modify our slice instance to match. */ + error = g_bsd_modify(gp, buf + ms->labeloffset); + if (!error) { + cp = LIST_FIRST(&gp->consumer); + secsize = cp->provider->sectorsize; + if (ms->labeloffset == ALPHA_LABEL_OFFSET) { + sum = 0; + for (i = 0; i < 63; i++) + sum += le64dec(buf + i * 8); + le64enc(buf + 504, sum); + } + error = g_write_data(cp, 0, buf, BBSIZE); } - error = g_write_data(cp, 0, buf, BBSIZE); g_topology_unlock(); + PICKUP_GIANT(); } g_free(buf); - PICKUP_GIANT(); return (error); } @@ -490,10 +363,10 @@ struct g_slicer *gsp; struct g_slice *gsl; struct g_bsd_softc *ms; - struct g_bsd_softc fake; u_char *p; int error; + g_topology_assert(); /* * We should never get canceled, because that would amount to a removal * of the geom while there was outstanding I/O requests. @@ -506,28 +379,11 @@ gsl = &gsp->slices[bp->bio_to->index]; p = (u_char*)bp->bio_data + ms->labeloffset - (bp->bio_offset + gsl->offset); - bsd_disklabel_le_dec(p, &fake.ondisk); - - ondisk2inram(&fake); - if (g_bsd_checklabel(&fake.inram)) { - g_io_deliver(bp, EPERM); - return; - } - if (g_bsd_lesum(&fake.ondisk, p) != 0) { - g_io_deliver(bp, EPERM); - return; - } - g_topology_unlock(); - error = g_bsd_modify(gp, &fake.inram); /* May pick up topology. */ + error = g_bsd_modify(gp, p); if (error) { g_io_deliver(bp, EPERM); - g_topology_lock(); return; } - /* Update our copy of the disklabel. */ - ms->inram = fake.inram; - inram2ondisk(ms); - bsd_disklabel_le_enc(p, &ms->ondisk); g_slice_finish_hot(bp); } @@ -577,7 +433,7 @@ switch (gio->cmd) { case DIOCGDINFO: /* Return a copy of the disklabel to userland. */ - bcopy(&ms->inram, gio->data, sizeof(ms->inram)); + bsd_disklabel_le_dec(ms->label, gio->data, MAXPARTITIONS); g_io_deliver(bp, 0); return (1); case DIOCBSDBB: @@ -629,10 +485,10 @@ } else if (pp != NULL) { if (indent == NULL) sbuf_printf(sb, " ty %d", - ms->inram.d_partitions[pp->index].p_fstype); + ms->ondisk.d_partitions[pp->index].p_fstype); else sbuf_printf(sb, "%s%d\n", indent, - ms->inram.d_partitions[pp->index].p_fstype); + ms->ondisk.d_partitions[pp->index].p_fstype); } } @@ -663,11 +519,10 @@ struct g_consumer *cp; int error, i; struct g_bsd_softc *ms; - struct disklabel *dl; u_int secsize; struct g_slicer *gsp; + u_char hash[16]; MD5_CTX md5sum; - u_char hash[16]; g_trace(G_T_TOPOLOGY, "bsd_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); @@ -691,13 +546,6 @@ return (NULL); /* - * Now that we have attached to and opened our provider, we do - * not need the topology lock until we change the topology again - * next time. - */ - g_topology_unlock(); - - /* * Fill in the optional details, in our case we have a dumpconf * routine which the "slice" code should call at the right time */ @@ -759,10 +607,8 @@ * partition) we calculate an MD5 and ask if other BSD's * below us love that label. If they do, we don't. */ - - dl = &ms->inram; MD5Init(&md5sum); - MD5Update(&md5sum, (u_char *)dl, sizeof(dl)); + MD5Update(&md5sum, ms->label, sizeof(ms->label)); MD5Final(ms->labelsum, &md5sum); error = g_getattr("BSD::labelsum", cp, &hash); @@ -773,19 +619,19 @@ * Process the found disklabel, and modify our "slice" * instance to match it, if possible. */ - error = g_bsd_modify(gp, dl); /* Picks up topology lock. */ - if (!error) - g_topology_unlock(); - break; + error = g_bsd_modify(gp, ms->label); } while (0); /* Success or failure, we can close our provider now. */ - g_topology_lock(); error = g_access_rel(cp, -1, 0, 0); /* If we have configured any providers, return the new geom. */ - if (gsp->nprovider > 0) + if (gsp->nprovider > 0) { + g_slice_conf_hot(gp, 0, ms->labeloffset, LABELSIZE, + G_SLICE_HOT_ALLOW, G_SLICE_HOT_DENY, G_SLICE_HOT_CALL); + gsp->hot = g_bsd_hotwrite; return (gp); + } /* * ...else push the "self-destruct" button, by spoiling our own * consumer. This triggers a call to g_slice_spoiled which will ==== //depot/projects/hammer/sys/geom/geom_bsd_enc.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_bsd_enc.c,v 1.2 2003/05/02 19:53:55 phk Exp $ + * $FreeBSD: src/sys/geom/geom_bsd_enc.c,v 1.3 2003/05/02 22:46:13 phk Exp $ * * Functions to encode and decode struct disklabel and struct partition into * a bytestream of little endianess and correct packing. @@ -44,10 +44,12 @@ #include #include #include +#include #ifdef _KERNEL #include #else #include +#include #endif void @@ -61,12 +63,38 @@ d->p_cpg = le16dec(ptr + 14); } -void -bsd_disklabel_le_dec(u_char *ptr, struct disklabel *d) +int +bsd_disklabel_le_dec(u_char *ptr, struct disklabel *d, int maxpart) { int i; + u_char *p, *pe; + uint16_t sum; d->d_magic = le32dec(ptr + 0); + if (d->d_magic != DISKMAGIC) + return(EINVAL); + + d->d_magic2 = le32dec(ptr + 132); + if (d->d_magic2 != DISKMAGIC) { +printf("HERE %s %d\n", __FILE__, __LINE__); + return(EINVAL); + } + + d->d_npartitions = le16dec(ptr + 138); + if (d->d_npartitions > maxpart) { +printf("HERE %s %d\n", __FILE__, __LINE__); + return(EINVAL); + } + + pe = ptr + 148 + 16 * d->d_npartitions; + sum = 0; + for (p = ptr; p < pe; p += 2) + sum ^= le16dec(p); + if (sum != 0) { +printf("HERE %s %d\n", __FILE__, __LINE__); + return(EINVAL); + } + d->d_type = le16dec(ptr + 4); d->d_subtype = le16dec(ptr + 6); bcopy(ptr + 8, d->d_typename, 16); @@ -97,13 +125,13 @@ d->d_spare[2] = le32dec(ptr + 120); d->d_spare[3] = le32dec(ptr + 124); d->d_spare[4] = le32dec(ptr + 128); - d->d_magic2 = le32dec(ptr + 132); d->d_checksum = le16dec(ptr + 136); d->d_npartitions = le16dec(ptr + 138); d->d_bbsize = le32dec(ptr + 140); d->d_sbsize = le32dec(ptr + 144); for (i = 0; i < MAXPARTITIONS; i++) bsd_partition_le_dec(ptr + 148 + 16 * i, &d->d_partitions[i]); + return(0); } void @@ -121,6 +149,8 @@ bsd_disklabel_le_enc(u_char *ptr, struct disklabel *d) { int i; + u_char *p, *pe; + uint16_t sum; le32enc(ptr + 0, d->d_magic); le16enc(ptr + 4, d->d_type); @@ -154,10 +184,15 @@ le32enc(ptr + 124, d->d_spare[3]); le32enc(ptr + 128, d->d_spare[4]); le32enc(ptr + 132, d->d_magic2); - le16enc(ptr + 136, d->d_checksum); + le16enc(ptr + 136, 0); le16enc(ptr + 138, d->d_npartitions); le32enc(ptr + 140, d->d_bbsize); le32enc(ptr + 144, d->d_sbsize); - for (i = 0; i < MAXPARTITIONS; i++) + for (i = 0; i < d->d_npartitions; i++) bsd_partition_le_enc(ptr + 148 + 16 * i, &d->d_partitions[i]); + pe = ptr + 148 + 16 * d->d_npartitions; + sum = 0; + for (p = ptr; p < pe; p += 2) + sum ^= le16dec(p); + le16enc(ptr + 136, sum); } ==== //depot/projects/hammer/sys/sys/disklabel.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/disklabel.h,v 1.101 2003/04/17 07:39:03 phk Exp $ + * $FreeBSD: src/sys/sys/disklabel.h,v 1.102 2003/05/02 22:46:13 phk Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -305,7 +305,7 @@ * bytestring. */ void bsd_partition_le_dec(u_char *ptr, struct partition *d); -void bsd_disklabel_le_dec(u_char *ptr, struct disklabel *d); +int bsd_disklabel_le_dec(u_char *ptr, struct disklabel *d, int maxpart); void bsd_partition_le_enc(u_char *ptr, struct partition *d); void bsd_disklabel_le_enc(u_char *ptr, struct disklabel *d); ==== //depot/projects/hammer/usr.bin/xlint/arch/amd64/targparam.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: targparam.h,v 1.1 2002/01/18 20:39:22 thorpej Exp $ */ +/* $NetBSD: targparam.h,v 1.2 2002/01/30 06:55:00 thorpej Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl From owner-p4-projects@FreeBSD.ORG Fri May 2 17:58:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4459337B404; Fri, 2 May 2003 17:58:40 -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 EF1E937B401 for ; Fri, 2 May 2003 17:58:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8437B43FAF for ; Fri, 2 May 2003 17:58:39 -0700 (PDT) (envelope-from jmallett@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 h430wd0U065200 for ; Fri, 2 May 2003 17:58:39 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h430wcNT065197 for perforce@freebsd.org; Fri, 2 May 2003 17:58:38 -0700 (PDT) Date: Fri, 2 May 2003 17:58:38 -0700 (PDT) Message-Id: <200305030058.h430wcNT065197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30428 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: Sat, 03 May 2003 00:58:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30428 Change 30428 by jmallett@jmallett_dalek on 2003/05/02 17:58:14 Make it possible to build with invariants+witness+so-on. This means that now everything has warnings, yay! Time to split up locore.h into cpufunc.h and other places where it should be. Yay for NetBSD grottiness, yay! Affected files ... .. //depot/projects/mips/sys/mips/include/cpu.h#10 edit .. //depot/projects/mips/sys/mips/include/cpufunc.h#7 edit .. //depot/projects/mips/sys/mips/mips/cache.c#3 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#19 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpu.h#10 (text+ko) ==== @@ -53,6 +53,7 @@ #define CLKF_INTR(framep) (0) #define TRAPF_PC(tframe) ((tframe)->tf_regs[TF_EPC]) +#define TRAPF_USERMODE(tframe) ((tframe)->tf_regs[TF_SR] & MIPS_SR_KSU_USER) #define cpu_getstack(p) (0) #define cpu_setstack(p, sp) (0) ==== //depot/projects/mips/sys/mips/include/cpufunc.h#7 (text+ko) ==== @@ -31,6 +31,19 @@ #ifdef _KERNEL #include +#include + +static __inline register_t +intr_disable(void) +{ + register_t s; + + s = mips_cp0_status_read(); + mips_cp0_status_write((s = mips_cp0_status_read()) & ~MIPS_SR_IE); + return (s); +} + +#define intr_restore(s) mips_cp0_status_write((s)) static __inline void mips_break(void) ==== //depot/projects/mips/sys/mips/mips/cache.c#3 (text+ko) ==== @@ -226,7 +226,7 @@ { int csizebase = MIPS3_CONFIG_C_DEFBASE; - KASSERT(PAGE_SIZE != 0, "sane page size"); + KASSERT(PAGE_SIZE != 0, ("sane page size")); /* * Configure primary caches. @@ -383,7 +383,7 @@ */ if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4600 && MIPS_PRID_REV_MAJ(cpu_id) == 1) { - KASSERT(mips_pdcache_line_size == 32, "line size 32"); + KASSERT(mips_pdcache_line_size == 32, ("line size 32")); mips_cache_ops.mco_pdcache_wbinv_range = r4600v1_pdcache_wbinv_range_32; mips_cache_ops.mco_pdcache_inv_range = @@ -392,7 +392,7 @@ r4600v1_pdcache_wb_range_32; } else if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4600 && MIPS_PRID_REV_MAJ(cpu_id) == 2) { - KASSERT(mips_pdcache_line_size == 32, "line size 32"); + KASSERT(mips_pdcache_line_size == 32, ("line size 32")); mips_cache_ops.mco_pdcache_wbinv_range = r4600v2_pdcache_wbinv_range_32; mips_cache_ops.mco_pdcache_inv_range = @@ -406,7 +406,7 @@ */ if (MIPS_PRID_IMPL(cpu_id) == MIPS_R4100 && MIPS_PRID_REV_MAJ(cpu_id) == 8) { - KASSERT(mips_pdcache_line_size == 16, "line size 16"); + KASSERT(mips_pdcache_line_size == 16, ("line size 16")); mips_cache_ops.mco_pdcache_wbinv_range = vr4131v1_pdcache_wbinv_range_16; } @@ -422,12 +422,12 @@ * Compute the "way mask" for each cache. */ if (mips_picache_size) { - KASSERT(mips_picache_ways != 0, "sane ways"); + KASSERT(mips_picache_ways != 0, ("sane ways")); mips_picache_way_size = (mips_picache_size / mips_picache_ways); mips_picache_way_mask = mips_picache_way_size - 1; } if (mips_pdcache_size) { - KASSERT(mips_pdcache_ways != 0, "sane ways"); + KASSERT(mips_pdcache_ways != 0, ("sane ways")); mips_pdcache_way_size = (mips_pdcache_size / mips_pdcache_ways); mips_pdcache_way_mask = mips_pdcache_way_size - 1; } @@ -536,7 +536,7 @@ * Compute the "way mask" for each secondary cache. */ if (mips_sdcache_size) { - KASSERT(mips_sdcache_ways != 0, "sane ways"); + KASSERT(mips_sdcache_ways != 0, ("sane ways")); mips_sdcache_way_size = (mips_sdcache_size / mips_sdcache_ways); mips_sdcache_way_mask = mips_sdcache_way_size - 1; } ==== //depot/projects/mips/sys/mips/mips/machdep.c#19 (text+ko) ==== @@ -552,6 +552,9 @@ /* MIPS32/MIPS64 interrupt exception handler */ extern char mips64_intr[], mips64_intrEnd[]; + /* XXX I want ARCS to be my friend */ + return; + /* * Copy down exception vector code. */ @@ -826,10 +829,10 @@ "dmesg lines.\n", label); } - KASSERT(mips_picache_ways < nwaynames, "picache ways < nwaynames"); - KASSERT(mips_pdcache_ways < nwaynames, "pdcache ways < nwaynames"); - KASSERT(mips_sicache_ways < nwaynames, "sicache ways < nwaynames"); - KASSERT(mips_sdcache_ways < nwaynames, "sdcache ways < nwaynames"); + KASSERT(mips_picache_ways < nwaynames, ("picache ways < nwaynames")); + KASSERT(mips_pdcache_ways < nwaynames, ("pdcache ways < nwaynames")); + KASSERT(mips_sicache_ways < nwaynames, ("sicache ways < nwaynames")); + KASSERT(mips_sdcache_ways < nwaynames, ("sdcache ways < nwaynames")); switch (cpu_arch) { case CPU_ARCH_MIPS3: From owner-p4-projects@FreeBSD.ORG Fri May 2 19:40:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1965537B404; Fri, 2 May 2003 19:40:49 -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 AE1A837B401 for ; Fri, 2 May 2003 19:40:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4609943F3F for ; Fri, 2 May 2003 19:40:48 -0700 (PDT) (envelope-from jmallett@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 h432em0U072267 for ; Fri, 2 May 2003 19:40:48 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h432elND072264 for perforce@freebsd.org; Fri, 2 May 2003 19:40:47 -0700 (PDT) Date: Fri, 2 May 2003 19:40:47 -0700 (PDT) Message-Id: <200305030240.h432elND072264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30435 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: Sat, 03 May 2003 02:40:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30435 Change 30435 by jmallett@jmallett_dalek on 2003/05/02 19:40:13 Erk, remove redundant call to cp0_status_read. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#8 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#8 (text+ko) ==== @@ -38,7 +38,6 @@ { register_t s; - s = mips_cp0_status_read(); mips_cp0_status_write((s = mips_cp0_status_read()) & ~MIPS_SR_IE); return (s); } From owner-p4-projects@FreeBSD.ORG Fri May 2 19:42:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29B0237B404; Fri, 2 May 2003 19:42:52 -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 BA6CC37B401 for ; Fri, 2 May 2003 19:42:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 662BA43FA3 for ; Fri, 2 May 2003 19:42:51 -0700 (PDT) (envelope-from jmallett@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 h432gp0U072315 for ; Fri, 2 May 2003 19:42:51 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h432goDI072312 for perforce@freebsd.org; Fri, 2 May 2003 19:42:50 -0700 (PDT) Date: Fri, 2 May 2003 19:42:50 -0700 (PDT) Message-Id: <200305030242.h432goDI072312@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30436 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: Sat, 03 May 2003 02:42:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=30436 Change 30436 by jmallett@jmallett_dalek on 2003/05/02 19:42:03 Add witness, and invariants, now that we can build them. Affected files ... .. //depot/projects/mips/sys/mips/conf/GENERIC#13 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/GENERIC#13 (text+ko) ==== @@ -22,6 +22,13 @@ options ARCBIOS64 #ARCBIOS uses 64-bit pointers in #structures. Disable for IP22. +# Debugging for use in -current +#options DDB #Enable the kernel debugger +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed + options SCHED_4BSD #A scheduler, if you please # Other options From owner-p4-projects@FreeBSD.ORG Sat May 3 00:14:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C69C637B404; Sat, 3 May 2003 00:14:27 -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 5FEDE37B401 for ; Sat, 3 May 2003 00:14:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEC2B43F75 for ; Sat, 3 May 2003 00:14:26 -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 h437EQ0U095408 for ; Sat, 3 May 2003 00:14:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h437EQvC095405 for perforce@freebsd.org; Sat, 3 May 2003 00:14:26 -0700 (PDT) Date: Sat, 3 May 2003 00:14:26 -0700 (PDT) Message-Id: <200305030714.h437EQvC095405@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 30446 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: Sat, 03 May 2003 07:14:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=30446 Change 30446 by peter@peter_overcee on 2003/05/03 00:13:45 IFC @30445 Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#8 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#3 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.h#5 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#5 integrate Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.12 2003/05/03 00:19:42 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.13 2003/05/03 03:30:29 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -33,7 +33,7 @@ amd64/amd64/autoconf.c standard amd64/amd64/busdma_machdep.c standard -amd64/amd64/cpu_swtch.S standard +amd64/amd64/cpu_switch.S standard amd64/amd64/critical.c standard amd64/amd64/dump_machdep.c standard amd64/amd64/elf_machdep.c standard ==== //depot/projects/hammer/sys/dev/ct/ct_isa.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.6 2002/09/20 18:15:40 phk Exp $ */ +/* $FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.7 2003/05/03 02:04:58 nyan Exp $ */ /* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */ /* $NetBSD$ */ @@ -142,6 +142,15 @@ if (ISA_PNP_PROBE(device_get_parent(dev), dev, ct_pnp_ids) == ENXIO) return ENXIO; + switch (isa_get_logicalid(dev)) { + case 0x0100e7b1: /* LHA-301 */ + case 0x110154dc: /* SC-98III */ + case 0x4120acb4: /* IFC-NN */ + /* XXX - force to SMIT mode */ + device_set_flags(dev, device_get_flags(dev) | 0x40000); + break; + } + if (isa_get_port(dev) == -1) bus_set_resource(dev, SYS_RES_IOPORT, 0, BSHW_IOBASE, BSHW_IOSZ); ==== //depot/projects/hammer/sys/dev/snc/dp83932subr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.4 2002/03/20 02:07:42 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.5 2003/05/03 01:47:38 nyan Exp $ */ /* $NecBSD: dp83932subr.c,v 1.5.6.2 1999/10/09 05:47:23 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -629,7 +629,7 @@ if (size > 3) { if (noffset & 3) { - size_t asize = (~noffset & 3); + size_t asize = 4 - (noffset & 3); bus_space_read_region_1(memt, memh, noffset, bptr, asize); @@ -670,7 +670,7 @@ if (size > 3) { if (noffset & 3) { - size_t asize = (~noffset & 3); + size_t asize = 4 - (noffset & 3); bus_space_write_region_1(memt, memh, noffset, bptr, asize); @@ -712,7 +712,7 @@ if (size > 3) { if (noffset & 3) { - size_t asize = (~noffset & 3); + size_t asize = 4 - (noffset & 3); bus_space_set_region_1(memt, memh, noffset, 0, asize); noffset += asize; ==== //depot/projects/hammer/sys/vm/vm_object.c#16 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.281 2003/05/02 04:55:21 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.282 2003/05/03 04:21:16 alc Exp $ */ /* @@ -143,7 +143,6 @@ vm_object_t kmem_object; static struct vm_object kernel_object_store; static struct vm_object kmem_object_store; -extern int vm_pageout_page_count; static long object_collapses; static long object_bypasses; ==== //depot/projects/hammer/sys/vm/vm_pageout.h#5 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.35 2003/04/29 18:49:25 alc Exp $ + * $FreeBSD: src/sys/vm/vm_pageout.h,v 1.36 2003/05/03 04:21:16 alc Exp $ */ #ifndef _VM_VM_PAGEOUT_H_ @@ -79,6 +79,7 @@ extern int vm_pages_needed; /* should be some "event" structure */ extern int vm_pageout_pages_needed; extern int vm_pageout_deficit; +extern int vm_pageout_page_count; /* * Swap out requests ==== //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#5 (text+ko) ==== @@ -8,7 +8,7 @@ # Copyright 1998-2003 Douglas Barton # DougB@FreeBSD.org -# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.45 2003/05/02 11:07:58 dougb Exp $ +# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.46 2003/05/03 06:35:19 dougb Exp $ PATH=/bin:/usr/bin:/usr/sbin @@ -656,8 +656,8 @@ case "${PRESERVE_FILES}" in [Yy][Ee][Ss]) if [ -f "${3}/${2##*/}" ]; then - mkdir -p ${PRESERVE_FILES_DIR} - cp ${3}/${2##*/} ${PRESERVE_FILES_DIR} + mkdir -p ${PRESERVE_FILES_DIR}/${2%/*} + cp ${3}/${2##*/} ${PRESERVE_FILES_DIR}/${2%/*} fi ;; esac From owner-p4-projects@FreeBSD.ORG Sat May 3 00:35:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E24DE37B43D; Sat, 3 May 2003 00:35:55 -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 C3AA237B48C for ; Sat, 3 May 2003 00:35:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24E1E43FAF for ; Sat, 3 May 2003 00:35: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 h437Zr0U096457 for ; Sat, 3 May 2003 00:35:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h437Zrb4096454 for perforce@freebsd.org; Sat, 3 May 2003 00:35:53 -0700 (PDT) Date: Sat, 3 May 2003 00:35:53 -0700 (PDT) Message-Id: <200305030735.h437Zrb4096454@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 30448 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: Sat, 03 May 2003 07:35:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30448 Change 30448 by peter@peter_daintree on 2003/05/03 00:35:21 Add a cheap/nasty option ("NDA") to try and avoid accidently cut/pasting something I shouldn't. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#7 edit .. //depot/projects/hammer/sys/amd64/conf/GENERIC#5 edit .. //depot/projects/hammer/sys/conf/options.amd64#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#7 (text+ko) ==== @@ -98,7 +98,6 @@ char *brand; cpu_class = amd64_cpus[cpu].cpu_class; - printf("CPU: "); strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ @@ -129,9 +128,9 @@ * (also describes ``Features'' encodings. */ strcpy(cpu_model, "AMD "); - switch (cpu_id & 0xFF0) { + switch (cpu_id & 0xF00) { case 0xf00: - strcat(cpu_model, "Hammer"); + strcat(cpu_model, "AMD64 Processor"); break; default: strcat(cpu_model, "Unknown"); @@ -149,6 +148,10 @@ if (*brand != '\0') strcpy(cpu_model, brand); +#ifdef NDA + printf("CPU: %s AMD64 Class Processor\n", cpu_vendor); +#else + printf("CPU: "); printf("%s (", cpu_model); switch(cpu_class) { case CPUCLASS_K8: @@ -162,6 +165,7 @@ printf("Unknown"); /* will panic below... */ } printf("-class CPU)\n"); +#endif if(*cpu_vendor) printf(" Origin = \"%s\"",cpu_vendor); if(cpu_id) ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#5 (text+ko) ==== @@ -22,6 +22,7 @@ cpu HAMMER ident GENERIC maxusers 0 +options NDA #Avoid accidental cut/paste of NDA'ed stuff makeoptions NO_MODULES=not_yet ==== //depot/projects/hammer/sys/conf/options.amd64#7 (text+ko) ==== @@ -54,6 +54,7 @@ # EOF # ------------------------------- HAMMER opt_cpu.h +NDA opt_cpu.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h PSM_HOOKRESUME opt_psm.h From owner-p4-projects@FreeBSD.ORG Sat May 3 12:57:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47EA937B404; Sat, 3 May 2003 12:57:04 -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 D3A9537B401 for ; Sat, 3 May 2003 12:57:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D55A243F75 for ; Sat, 3 May 2003 12:57:02 -0700 (PDT) (envelope-from marcel@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 h43Jv20U068741 for ; Sat, 3 May 2003 12:57:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43Jv26B068738 for perforce@freebsd.org; Sat, 3 May 2003 12:57:02 -0700 (PDT) Date: Sat, 3 May 2003 12:57:02 -0700 (PDT) Message-Id: <200305031957.h43Jv26B068738@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30474 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: Sat, 03 May 2003 19:57:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=30474 Change 30474 by marcel@marcel_nfs on 2003/05/03 12:56:04 WARNING: deliberate incomplete commit. Implement a generic remote debug driver interface, also known as debug port. The interface mimics the console interface, and includes a linker set. Debugger initialization (moved to db_init()) will iterate over the dbgport driver set and select a device to use as the debug port, based on driver specific probing. Nothing too fancy, but extensible. On ia64 it will use the firmware provided HCDP table (yay!) The current approach allows any driver to become a debug port, not just sio(4). While here, start a whole new nextgen project (I need to be stopped). This includes: o The GDB interface is duplicated in each MD directory, even though only a small part is really MD (the registers). So, copy the core GDB support to ddb/db_gdb.c and have it use the new debug port "stuff". Functions and macros will be used to deal with platform specifics. This is not yet completed and is currently broken on all platforms. o Remove the linkmap handling from the linker. It's debugger dependent. Instead, have the linker call the debugger to notify it of the arrival and departure of kernel modules. The linker also calls the debugger to provide a pointer to put in DT_DEBUG for GDB to query. o With the linker calling the debugger, we can arrange for the debugger to call the linker to do symbol lookups. We now have the linker_file_t pointers we need to pass to the linker. This has to be implemented still. Of course, using the linker for symbol table lookups has it's downside: 1. You cannot do symbol lookups prior to linker initialization. This will be handled by having MD code pass relevant info to db_init(). (todo) 2. Debugging the linker may become too impractical. The best way to deal with this is to use GDB, so I'm not too worried about it. The upshot of course is that we can make DDB module aware. In fact, the existing syntax to specify which symbol table to look in for a symbol (using symtab:symbol) now automaticly applicable to modules. Of course this needs to be done still. Things that need to be done: o Add MD hooks to the GDB code. o Implement symbol table lookups using the linker. o Copy over the linkmap handling from the linker to DDB. o Add support for pre-linker symbol lookups. o Add debug port handling to zs(4) for sparc64. o Port this all to alpha, i386, ia64 and sparc64. o I need to get my brain examined. I must be loosing it. Affected files ... .. //depot/projects/sio/sys/alpha/alpha/alpha-gdbstub.c#2 delete .. //depot/projects/sio/sys/conf/files#4 edit .. //depot/projects/sio/sys/conf/files.alpha#3 edit .. //depot/projects/sio/sys/conf/files.i386#3 edit .. //depot/projects/sio/sys/conf/files.ia64#3 edit .. //depot/projects/sio/sys/conf/files.pc98#3 edit .. //depot/projects/sio/sys/ddb/db_command.c#2 edit .. //depot/projects/sio/sys/ddb/db_gdb.c#1 add .. //depot/projects/sio/sys/ddb/db_main.c#1 add .. //depot/projects/sio/sys/ddb/db_sym.c#2 edit .. //depot/projects/sio/sys/ddb/ddb.h#2 edit .. //depot/projects/sio/sys/dev/sio/sio.c#4 edit .. //depot/projects/sio/sys/dev/sio/sio_cons.c#3 edit .. //depot/projects/sio/sys/dev/sio/sio_dbg.c#1 add .. //depot/projects/sio/sys/dev/sio/sioreg.h#3 edit .. //depot/projects/sio/sys/dev/sio/siovar.h#4 edit .. //depot/projects/sio/sys/i386/i386/db_interface.c#2 edit .. //depot/projects/sio/sys/i386/i386/i386-gdbstub.c#2 delete .. //depot/projects/sio/sys/i386/i386/machdep.c#2 edit .. //depot/projects/sio/sys/i386/i386/sio_machdep.c#2 edit .. //depot/projects/sio/sys/i386/include/db_machdep.h#2 edit .. //depot/projects/sio/sys/ia64/ia64/db_interface.c#2 edit .. //depot/projects/sio/sys/ia64/ia64/ia64-gdbstub.c#2 delete .. //depot/projects/sio/sys/ia64/ia64/machdep.c#3 edit .. //depot/projects/sio/sys/ia64/ia64/sio_machdep.c#2 edit .. //depot/projects/sio/sys/kern/link_elf.c#2 edit Differences ... ==== //depot/projects/sio/sys/conf/files#4 (text+ko) ==== @@ -210,12 +210,12 @@ ddb/db_access.c optional ddb ddb/db_break.c optional ddb ddb/db_command.c optional ddb -ddb/db_elf.c optional ddb ddb/db_examine.c optional ddb ddb/db_expr.c optional ddb +ddb/db_gdb.c optional ddb ddb/db_input.c optional ddb -ddb/db_kld.c optional ddb ddb/db_lex.c optional ddb +ddb/db_main.c optional ddb ddb/db_output.c optional ddb ddb/db_print.c optional ddb ddb/db_ps.c optional ddb @@ -651,6 +651,7 @@ dev/si/si_pci.c optional si pci dev/sio/sio.c optional sio dev/sio/sio_cons.c optional sio +dev/sio/sio_dbg.c optional sio ddb dev/sio/sio_ebus.c optional sio ebus dev/sio/sio_pccard.c optional sio card dev/sio/sio_pccard.c optional sio pccard ==== //depot/projects/sio/sys/conf/files.alpha#3 (text+ko) ==== @@ -35,7 +35,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -alpha/alpha/alpha-gdbstub.c optional ddb alpha/alpha/api_up1000.c optional api_up1000 alpha/alpha/atomic.s standard alpha/alpha/autoconf.c standard ==== //depot/projects/sio/sys/conf/files.i386#3 (text+ko) ==== @@ -211,7 +211,6 @@ i386/i386/elan-mmcr.c optional cpu_elan i386/i386/elf_machdep.c standard i386/i386/exception.s standard -i386/i386/i386-gdbstub.c optional ddb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet ==== //depot/projects/sio/sys/conf/files.ia64#3 (text+ko) ==== @@ -71,7 +71,6 @@ ia64/ia64/eficlock.c standard ia64/ia64/elf_machdep.c standard ia64/ia64/exception.s standard -ia64/ia64/ia64-gdbstub.c optional ddb ia64/ia64/in_cksum.c optional inet ia64/ia64/interrupt.c standard ia64/ia64/locore.s standard no-obj ==== //depot/projects/sio/sys/conf/files.pc98#3 (text+ko) ==== @@ -173,7 +173,6 @@ i386/i386/dump_machdep.c standard i386/i386/elf_machdep.c standard i386/i386/exception.s standard -i386/i386/i386-gdbstub.c optional ddb i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet ==== //depot/projects/sio/sys/ddb/db_command.c#2 (text+ko) ==== @@ -66,10 +66,13 @@ SET_DECLARE(db_show_cmd_set, struct command); static db_cmdfcn_t db_fncall; -static db_cmdfcn_t db_gdb; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; +#ifdef GDB +static db_cmdfcn_t db_gdb; +#endif + /* XXX this is actually forward-static. */ extern struct command db_show_cmds[]; @@ -417,7 +420,9 @@ { "call", db_fncall, CS_OWN, 0 }, { "show", 0, 0, db_show_cmds }, { "ps", db_ps, 0, 0 }, +#ifdef GDB { "gdb", db_gdb, 0, 0 }, +#endif { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { (char *)0, } @@ -548,32 +553,6 @@ db_printf("%#lr\n", (long)retval); } -/* Enter GDB remote protocol debugger on the next trap. */ - -void *gdb_arg = NULL; -cn_getc_t *gdb_getc; -cn_putc_t *gdb_putc; - -static void -db_gdb (dummy1, dummy2, dummy3, dummy4) - db_expr_t dummy1; - boolean_t dummy2; - db_expr_t dummy3; - char * dummy4; -{ - - if (gdb_arg == NULL) { - db_printf("No gdb port enabled. Set flag 0x80 on desired port\n"); - db_printf("in your configuration file (currently sio only).\n"); - return; - } - boothowto ^= RB_GDB; - - db_printf("Next trap will enter %s\n", - boothowto & RB_GDB ? "GDB remote protocol mode" - : "DDB debugger"); -} - static void db_kill(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy1; ==== //depot/projects/sio/sys/ddb/db_sym.c#2 (text+ko) ==== ==== //depot/projects/sio/sys/ddb/ddb.h#2 (text+ko) ==== @@ -65,6 +65,30 @@ db_expr_t count; \ char *modif; +/* + * Remote debug device support. + */ +typedef int dbg_probe_t(void); +typedef void dbg_init_t(void); +typedef void dbg_term_t(void); +typedef int dbg_getc_t(void); +typedef void dbg_putc_t(int); + +struct dbgdev { + const char *dbg_devname; + dbg_probe_t *dbg_probe; + dbg_init_t *dbg_init; + dbg_term_t *dbg_term; + dbg_getc_t *dbg_getc; + dbg_putc_t *dbg_putc; +}; + +#define DBG_DRIVER(name, probe, init, term, getc, putc) \ + static struct dbgdev name##_dbgdev = { \ + #name, probe, init, term, getc, putc \ + }; \ + DATA_SET(dbgdev_set, name##_dbgdev) + extern char *esym; extern db_expr_t db_maxoff; extern int db_active; @@ -109,7 +133,7 @@ /* machine-dependent */ void db_stack_thread(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif); -void kdb_init(void); +void db_init(void); db_cmdfcn_t db_breakpoint_cmd; db_cmdfcn_t db_continue_cmd; @@ -132,16 +156,19 @@ db_cmdfcn_t db_write_cmd; db_cmdfcn_t db_show_one_thread; -#if 0 -db_cmdfcn_t db_help_cmd; -db_cmdfcn_t db_show_all_threads; -db_cmdfcn_t ipc_port_print; -db_cmdfcn_t vm_page_print; -#endif +/* Remote GDB support. */ +int gdb_handle_exception(db_regs_t *, int); +void gdb_init(void); +db_cmdfcn_t db_gdb_cmd; /* Scare the user with backtrace of curthread to console. */ void db_print_backtrace(void); +/* Linker hooks. */ +struct linker_file; +vm_offset_t db_debug_base(void); +void db_load_file(struct linker_file *); +void db_unload_file(struct linker_file *); /* * Command table. */ @@ -156,14 +183,4 @@ struct command *more; /* another level of command */ }; -/* XXX: UGLY hack */ -#ifdef CN_DEAD -/* - * Routines to support GDB on an sio port. - */ -extern void *gdb_arg; -extern cn_getc_t *gdb_getc; -extern cn_putc_t *gdb_putc; -#endif - #endif /* !_DDB_DDB_H_ */ ==== //depot/projects/sio/sys/dev/sio/sio.c#4 (text+ko) ==== @@ -89,8 +89,6 @@ #define UNIT_TO_MINOR(unit) ((((unit) & ~0x1fU) << (8 + 3)) \ | ((unit) & 0x1f)) -#define COM_LLCONSOLE(flags) ((flags) & 0x40) -#define COM_DEBUGGER(flags) ((flags) & 0x80) #define COM_LOSESOUTINTS(flags) ((flags) & 0x08) #define COM_NOFIFO(flags) ((flags) & 0x02) #define COM_PPSCTS(flags) ((flags) & 0x10000) @@ -191,7 +189,7 @@ u_long comdefaultrclk = DEFAULT_RCLK; SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, ""); -static speed_t gdbdefaultrate = GDBSPEED; +speed_t gdbdefaultrate = GDBSPEED; SYSCTL_ULONG(_machdep, OID_AUTO, gdbspeed, CTLFLAG_RW, &gdbdefaultrate, GDBSPEED, ""); @@ -544,6 +542,31 @@ return (divisor); } +/* Sloppily translate databits, stopbits and parity to LCR register bits. */ +u_char +sioddtolcr(struct sio_devdata *dd) +{ + u_char lcr; + + lcr = 0; + + if (dd->databits >= 8) + lcr |= LCR_8BITS; + else if (dd->databits == 7) + lcr |= LCR_7BITS; + else if (dd->databits == 6) + lcr |= LCR_6BITS; + else + lcr |= LCR_5BITS; + + if (dd->stopbits > 1) + lcr |= LCR_STOPB; + + /* XXX set parity */ + + return (lcr); +} + /* * Do some non-destructive (for this device that is) tests * to make sure we have something that looks like an UART. @@ -645,7 +668,10 @@ * switch to the static sio_console struct so that if we have a * serial console we have all the state information. We assume that * at this time the bus specific front-ends only defined addr_type, - * addr_rid and addr_res. + * addr_rid and addr_res. If it's not the console, check if it's + * the remote GDB debug port. Note that the debug port can also be + * the console. In that case sio_dbgport points to sio_console and + * we don't have to do anything special. */ if (com->bst == sio_console.bst && com->bsh == sio_console.bsh) { sio_console.addr_res = com->addr_res; @@ -653,6 +679,13 @@ sio_console.addr_type = com->addr_type; device_set_softc(dev, &sio_console); com = &sio_console; + } else if (com->bst == sio_dbgport->bst && + com->bsh == sio_dbgport->bsh) { + sio_dbgport->addr_res = com->addr_res; + sio_dbgport->addr_rid = com->addr_rid; + sio_dbgport->addr_type = com->addr_type; + device_set_softc(dev, sio_dbgport); + com = sio_dbgport; } com->dev = dev; @@ -707,15 +740,6 @@ flags = device_get_flags(dev); - if (COM_LLCONSOLE(flags)) { - device_printf(dev, "reserved for low-level i/o\n"); - /* - * Don't release the address resource! We don't want it to be - * taken by other drivers. - */ - return (ENXIO); - } - bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); return (0); @@ -732,7 +756,7 @@ /* Assume addr_rid and addr_type are still valid (set by probe). */ com->addr_res = bus_alloc_resource(dev, com->addr_type, &com->addr_rid, - 0, ~0, 8, RF_ACTIVE); + 0, ~0, SIO_NREGS, RF_ACTIVE); if (com->addr_res == NULL) return (ENXIO); ==== //depot/projects/sio/sys/dev/sio/sio_cons.c#3 (text+ko) ==== @@ -83,35 +83,10 @@ CONS_DRIVER(sio, siocnprobe, siocninit, siocnterm, siocngetc, siocncheckc, siocnputc, NULL); -/* Sloppily translate databits, stopbits and parity to LCR register bits. */ -static u_char -siocnlcr(struct sio_consdata *cd) -{ - u_char lcr; - - lcr = 0; - - if (cd->databits >= 8) - lcr |= LCR_8BITS; - else if (cd->databits == 7) - lcr |= LCR_7BITS; - else if (cd->databits == 6) - lcr |= LCR_6BITS; - else - lcr |= LCR_5BITS; - - if (cd->stopbits > 1) - lcr |= LCR_STOPB; - - /* XXX set parity */ - - return (lcr); -} - static void siocnprobe(struct consdev *cp) { - struct sio_consdata cd; + struct sio_devdata dd; u_int divisor; u_char lcr; @@ -120,28 +95,28 @@ cp->cn_dev = NULL; /* How do we know. */ cp->cn_pri = CN_DEAD; - if (sio_get_console(&cd) != 0) + if (sio_get_console(&dd) != 0) return; /* Minimum fields needed for rudimentary checks. */ - sio_console.bst = cd.bst; - sio_console.bsh = cd.bsh; - sio_console.regshft = cd.regshft; + sio_console.bst = dd.bst; + sio_console.bsh = dd.bsh; + sio_console.regshft = dd.regshft; if (sioprobe1(&sio_console)) return; - sio_console.rclk = (cd.rclk != 0) ? cd.rclk : DEFAULT_RCLK; + sio_console.rclk = (dd.rclk != 0) ? dd.rclk : DEFAULT_RCLK; - if (cd.baud == 0) - cd.baud = CONSPEED; + if (dd.baud == 0) + dd.baud = CONSPEED; /* Set DL and LCR. */ - lcr = siocnlcr(&cd); + lcr = sioddtolcr(&dd); sio_setreg(&sio_console, com_lcr, lcr | LCR_DLAB); sio_barrier(&sio_console); - if (cd.baud != 0) { - divisor = siodivisor(sio_console.rclk, cd.baud); + if (dd.baud != 0) { + divisor = siodivisor(sio_console.rclk, dd.baud); sio_setdreg(&sio_console, com_dl, divisor); } else divisor = sio_getdreg(&sio_console, com_dl); ==== //depot/projects/sio/sys/dev/sio/sioreg.h#3 (text+ko) ==== @@ -53,6 +53,8 @@ #define com_msr 6 /* MODEM Status Reg. */ #define com_scr 7 /* Scratch Reg. (16450 and up). */ +#define SIO_NREGS 8 + /* interrupt enable register */ #define IER_ERXRDY 0x1 #define IER_ETXRDY 0x2 @@ -137,9 +139,6 @@ #define EMR_EFMODE 0x80 #endif -/* speed to initialize to during chip tests */ -#define SIO_TEST_SPEED 9600 - /* default serial console speed if not set with sysctl or probed from boot */ #ifndef CONSPEED #define CONSPEED 9600 @@ -149,5 +148,3 @@ #ifndef GDBSPEED #define GDBSPEED CONSPEED #endif - -#define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ ==== //depot/projects/sio/sys/dev/sio/siovar.h#4 (text+ko) ==== @@ -61,7 +61,7 @@ #endif /* PC98 */ #define COM_CONSOLE(flags) ((flags) & 0x10) -#define COM_PPSCTS(flags) ((flags) & 0x10000) +#define COM_DEBUGGER(flags) ((flags) & 0x80) #define CE_NTYPES 3 @@ -90,7 +90,8 @@ int addr_rid; int addr_type; /* SYS_RES_{IOPORT|MEMORY}. */ u_int regshft; /* Interleaved multi-port. */ - u_int hasfifo:1; + int dbgport:1; /* Used as debug port. */ + int hasfifo:1; u_int fifosize; u_short reg_dl; /* Copy of DL. */ u_char reg_fcr; /* Copy of FCR. */ @@ -177,7 +178,8 @@ bus_space_write_2((com)->bst, (com)->bsh, sio_offset(com, reg), value) #define sio_barrier(com) \ - bus_space_barrier((com)->bst, (com)->bsh, 0, sio_offset(com, 8), \ + bus_space_barrier((com)->bst, (com)->bsh, 0, \ + sio_offset(com, SIO_NREGS), \ BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE) #define SET_FLAG(dev, bit) \ @@ -185,7 +187,7 @@ #define CLR_FLAG(dev, bit) \ device_set_flags(dev, device_get_flags(dev) & ~(bit)) -struct sio_consdata { +struct sio_devdata { bus_space_handle_t bsh; bus_space_tag_t bst; u_int regshft; @@ -196,9 +198,12 @@ u_int parity; }; -int sio_get_console(struct sio_consdata*); +int sio_get_console(struct sio_devdata*); +int sio_get_dbgport(struct sio_devdata*); extern struct com_s sio_console; +extern struct com_s *sio_dbgport; +extern struct com_s sio_debugport; extern devclass_t sio_devclass; extern char sio_driver_name[]; @@ -209,5 +214,6 @@ int siodetach(device_t dev); int sioprobe(device_t dev); +u_char sioddtolcr(struct sio_devdata *); u_int siodivisor(u_long rclk, u_long speed); int sioprobe1(struct com_s *sc); ==== //depot/projects/sio/sys/i386/i386/db_interface.c#2 (text+ko) ==== @@ -52,8 +52,6 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception(db_regs_t *, int, int); - int db_active; db_regs_t ddb_regs; @@ -78,7 +76,9 @@ kdb_trap(int type, int code, struct i386_saved_state *regs) { u_int ef; - volatile int ddb_mode = !(boothowto & RB_GDB); + volatile int ddb_mode; + + ddb_mode = !(boothowto & RB_GDB); /* * XXX try to do nothing if the console is in graphics mode. @@ -171,7 +171,7 @@ cndbctl(FALSE); } else { db_active = 1; - gdb_handle_exception(&ddb_regs, type, code); + gdb_handle_exception(&ddb_regs, type); } db_active = 0; ==== //depot/projects/sio/sys/i386/i386/machdep.c#2 (text+ko) ==== @@ -2075,7 +2075,7 @@ #endif #ifdef DDB - kdb_init(); + db_init(); if (boothowto & RB_KDB) Debugger("Boot flags requested debugger"); #endif ==== //depot/projects/sio/sys/i386/i386/sio_machdep.c#2 (text+ko) ==== @@ -39,11 +39,12 @@ #include -int sio_get_console(struct sio_consdata *cd) +int +sio_get_console(struct sio_devdata *dd) { unsigned int i, ivar; - bzero(cd, sizeof(*cd)); + bzero(dd, sizeof(*dd)); /* XXX - Try ACPI SPCR descriptor */ @@ -65,14 +66,53 @@ if (resource_int_value("sio", i, "port", &ivar) != 0 || ivar == 0) continue; - cd->bsh = ivar; - cd->bst = I386_BUS_SPACE_IO; + dd->bsh = ivar; + dd->bst = I386_BUS_SPACE_IO; + if (resource_int_value("sio", i, "baud", &ivar) != 0) + ivar = 0; + dd->baud = ivar; + dd->databits = 8; + dd->stopbits = 1; + dd->parity = 0; + return (0); + } + + return (ENXIO); +} + +int +sio_get_dbgport(struct sio_devdata *dd) +{ + unsigned int i, ivar; + + bzero(dd, sizeof(*dd)); + + /* + * Scan the hints. We only try units 0 to 3 (inclusive). This + * covers the ISA legacy where 4 UARTs had their resources + * predefined. + */ + for (i = 0; i < 4; i++) { + if (resource_int_value("sio", i, "flags", &ivar)) + continue; + if (!COM_DEBUGGER(ivar)) + continue; + /* We have a possible debug port. Make sure it's enabled. */ + if (resource_int_value("sio", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + /* It's alive. Get the port. */ + if (resource_int_value("sio", i, "port", &ivar) != 0 || + ivar == 0) + continue; + dd->bsh = ivar; + dd->bst = I386_BUS_SPACE_IO; if (resource_int_value("sio", i, "baud", &ivar) != 0) ivar = 0; - cd->baud = ivar; - cd->databits = 8; - cd->stopbits = 1; - cd->parity = 0; + dd->baud = ivar; + dd->databits = 8; + dd->stopbits = 1; + dd->parity = 0; return (0); } ==== //depot/projects/sio/sys/i386/include/db_machdep.h#2 (text+ko) ==== @@ -90,4 +90,16 @@ #define DB_SMALL_VALUE_MAX 0x7fffffff #define DB_SMALL_VALUE_MIN (-0x400001) +/* + * Remote GDB support. + */ +#define GDB_REGNUM_SP 4 +#define GDB_REGNUM_FP 5 +#define GDB_REGNUM_PC 8 + +/* What size are registers? */ +#define gdb_enc_register gdb_enc_int32 + +int gdb_signal(int); + #endif /* !_MACHINE_DB_MACHDEP_H_ */ ==== //depot/projects/sio/sys/ia64/ia64/db_interface.c#2 (text+ko) ==== @@ -65,8 +65,6 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception(db_regs_t *, int); - int db_active; db_regs_t ddb_regs; ==== //depot/projects/sio/sys/ia64/ia64/machdep.c#3 (text+ko) ==== @@ -677,7 +677,7 @@ * Initialize debuggers, and break into them if appropriate. */ #ifdef DDB - kdb_init(); + db_init(); if (boothowto & RB_KDB) { printf("Boot flags requested debugger\n"); breakpoint(); ==== //depot/projects/sio/sys/ia64/ia64/sio_machdep.c#2 (text+ko) ==== @@ -43,81 +43,44 @@ #include -static u_int64_t -sio_map(u_int64_t pa, int region) -{ - struct ia64_pte pte; - u_int64_t psr, va; - - bzero(&pte, sizeof(pte)); - if (region == 6) { - va = IA64_PHYS_TO_RR6(pa); - pte.pte_ma = PTE_MA_UC; - } else { - va = IA64_PHYS_TO_RR7(pa); - pte.pte_ma = PTE_MA_WB; - } - pte.pte_p = 1; - pte.pte_a = 1; - pte.pte_d = 1; - pte.pte_pl = PTE_PL_KERN; - pte.pte_ar = PTE_AR_RW; - pte.pte_ppn = pa >> 12; - - __asm __volatile("mov %0=psr;;" : "=r"(psr)); - __asm __volatile("rsm psr.ic|psr.i;;"); - __asm __volatile("srlz.d"); - __asm __volatile("mov cr.ifa=%0" :: "r"(va)); - __asm __volatile("mov cr.itir=%0;;" :: "r"(28 << 2)); - __asm __volatile("itc.d %0;;" :: "r"(*(u_int64_t*)&pte)); - __asm __volatile("mov psr.l=%0" :: "r" (psr)); - __asm __volatile("srlz.d"); - return (va); -} - -int sio_get_console(struct sio_consdata *cd) +static int +sio_get_device(struct sio_devdata *dd, int type) { struct dig64_hcdp_table *tbl; struct dig64_hcdp_entry *ent; unsigned int i, ivar; - bzero(cd, sizeof(*cd)); + bzero(dd, sizeof(*dd)); /* * Use the DIG64 HCDP table if present. */ if (bootinfo.bi_hcdp != 0) { - tbl = (struct dig64_hcdp_table*)sio_map(bootinfo.bi_hcdp, 7); + tbl = (void*)IA64_PHYS_TO_RR7(bootinfo.bi_hcdp); for (i = 0; i < tbl->entries; i++) { ent = tbl->entry + i; - /* Skip non-console entries. */ - if (ent->type != DIG64_HCDP_CONSOLE) + if (ent->type != type) continue; - cd->bsh = ent->address.addr_high; - cd->bsh = (cd->bsh << 32) + ent->address.addr_low; - cd->bst = (ent->address.addr_space == 0) + dd->bsh = ent->address.addr_high; + dd->bsh = (dd->bsh << 32) + ent->address.addr_low; + dd->bst = (ent->address.addr_space == 0) ? IA64_BUS_SPACE_MEM : IA64_BUS_SPACE_IO; - /* XXX - We should have pre-mapped all UC memory. */ - if (cd->bst == IA64_BUS_SPACE_MEM) - (void)sio_map(cd->bsh, 6); - cd->rclk = (ent->pclock) ? ent->pclock : 115200L; - cd->rclk <<= 4; /* rclk = 16 * pclock */ - cd->baud = ent->baud_high; - cd->baud = (cd->baud << 32) + ent->baud_low; - cd->databits = ent->databits; - cd->stopbits = ent->stopbits; + dd->rclk = (ent->pclock) ? ent->pclock : 115200L; + dd->rclk <<= 4; /* rclk = 16 * pclock */ + dd->baud = ent->baud_high; + dd->baud = (dd->baud << 32) + ent->baud_low; + dd->databits = ent->databits; + dd->stopbits = ent->stopbits; /* XXX map from dig64 to out own? */ - cd->parity = ent->parity; + dd->parity = ent->parity; return (0); } /* FALLTHROUGH */ } - /* XXX - Try ACPI SPCR descriptor */ - /* * Scan the hints for backward compatibility. We only try units * 0 to 3 (inclusive). This covers the ISA legacy where 4 UARTs @@ -126,9 +89,10 @@ for (i = 0; i < 4; i++) { if (resource_int_value("sio", i, "flags", &ivar)) continue; - if (!COM_CONSOLE(ivar)) + if ((type == DIG64_HCDP_CONSOLE && !COM_CONSOLE(ivar)) || + (type == DIG64_HCDP_DBGPORT && !COM_DEBUGGER(ivar))) continue; - /* We have a possible console. Make sure it's enabled. */ + /* We have a possible device. Make sure it's enabled. */ if (resource_int_value("sio", i, "disabled", &ivar) == 0 && ivar != 0) continue; @@ -136,16 +100,28 @@ if (resource_int_value("sio", i, "port", &ivar) != 0 || ivar == 0) continue; - cd->bsh = ivar; - cd->bst = IA64_BUS_SPACE_IO; + dd->bsh = ivar; + dd->bst = IA64_BUS_SPACE_IO; if (resource_int_value("sio", i, "baud", &ivar) != 0) ivar = 0; - cd->baud = ivar; - cd->databits = 8; - cd->stopbits = 1; - cd->parity = 0; + dd->baud = ivar; + dd->databits = 8; + dd->stopbits = 1; + dd->parity = 0; return (0); } return (ENXIO); } + +int +sio_get_console(struct sio_devdata *dd) +{ + return (sio_get_device(dd, DIG64_HCDP_CONSOLE)); +} + +int +sio_get_dbgport(struct sio_devdata *dd) +{ + return (sio_get_device(dd, DIG64_HCDP_DBGPORT)); +} ==== //depot/projects/sio/sys/kern/link_elf.c#2 (text+ko) ==== @@ -57,6 +57,10 @@ #include #include +#ifdef DDB +#include +#endif + #include #include "linker_if.h" @@ -91,11 +95,8 @@ long ddbsymcnt; /* Number of symbols */ caddr_t ddbstrtab; /* String table */ long ddbstrcnt; /* number of bytes in string table */ - caddr_t symbase; /* malloc'ed symbold base */ + caddr_t symbase; /* malloc'ed symbol base */ caddr_t strbase; /* malloc'ed string base */ -#ifdef DDB - struct link_map gdb; /* hooks for gdb */ -#endif } *elf_file_t; static int link_elf_link_common_finish(linker_file_t); @@ -144,61 +145,6 @@ static int relocate_file(elf_file_t ef); static int link_elf_preload_parse_symbols(elf_file_t ef); -#ifdef DDB -static void r_debug_state(struct r_debug *dummy_one, - struct link_map *dummy_two); - -/* - * A list of loaded modules for GDB to use for loading symbols. - */ -struct r_debug r_debug; - -#define GDB_STATE(s) r_debug.r_state = s; r_debug_state(NULL, NULL); - -/* - * Function for the debugger to set a breakpoint on to gain control. - */ -static void -r_debug_state(struct r_debug *dummy_one __unused, - struct link_map *dummy_two __unused) -{ -} - -static void -link_elf_add_gdb(struct link_map *l) -{ - struct link_map *prev; - - l->l_next = NULL; - - if (r_debug.r_map == NULL) { - /* Add first. */ - l->l_prev = NULL; - r_debug.r_map = l; - } else { - /* Append to list. */ - for (prev = r_debug.r_map; prev->l_next != NULL; prev = prev->l_next) - ; - l->l_prev = prev; - prev->l_next = l; - } -} - -static void -link_elf_delete_gdb(struct link_map *l) -{ - if (l->l_prev == NULL) { - /* Remove first. */ - if ((r_debug.r_map = l->l_next) != NULL) - l->l_next->l_prev = NULL; - } else { - /* Remove any but first. */ - if ((l->l_prev->l_next = l->l_next) != NULL) - l->l_next->l_prev = l->l_prev; - } -} -#endif /* DDB */ - #ifdef __ia64__ Elf_Addr link_elf_get_gp(linker_file_t); #endif @@ -221,10 +167,6 @@ static int link_elf_link_common_finish(linker_file_t lf) { -#ifdef DDB - elf_file_t ef = (elf_file_t)lf; - char *newfilename; -#endif int error; /* Notify MD code that a module is being loaded. */ @@ -233,14 +175,8 @@ return (error); #ifdef DDB - GDB_STATE(RT_ADD); - ef->gdb.l_addr = lf->address; - newfilename = malloc(strlen(lf->filename) + 1, M_LINKER, M_WAITOK); - strcpy(newfilename, lf->filename); - ef->gdb.l_name = newfilename; - ef->gdb.l_ld = ef->dynamic; - link_elf_add_gdb(&ef->gdb); - GDB_STATE(RT_CONSISTENT); + /* Notify DDB that a module has been loaded. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 3 14:56:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CCF037B404; Sat, 3 May 2003 14:56:34 -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 BFBDB37B401 for ; Sat, 3 May 2003 14:56:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9D0D43F93 for ; Sat, 3 May 2003 14:56:31 -0700 (PDT) (envelope-from marcel@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 h43LuV0U078321 for ; Sat, 3 May 2003 14:56:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43LuTgj078318 for perforce@freebsd.org; Sat, 3 May 2003 14:56:29 -0700 (PDT) Date: Sat, 3 May 2003 14:56:29 -0700 (PDT) Message-Id: <200305032156.h43LuTgj078318@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30478 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: Sat, 03 May 2003 21:56:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30478 Change 30478 by marcel@marcel_pluto1 on 2003/05/03 14:55:34 IFC @30477 Affected files ... .. //depot/projects/ia64/UPDATING#39 integrate .. //depot/projects/ia64/bin/csh/Makefile#6 integrate .. //depot/projects/ia64/bin/df/df.c#14 integrate .. //depot/projects/ia64/bin/ed/ed.1#5 integrate .. //depot/projects/ia64/bin/ls/extern.h#6 integrate .. //depot/projects/ia64/bin/ls/ls.c#17 integrate .. //depot/projects/ia64/bin/ls/print.c#12 integrate .. //depot/projects/ia64/bin/ls/util.c#6 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#6 integrate .. //depot/projects/ia64/bin/pax/ar_subs.c#6 integrate .. //depot/projects/ia64/bin/pax/cache.c#5 integrate .. //depot/projects/ia64/bin/pax/cpio.c#6 integrate .. //depot/projects/ia64/bin/pax/extern.h#3 integrate .. //depot/projects/ia64/bin/pax/gen_subs.c#5 integrate .. //depot/projects/ia64/bin/pax/getoldopt.c#4 integrate .. //depot/projects/ia64/bin/pax/options.c#8 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#7 integrate .. //depot/projects/ia64/bin/pax/pax.c#6 integrate .. //depot/projects/ia64/bin/pax/pax.h#5 integrate .. //depot/projects/ia64/bin/pax/tar.c#6 integrate .. //depot/projects/ia64/bin/ps/Makefile#8 integrate .. //depot/projects/ia64/bin/ps/fmt.c#8 integrate .. //depot/projects/ia64/bin/rcp/rcp.c#10 integrate .. //depot/projects/ia64/bin/sh/Makefile#7 integrate .. //depot/projects/ia64/bin/sleep/sleep.c#6 integrate .. //depot/projects/ia64/bin/stty/gfmt.c#4 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#14 integrate .. //depot/projects/ia64/contrib/openpam/README#9 integrate .. //depot/projects/ia64/contrib/openpam/RELNOTES#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#5 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#10 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#15 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#15 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#15 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#14 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#4 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#8 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#15 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#11 integrate .. //depot/projects/ia64/contrib/smbfs/smbutil/common.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/ia64/contrib/texinfo/COPYING#3 integrate .. //depot/projects/ia64/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/ia64/contrib/texinfo/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-upgrade#4 integrate .. //depot/projects/ia64/contrib/texinfo/INSTALL#3 integrate .. //depot/projects/ia64/contrib/texinfo/INTRODUCTION#4 integrate .. //depot/projects/ia64/contrib/texinfo/NEWS#4 integrate .. //depot/projects/ia64/contrib/texinfo/README#4 integrate .. //depot/projects/ia64/contrib/texinfo/TODO#4 integrate .. //depot/projects/ia64/contrib/texinfo/config.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/config.h.in#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/README#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/help2man#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info-stnd.texi#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.texi#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/install-info.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/makeinfo.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texindex.1#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texinfo.txi#4 integrate .. //depot/projects/ia64/contrib/texinfo/doc/version-stnd.texi#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/version.texi#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/README#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/display.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/doc.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/doc.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/echo-area.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/filesys.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/funs.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/indices.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/info-utils.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/info.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/info.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infodoc.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infokey.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infokey.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infomap.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infomap.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/m-x.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/man.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/nodes.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/search.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/session.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/session.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/termdep.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/terminal.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/terminal.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/variables.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/window.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/README#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt1.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/system.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/ia64/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/lib/xstrdup.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/README#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/cmds.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/defun.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/ia64/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/ia64/contrib/texinfo/makeinfo/files.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/files.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/footnote.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/html.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/html.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/index.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/lang.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/lang.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/macro.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.h#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/multi.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/node.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/node.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/sectioning.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.dtd#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.xsl#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/toc.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/toc.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/xml.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/xml.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/util/README#2 integrate .. //depot/projects/ia64/contrib/texinfo/util/install-info.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/util/texindex.c#4 integrate .. //depot/projects/ia64/etc/Makefile#28 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#31 integrate .. //depot/projects/ia64/etc/devd.conf#3 integrate .. //depot/projects/ia64/etc/etc.alpha/rc.alpha#3 delete .. //depot/projects/ia64/etc/etc.amd64/rc.amd64#2 delete .. //depot/projects/ia64/etc/etc.i386/rc.i386#3 delete .. //depot/projects/ia64/etc/etc.ia64/rc.ia64#3 delete .. //depot/projects/ia64/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/ia64/etc/rc#26 integrate .. //depot/projects/ia64/etc/rc.atm#5 delete .. //depot/projects/ia64/etc/rc.d/apm#2 integrate .. //depot/projects/ia64/etc/rc.d/apmd#6 integrate .. //depot/projects/ia64/etc/rc.d/archdep#4 integrate .. //depot/projects/ia64/etc/rc.d/devfs#3 integrate .. //depot/projects/ia64/etc/rc.devfs#6 delete .. //depot/projects/ia64/etc/rc.diskless1#8 delete .. //depot/projects/ia64/etc/rc.diskless2#7 delete .. //depot/projects/ia64/etc/rc.isdn#3 delete .. //depot/projects/ia64/etc/rc.network#23 delete .. //depot/projects/ia64/etc/rc.network6#7 delete .. //depot/projects/ia64/etc/rc.pccard#3 delete .. //depot/projects/ia64/etc/rc.sendmail#2 integrate .. //depot/projects/ia64/etc/rc.serial#4 delete .. //depot/projects/ia64/etc/rc.syscons#5 delete .. //depot/projects/ia64/etc/rc.sysctl#4 delete .. //depot/projects/ia64/etc/usbd.conf#4 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/kernel.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/notify.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/raw_popen.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/textbox.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/include/config.h#4 integrate .. //depot/projects/ia64/gnu/usr.bin/man/catman/Makefile#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/catman/catman.1#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/catman/catman.perl#2 delete .. //depot/projects/ia64/gnu/usr.bin/texinfo/makeinfo/Makefile#4 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#86 integrate .. //depot/projects/ia64/release/i386/dokern.sh#16 integrate .. //depot/projects/ia64/release/scripts/doFS.sh#14 integrate .. //depot/projects/ia64/sbin/adjkerntz/adjkerntz.c#3 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#11 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/ia64/sbin/atm/ilmid/ilmid.c#7 integrate .. //depot/projects/ia64/sbin/badsect/badsect.c#10 integrate .. //depot/projects/ia64/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/ia64/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/ia64/sbin/camcontrol/Makefile#5 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#10 integrate .. //depot/projects/ia64/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/ia64/sbin/camcontrol/util.c#3 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#6 integrate .. //depot/projects/ia64/sbin/clri/clri.c#10 integrate .. //depot/projects/ia64/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/ia64/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/ia64/sbin/devd/devd.cc#8 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#26 integrate .. //depot/projects/ia64/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.c#7 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#17 integrate .. //depot/projects/ia64/sbin/fsck_ffs/dir.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#12 integrate .. //depot/projects/ia64/sbin/fsck_ffs/inode.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/main.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1.c#9 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1b.c#4 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass2.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass3.c#4 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass4.c#4 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#12 integrate .. //depot/projects/ia64/sbin/fsck_ffs/setup.c#14 integrate .. //depot/projects/ia64/sbin/fsck_ffs/utilities.c#5 integrate .. //depot/projects/ia64/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/ia64/sbin/kldload/kldload.c#3 integrate .. //depot/projects/ia64/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/ia64/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/ia64/sbin/md5/md5.c#5 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#6 integrate .. //depot/projects/ia64/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/ia64/sbin/mount/vfslist.c#2 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#12 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#27 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#23 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.c#7 integrate .. //depot/projects/ia64/sbin/ping/ping.c#22 integrate .. //depot/projects/ia64/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#10 integrate .. //depot/projects/ia64/sbin/reboot/reboot.c#6 integrate .. //depot/projects/ia64/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/ia64/sbin/spppcontrol/spppcontrol.c#3 integrate .. //depot/projects/ia64/sbin/sunlabel/Makefile#6 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#9 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#13 integrate .. //depot/projects/ia64/share/man/man4/Makefile#42 integrate .. //depot/projects/ia64/share/man/man4/rue.4#1 branch .. //depot/projects/ia64/share/misc/bsd-family-tree#12 integrate .. //depot/projects/ia64/share/mk/bsd.README#5 integrate .. //depot/projects/ia64/share/mk/bsd.prog.mk#16 integrate .. //depot/projects/ia64/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/exception.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/locore.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/sigtramp.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/support.S#1 branch .. //depot/projects/ia64/sys/amd64/amd64/support.s#2 delete .. //depot/projects/ia64/sys/amd64/amd64/swtch.s#2 delete .. //depot/projects/ia64/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu_ipl.s#2 delete .. //depot/projects/ia64/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/ia64/sys/amd64/isa/icu_vector.s#2 delete .. //depot/projects/ia64/sys/amd64/isa/vector.S#1 branch .. //depot/projects/ia64/sys/amd64/isa/vector.s#2 delete .. //depot/projects/ia64/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#43 integrate .. //depot/projects/ia64/sys/conf/NOTES#48 integrate .. //depot/projects/ia64/sys/conf/files#77 integrate .. //depot/projects/ia64/sys/conf/files.amd64#3 integrate .. //depot/projects/ia64/sys/conf/kern.mk#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#6 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#35 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#23 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.h#8 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#11 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#27 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/ia64/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#21 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#13 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#9 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#11 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#30 integrate .. //depot/projects/ia64/sys/dev/md/md.c#27 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#7 integrate .. //depot/projects/ia64/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/ia64/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/ia64/sys/dev/snc/dp83932subr.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/ia64/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/ia64/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#32 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#32 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#13 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumstate.c#3 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#13 integrate .. //depot/projects/ia64/sys/geom/geom.h#29 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#32 integrate .. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#8 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#34 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#31 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#24 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#28 integrate .. //depot/projects/ia64/sys/geom/geom_mirror.c#6 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#23 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_slice.h#13 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#27 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#66 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#10 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#23 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/ia64/sys/modules/Makefile#47 integrate .. //depot/projects/ia64/sys/modules/mii/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/rue/Makefile#1 branch .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#21 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#15 integrate .. //depot/projects/ia64/sys/sys/ata.h#8 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#25 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#22 integrate .. //depot/projects/ia64/sys/sys/param.h#33 integrate .. //depot/projects/ia64/sys/sys/proc.h#63 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#24 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#50 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.h#9 integrate .. //depot/projects/ia64/usr.bin/chpass/chpass.c#9 integrate .. //depot/projects/ia64/usr.bin/chpass/table.c#4 integrate .. //depot/projects/ia64/usr.bin/cut/cut.1#7 integrate .. //depot/projects/ia64/usr.bin/nohup/nohup.c#5 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.c#11 integrate .. //depot/projects/ia64/usr.bin/uudecode/uudecode.c#16 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.c#8 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.c#24 integrate .. //depot/projects/ia64/usr.bin/xlint/arch/amd64/targparam.h#1 branch .. //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#11 integrate .. //depot/projects/ia64/usr.sbin/accton/accton.c#3 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.c#5 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#12 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.c#5 integrate .. //depot/projects/ia64/usr.sbin/boot98cfg/boot98cfg.c#3 integrate .. //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.c#10 integrate .. //depot/projects/ia64/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#9 integrate .. //depot/projects/ia64/usr.sbin/chroot/chroot.c#4 integrate .. //depot/projects/ia64/usr.sbin/dev_mkdb/dev_mkdb.c#6 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.c#7 integrate .. //depot/projects/ia64/usr.sbin/fdcontrol/fdcontrol.c#3 integrate .. //depot/projects/ia64/usr.sbin/kbdcontrol/kbdcontrol.c#5 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.c#4 integrate .. //depot/projects/ia64/usr.sbin/lptcontrol/lptcontrol.c#3 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#10 integrate .. //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#14 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.c#4 integrate .. //depot/projects/ia64/usr.sbin/mtree/compare.c#4 integrate .. //depot/projects/ia64/usr.sbin/mtree/create.c#6 integrate .. //depot/projects/ia64/usr.sbin/mtree/excludes.c#3 integrate .. //depot/projects/ia64/usr.sbin/mtree/misc.c#3 integrate .. //depot/projects/ia64/usr.sbin/mtree/mtree.c#5 integrate .. //depot/projects/ia64/usr.sbin/mtree/spec.c#3 integrate .. //depot/projects/ia64/usr.sbin/mtree/verify.c#4 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#18 integrate .. //depot/projects/ia64/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#11 integrate .. //depot/projects/ia64/usr.sbin/pwd_mkdb/pwd_mkdb.c#6 integrate .. //depot/projects/ia64/usr.sbin/quot/quot.c#8 integrate .. //depot/projects/ia64/usr.sbin/quotaon/quotaon.c#4 integrate .. //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#5 integrate .. //depot/projects/ia64/usr.sbin/repquota/repquota.c#6 integrate .. //depot/projects/ia64/usr.sbin/rmt/rmt.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#6 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#5 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/yp_dbdelete.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/yp_dbupdate.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/ypupdated_main.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypupdated/ypupdated_server.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#4 integrate .. //depot/projects/ia64/usr.sbin/sa/main.c#3 integrate .. //depot/projects/ia64/usr.sbin/sa/pdb.c#3 integrate .. //depot/projects/ia64/usr.sbin/sa/usrdb.c#4 integrate .. //depot/projects/ia64/usr.sbin/slstat/slstat.c#3 integrate .. //depot/projects/ia64/usr.sbin/trpt/trpt.c#4 integrate .. //depot/projects/ia64/usr.sbin/vipw/vipw.c#5 integrate .. //depot/projects/ia64/usr.sbin/watch/watch.c#8 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#12 integrate .. //depot/projects/ia64/usr.sbin/yp_mkdb/yp_mkdb.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypbind/yp_ping.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypbind/ypbind.c#4 integrate .. //depot/projects/ia64/usr.sbin/yppoll/yppoll.c#3 integrate .. //depot/projects/ia64/usr.sbin/yppush/yppush_main.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_access.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_dblookup.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_dnslookup.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_error.c#3 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_server.c#4 integrate .. //depot/projects/ia64/usr.sbin/ypserv/yp_svc_udp.c#3 integrate .. //depot/projects/ia64/usr.sbin/ypset/ypset.c#4 integrate Differences ... ==== //depot/projects/ia64/UPDATING#39 (text+ko) ==== @@ -17,11 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. + 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1268,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ ==== //depot/projects/ia64/bin/csh/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/ia64/bin/df/df.c#14 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/ia64/bin/ed/ed.1#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/ia64/bin/ls/extern.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); +void printcol(const DISPLAY *); +void printlong(const DISPLAY *); int printname(const char *); -void printscol(DISPLAY *); -void printstream(DISPLAY *); +void printscol(const DISPLAY *); +void printstream(const DISPLAY *); void usage(void); size_t len_octal(const char *, int); int prn_octal(const char *); @@ -62,3 +62,4 @@ extern char *attrs_off; extern char *enter_bold; #endif +extern int termwidth; ==== //depot/projects/ia64/bin/ls/ls.c#17 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,26 @@ */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) -static void display(FTSENT *, FTSENT *, int); -static u_quad_t makenines(u_long); +/* + * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width + * into a number that wide in decimal. + * XXX: Overflows are not considered. + */ +#define MAKENINES(n) \ + do { \ + intmax_t i; \ + \ + /* Use a loop as all values of n are small. */ \ + for (i = 1; n > 0; i *= 10) \ + n--; \ + n = i - 1; \ + } while(0) + +static void display(const FTSENT *, FTSENT *, int); static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); -static void (*printfcn)(DISPLAY *); +static void (*printfcn)(const DISPLAY *); static int (*sortfcn)(const FTSENT *, const FTSENT *); long blocksize; /* block size units */ @@ -114,7 +129,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, separate with commas */ +static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -473,10 +488,10 @@ */ if (output) { putchar('\n'); - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); } else if (argc > 1) { - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); output = 1; } @@ -499,14 +514,15 @@ * points to the parent directory of the display list. */ static void -display(FTSENT *p, FTSENT *list, int options) +display(const FTSENT *p, FTSENT *list, int options) { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + long maxblock; + u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; @@ -542,9 +558,10 @@ int ninitmax; /* Fill-in "::" as "0:0:0" for the sake of scanf. */ - jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2); + jinitmax = malloc(strlen(initmax) * 2 + 2); if (jinitmax == NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 3 14:59:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C554337B401; Sat, 3 May 2003 14:59:41 -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 5D12537B404 for ; Sat, 3 May 2003 14:59:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ACE143FD7 for ; Sat, 3 May 2003 14:59:39 -0700 (PDT) (envelope-from marcel@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 h43Lxd0U080263 for ; Sat, 3 May 2003 14:59:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43LxZ7Q080200 for perforce@freebsd.org; Sat, 3 May 2003 14:59:35 -0700 (PDT) Date: Sat, 3 May 2003 14:59:35 -0700 (PDT) Message-Id: <200305032159.h43LxZ7Q080200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30479 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: Sat, 03 May 2003 21:59:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30479 Change 30479 by marcel@marcel_pluto1 on 2003/05/03 14:59:31 IFia64 Affected files ... .. //depot/projects/ia64_epc/UPDATING#7 integrate .. //depot/projects/ia64_epc/bin/csh/Makefile#2 integrate .. //depot/projects/ia64_epc/bin/df/df.c#3 integrate .. //depot/projects/ia64_epc/bin/ed/ed.1#2 integrate .. //depot/projects/ia64_epc/bin/ls/extern.h#2 integrate .. //depot/projects/ia64_epc/bin/ls/ls.c#3 integrate .. //depot/projects/ia64_epc/bin/ls/print.c#2 integrate .. //depot/projects/ia64_epc/bin/ls/util.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/ar_io.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/ar_subs.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/cache.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/cpio.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/extern.h#2 integrate .. //depot/projects/ia64_epc/bin/pax/gen_subs.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/getoldopt.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/options.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/pat_rep.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/pax.c#2 integrate .. //depot/projects/ia64_epc/bin/pax/pax.h#2 integrate .. //depot/projects/ia64_epc/bin/pax/tar.c#2 integrate .. //depot/projects/ia64_epc/bin/ps/Makefile#2 integrate .. //depot/projects/ia64_epc/bin/ps/fmt.c#2 integrate .. //depot/projects/ia64_epc/bin/rcp/rcp.c#3 integrate .. //depot/projects/ia64_epc/bin/sh/Makefile#2 integrate .. //depot/projects/ia64_epc/bin/sleep/sleep.c#3 integrate .. //depot/projects/ia64_epc/bin/stty/gfmt.c#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/HISTORY#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/README#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/ia64_epc/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/ia64_epc/contrib/smbfs/smbutil/common.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/COPYING#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/ChangeLog#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/INSTALL#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/INTRODUCTION#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/NEWS#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/README#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/TODO#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/config.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/config.h.in#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/README#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/help2man#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/info-stnd.texi#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/info.1#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/info.texi#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/install-info.1#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/makeinfo.1#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/texindex.1#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/texinfo.txi#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/doc/version.texi#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/README#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/doc.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/doc.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/echo-area.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/filesys.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/funs.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/info.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/info.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/infodoc.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/infomap.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/infomap.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/m-x.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/man.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/nodes.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/session.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/session.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/termdep.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/terminal.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/terminal.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/variables.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/window.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/README#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/getopt.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/getopt.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/getopt1.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/system.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/ia64_epc/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/lib/xstrdup.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/README#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/cmds.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/defun.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/files.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/files.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/footnote.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/html.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/html.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/index.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/insertion.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/insertion.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/lang.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/lang.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/macro.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/makeinfo.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/makeinfo.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/multi.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/node.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/node.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/sectioning.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/toc.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/toc.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/util/README#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/util/install-info.c#2 integrate .. //depot/projects/ia64_epc/contrib/texinfo/util/texindex.c#2 integrate .. //depot/projects/ia64_epc/etc/Makefile#7 integrate .. //depot/projects/ia64_epc/etc/defaults/rc.conf#7 integrate .. //depot/projects/ia64_epc/etc/devd.conf#3 integrate .. //depot/projects/ia64_epc/etc/etc.alpha/rc.alpha#2 delete .. //depot/projects/ia64_epc/etc/etc.amd64/rc.amd64#2 delete .. //depot/projects/ia64_epc/etc/etc.i386/rc.i386#3 delete .. //depot/projects/ia64_epc/etc/etc.ia64/rc.ia64#2 delete .. //depot/projects/ia64_epc/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/ia64_epc/etc/rc#4 integrate .. //depot/projects/ia64_epc/etc/rc.atm#2 delete .. //depot/projects/ia64_epc/etc/rc.d/apm#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/apmd#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/archdep#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/devfs#2 integrate .. //depot/projects/ia64_epc/etc/rc.devfs#2 delete .. //depot/projects/ia64_epc/etc/rc.diskless1#3 delete .. //depot/projects/ia64_epc/etc/rc.diskless2#2 delete .. //depot/projects/ia64_epc/etc/rc.isdn#2 delete .. //depot/projects/ia64_epc/etc/rc.network#4 delete .. //depot/projects/ia64_epc/etc/rc.network6#2 delete .. //depot/projects/ia64_epc/etc/rc.pccard#2 delete .. //depot/projects/ia64_epc/etc/rc.sendmail#2 integrate .. //depot/projects/ia64_epc/etc/rc.serial#2 delete .. //depot/projects/ia64_epc/etc/rc.syscons#2 delete .. //depot/projects/ia64_epc/etc/rc.sysctl#2 delete .. //depot/projects/ia64_epc/etc/usbd.conf#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/kernel.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/notify.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/raw_popen.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/textbox.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/ia64_epc/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/Makefile#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/man/catman/Makefile#2 delete .. //depot/projects/ia64_epc/gnu/usr.bin/man/catman/catman.1#2 delete .. //depot/projects/ia64_epc/gnu/usr.bin/man/catman/catman.perl#2 delete .. //depot/projects/ia64_epc/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_cond.c#6 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate .. //depot/projects/ia64_epc/release/i386/dokern.sh#5 integrate .. //depot/projects/ia64_epc/release/scripts/doFS.sh#7 integrate .. //depot/projects/ia64_epc/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/ia64_epc/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/ia64_epc/sbin/atacontrol/atacontrol.c#4 integrate .. //depot/projects/ia64_epc/sbin/atm/ilmid/ilmid.c#3 integrate .. //depot/projects/ia64_epc/sbin/badsect/badsect.c#3 integrate .. //depot/projects/ia64_epc/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/ia64_epc/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/ia64_epc/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/ia64_epc/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/ia64_epc/sbin/camcontrol/Makefile#3 integrate .. //depot/projects/ia64_epc/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/ia64_epc/sbin/camcontrol/modeedit.c#4 integrate .. //depot/projects/ia64_epc/sbin/camcontrol/util.c#3 integrate .. //depot/projects/ia64_epc/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/ia64_epc/sbin/clri/clri.c#2 integrate .. //depot/projects/ia64_epc/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/ia64_epc/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/ia64_epc/sbin/devd/devd.cc#5 integrate .. //depot/projects/ia64_epc/sbin/disklabel/disklabel.c#5 integrate .. //depot/projects/ia64_epc/sbin/dmesg/dmesg.c#2 integrate .. //depot/projects/ia64_epc/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/ia64_epc/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/dir.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/pass1b.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/pass3.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/ia64_epc/sbin/fsck_ffs/utilities.c#2 integrate .. //depot/projects/ia64_epc/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/ia64_epc/sbin/kldload/kldload.c#2 integrate .. //depot/projects/ia64_epc/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/ia64_epc/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/ia64_epc/sbin/md5/md5.c#3 integrate .. //depot/projects/ia64_epc/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/projects/ia64_epc/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/ia64_epc/sbin/mount/vfslist.c#2 integrate .. //depot/projects/ia64_epc/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/ia64_epc/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/ia64_epc/sbin/newfs/newfs.c#4 integrate .. //depot/projects/ia64_epc/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/ia64_epc/sbin/ping/ping.c#8 integrate .. //depot/projects/ia64_epc/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/ia64_epc/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/ia64_epc/sbin/reboot/reboot.c#3 integrate .. //depot/projects/ia64_epc/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/ia64_epc/sbin/spppcontrol/spppcontrol.c#2 integrate .. //depot/projects/ia64_epc/sbin/sunlabel/Makefile#6 integrate .. //depot/projects/ia64_epc/sbin/swapon/swapon.c#3 integrate .. //depot/projects/ia64_epc/sbin/tunefs/tunefs.c#3 integrate .. //depot/projects/ia64_epc/share/man/man4/Makefile#8 integrate .. //depot/projects/ia64_epc/share/man/man4/rue.4#1 branch .. //depot/projects/ia64_epc/share/misc/bsd-family-tree#5 integrate .. //depot/projects/ia64_epc/share/mk/bsd.README#3 integrate .. //depot/projects/ia64_epc/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/ia64_epc/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/exception.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/locore.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/sigtramp.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/amd64/support.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/amd64/support.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/amd64/swtch.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/icu_ipl.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/icu_vector.s#2 delete .. //depot/projects/ia64_epc/sys/amd64/isa/vector.S#1 branch .. //depot/projects/ia64_epc/sys/amd64/isa/vector.s#2 delete .. //depot/projects/ia64_epc/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/ia64_epc/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/ia64_epc/sys/conf/NOTES#10 integrate .. //depot/projects/ia64_epc/sys/conf/files#14 integrate .. //depot/projects/ia64_epc/sys/conf/files.amd64#3 integrate .. //depot/projects/ia64_epc/sys/conf/kern.mk#4 integrate .. //depot/projects/ia64_epc/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/fb/vga.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#14 integrate .. //depot/projects/ia64_epc/sys/dev/md/md.c#8 integrate .. //depot/projects/ia64_epc/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/mii/miidevs#2 integrate .. //depot/projects/ia64_epc/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/ia64_epc/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/ia64_epc/sys/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/ia64_epc/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumio.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumstate.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/ia64_epc/sys/geom/geom.h#9 integrate .. //depot/projects/ia64_epc/sys/geom/geom_aes.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_apple.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd.c#8 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/ia64_epc/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_dev.c#8 integrate .. //depot/projects/ia64_epc/sys/geom/geom_disk.c#9 integrate .. //depot/projects/ia64_epc/sys/geom/geom_event.c#10 integrate .. //depot/projects/ia64_epc/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/ia64_epc/sys/geom/geom_io.c#7 integrate .. //depot/projects/ia64_epc/sys/geom/geom_mbr.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_mirror.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_pc98.c#7 integrate .. //depot/projects/ia64_epc/sys/geom/geom_slice.c#8 integrate .. //depot/projects/ia64_epc/sys/geom/geom_slice.h#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_subr.c#9 integrate .. //depot/projects/ia64_epc/sys/geom/geom_sunlabel.c#9 integrate .. //depot/projects/ia64_epc/sys/geom/geom_vol_ffs.c#4 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#21 integrate .. //depot/projects/ia64_epc/sys/kern/kern_idle.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_intr.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_ktr.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/sched_ule.c#9 integrate .. //depot/projects/ia64_epc/sys/kern/subr_mbuf.c#8 integrate .. //depot/projects/ia64_epc/sys/kern/subr_prof.c#4 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_default.c#9 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/ia64_epc/sys/modules/Makefile#11 integrate .. //depot/projects/ia64_epc/sys/modules/mii/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/modules/rue/Makefile#1 branch .. //depot/projects/ia64_epc/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/ia64_epc/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/iommu.c#5 integrate .. //depot/projects/ia64_epc/sys/sys/ata.h#4 integrate .. //depot/projects/ia64_epc/sys/sys/disklabel.h#4 integrate .. //depot/projects/ia64_epc/sys/sys/mbuf.h#8 integrate .. //depot/projects/ia64_epc/sys/sys/param.h#10 integrate .. //depot/projects/ia64_epc/sys/sys/proc.h#15 integrate .. //depot/projects/ia64_epc/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.c#14 integrate .. //depot/projects/ia64_epc/sys/vm/vm_pageout.h#4 integrate .. //depot/projects/ia64_epc/usr.bin/chpass/chpass.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/chpass/table.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/cut/cut.1#2 integrate .. //depot/projects/ia64_epc/usr.bin/nohup/nohup.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/uudecode/uudecode.c#5 integrate .. //depot/projects/ia64_epc/usr.bin/uuencode/uuencode.c#2 integrate .. //depot/projects/ia64_epc/usr.bin/xargs/xargs.c#5 integrate .. //depot/projects/ia64_epc/usr.bin/xlint/arch/amd64/targparam.h#1 branch .. //depot/projects/ia64_epc/usr.bin/xlint/xlint/xlint.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ancontrol/ancontrol.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/boot98cfg/boot98cfg.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/cdcontrol/cdcontrol.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/chown/chown.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/chroot/chroot.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/dev_mkdb/dev_mkdb.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/fdcontrol/fdcontrol.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/kernbb/kernbb.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/lptcontrol/lptcontrol.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mergemaster/mergemaster.8#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mixer/mixer.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/compare.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/create.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/excludes.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/misc.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/mtree.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/spec.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/mtree/verify.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/newsyslog/newsyslog.c#6 integrate .. //depot/projects/ia64_epc/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/pwd_mkdb/pwd_mkdb.c#4 integrate .. //depot/projects/ia64_epc/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rarpd/rarpd.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.ypupdated/yp_dbdelete.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.ypupdated/yp_dbupdate.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.ypupdated/ypupdated_main.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.ypupdated/ypupdated_server.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/sa/main.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/sa/usrdb.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/slstat/slstat.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/trpt/trpt.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/vipw/vipw.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/watch/watch.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/wicontrol/wicontrol.c#4 integrate .. //depot/projects/ia64_epc/usr.sbin/yp_mkdb/yp_mkdb.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypbind/yp_ping.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypbind/ypbind.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/yppoll/yppoll.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_access.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_dblookup.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_dnslookup.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_error.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_server.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypserv/yp_svc_udp.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/ia64_epc/UPDATING#7 (text+ko) ==== @@ -17,11 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. + 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1268,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ ==== //depot/projects/ia64_epc/bin/csh/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/ia64_epc/bin/df/df.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/ia64_epc/bin/ed/ed.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/ia64_epc/bin/ls/extern.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); +void printcol(const DISPLAY *); +void printlong(const DISPLAY *); int printname(const char *); -void printscol(DISPLAY *); -void printstream(DISPLAY *); +void printscol(const DISPLAY *); +void printstream(const DISPLAY *); void usage(void); size_t len_octal(const char *, int); int prn_octal(const char *); @@ -62,3 +62,4 @@ extern char *attrs_off; extern char *enter_bold; #endif +extern int termwidth; ==== //depot/projects/ia64_epc/bin/ls/ls.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,26 @@ */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) -static void display(FTSENT *, FTSENT *, int); -static u_quad_t makenines(u_long); +/* + * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width + * into a number that wide in decimal. + * XXX: Overflows are not considered. + */ +#define MAKENINES(n) \ + do { \ + intmax_t i; \ + \ + /* Use a loop as all values of n are small. */ \ + for (i = 1; n > 0; i *= 10) \ + n--; \ + n = i - 1; \ + } while(0) + +static void display(const FTSENT *, FTSENT *, int); static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); -static void (*printfcn)(DISPLAY *); +static void (*printfcn)(const DISPLAY *); static int (*sortfcn)(const FTSENT *, const FTSENT *); long blocksize; /* block size units */ @@ -114,7 +129,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, separate with commas */ +static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -473,10 +488,10 @@ */ if (output) { putchar('\n'); - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); } else if (argc > 1) { - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); output = 1; } @@ -499,14 +514,15 @@ * points to the parent directory of the display list. */ static void -display(FTSENT *p, FTSENT *list, int options) +display(const FTSENT *p, FTSENT *list, int options) { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + long maxblock; + u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; @@ -542,9 +558,10 @@ int ninitmax; /* Fill-in "::" as "0:0:0" for the sake of scanf. */ - jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2); + jinitmax = malloc(strlen(initmax) * 2 + 2); if (jinitmax == NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 3 15:07:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D53A37B404; Sat, 3 May 2003 15:07:53 -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 801A137B401 for ; Sat, 3 May 2003 15:07:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 249FA43F85 for ; Sat, 3 May 2003 15:07:51 -0700 (PDT) (envelope-from marcel@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 h43M7o0U084001 for ; Sat, 3 May 2003 15:07:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43M7nV2083998 for perforce@freebsd.org; Sat, 3 May 2003 15:07:49 -0700 (PDT) Date: Sat, 3 May 2003 15:07:49 -0700 (PDT) Message-Id: <200305032207.h43M7nV2083998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30480 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: Sat, 03 May 2003 22:07:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=30480 Change 30480 by marcel@marcel_pluto1 on 2003/05/03 15:06:55 IFC @30477 Affected files ... .. //depot/projects/sio/bin/df/df.c#3 integrate .. //depot/projects/sio/bin/ed/ed.1#2 integrate .. //depot/projects/sio/bin/ls/extern.h#2 integrate .. //depot/projects/sio/bin/ls/ls.c#2 integrate .. //depot/projects/sio/bin/ls/print.c#2 integrate .. //depot/projects/sio/bin/ls/util.c#2 integrate .. //depot/projects/sio/bin/pax/ar_io.c#2 integrate .. //depot/projects/sio/bin/pax/ar_subs.c#2 integrate .. //depot/projects/sio/bin/pax/cache.c#2 integrate .. //depot/projects/sio/bin/pax/cpio.c#3 integrate .. //depot/projects/sio/bin/pax/extern.h#2 integrate .. //depot/projects/sio/bin/pax/gen_subs.c#2 integrate .. //depot/projects/sio/bin/pax/getoldopt.c#2 integrate .. //depot/projects/sio/bin/pax/options.c#3 integrate .. //depot/projects/sio/bin/pax/pat_rep.c#2 integrate .. //depot/projects/sio/bin/pax/pax.c#3 integrate .. //depot/projects/sio/bin/pax/pax.h#2 integrate .. //depot/projects/sio/bin/ps/fmt.c#2 integrate .. //depot/projects/sio/bin/rcp/rcp.c#4 integrate .. //depot/projects/sio/bin/sleep/sleep.c#3 integrate .. //depot/projects/sio/bin/stty/gfmt.c#2 integrate .. //depot/projects/sio/contrib/smbfs/smbutil/common.h#2 integrate .. //depot/projects/sio/etc/Makefile#3 integrate .. //depot/projects/sio/etc/devd.conf#2 integrate .. //depot/projects/sio/etc/usbd.conf#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/kernel.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/notify.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/raw_popen.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/textbox.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/sio/release/scripts/doFS.sh#2 integrate .. //depot/projects/sio/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/sio/sbin/badsect/badsect.c#2 integrate .. //depot/projects/sio/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/sio/sbin/ccdconfig/ccdconfig.c#2 integrate .. //depot/projects/sio/sbin/clri/clri.c#2 integrate .. //depot/projects/sio/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/sio/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/sio/sbin/disklabel/disklabel.c#2 integrate .. //depot/projects/sio/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/sio/sbin/fdisk/fdisk.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/dir.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/fsutil.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/pass1b.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/pass3.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/setup.c#2 integrate .. //depot/projects/sio/sbin/fsck_ffs/utilities.c#2 integrate .. //depot/projects/sio/sbin/kldconfig/kldconfig.c#2 integrate .. //depot/projects/sio/sbin/kldload/kldload.c#2 integrate .. //depot/projects/sio/sbin/kldstat/kldstat.c#2 integrate .. //depot/projects/sio/sbin/kldunload/kldunload.c#2 integrate .. //depot/projects/sio/sbin/md5/md5.c#2 integrate .. //depot/projects/sio/sbin/mdmfs/mdmfs.c#2 integrate .. //depot/projects/sio/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/sio/sbin/mount/vfslist.c#2 integrate .. //depot/projects/sio/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/sio/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/sio/sbin/newfs/newfs.c#2 integrate .. //depot/projects/sio/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/sio/sbin/ping/ping.c#2 integrate .. //depot/projects/sio/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/sio/sbin/quotacheck/quotacheck.c#2 integrate .. //depot/projects/sio/sbin/reboot/reboot.c#2 integrate .. //depot/projects/sio/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/sio/sbin/spppcontrol/spppcontrol.c#2 integrate .. //depot/projects/sio/sbin/sunlabel/Makefile#2 integrate .. //depot/projects/sio/sbin/swapon/swapon.c#2 integrate .. //depot/projects/sio/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/sio/share/man/man4/Makefile#2 integrate .. //depot/projects/sio/share/man/man4/rue.4#1 branch .. //depot/projects/sio/share/misc/bsd-family-tree#2 integrate .. //depot/projects/sio/share/mk/bsd.README#2 integrate .. //depot/projects/sio/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/sio/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/sio/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/sio/sys/amd64/amd64/exception.s#2 delete .. //depot/projects/sio/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/sio/sys/amd64/amd64/locore.s#2 delete .. //depot/projects/sio/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/sio/sys/amd64/amd64/sigtramp.s#2 delete .. //depot/projects/sio/sys/amd64/amd64/support.S#1 branch .. //depot/projects/sio/sys/amd64/amd64/support.s#2 delete .. //depot/projects/sio/sys/amd64/amd64/swtch.s#2 delete .. //depot/projects/sio/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/sio/sys/amd64/isa/icu_ipl.s#2 delete .. //depot/projects/sio/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/sio/sys/amd64/isa/icu_vector.s#2 delete .. //depot/projects/sio/sys/amd64/isa/vector.S#1 branch .. //depot/projects/sio/sys/amd64/isa/vector.s#2 delete .. //depot/projects/sio/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/sio/sys/conf/NOTES#3 integrate .. //depot/projects/sio/sys/conf/files#5 integrate .. //depot/projects/sio/sys/conf/files.amd64#3 integrate .. //depot/projects/sio/sys/conf/kern.mk#2 integrate .. //depot/projects/sio/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/sio/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/sio/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/sio/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/sio/sys/dev/em/if_em.c#2 integrate .. //depot/projects/sio/sys/dev/em/if_em.h#2 integrate .. //depot/projects/sio/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/sio/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/sio/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/sio/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/sio/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/sio/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/sio/sys/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/sio/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/sio/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/sio/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs.h#2 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/sio/sys/geom/geom_aes.c#3 integrate .. //depot/projects/sio/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/sio/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/sio/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/sio/sys/modules/Makefile#2 integrate .. //depot/projects/sio/sys/modules/mii/Makefile#2 integrate .. //depot/projects/sio/sys/modules/rue/Makefile#1 branch .. //depot/projects/sio/sys/sys/disklabel.h#2 integrate .. //depot/projects/sio/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/sio/sys/vm/vm_object.c#4 integrate .. //depot/projects/sio/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/sio/usr.bin/chpass/chpass.c#2 integrate .. //depot/projects/sio/usr.bin/chpass/table.c#2 integrate .. //depot/projects/sio/usr.bin/cut/cut.1#2 integrate .. //depot/projects/sio/usr.bin/nohup/nohup.c#2 integrate .. //depot/projects/sio/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/sio/usr.bin/uudecode/uudecode.c#2 integrate .. //depot/projects/sio/usr.bin/uuencode/uuencode.c#2 integrate .. //depot/projects/sio/usr.bin/xargs/xargs.c#2 integrate .. //depot/projects/sio/usr.bin/xlint/arch/amd64/targparam.h#1 branch .. //depot/projects/sio/usr.bin/xlint/xlint/xlint.c#2 integrate .. //depot/projects/sio/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/sio/usr.sbin/ancontrol/ancontrol.c#2 integrate .. //depot/projects/sio/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/sio/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/sio/usr.sbin/cdcontrol/cdcontrol.c#2 integrate .. //depot/projects/sio/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/sio/usr.sbin/chown/chown.c#2 integrate .. //depot/projects/sio/usr.sbin/chroot/chroot.c#2 integrate .. //depot/projects/sio/usr.sbin/dev_mkdb/dev_mkdb.c#2 integrate .. //depot/projects/sio/usr.sbin/edquota/edquota.c#2 integrate .. //depot/projects/sio/usr.sbin/fdcontrol/fdcontrol.c#2 integrate .. //depot/projects/sio/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/sio/usr.sbin/kernbb/kernbb.c#2 integrate .. //depot/projects/sio/usr.sbin/lptcontrol/lptcontrol.c#2 integrate .. //depot/projects/sio/usr.sbin/mergemaster/mergemaster.sh#3 integrate .. //depot/projects/sio/usr.sbin/mixer/mixer.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/compare.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/create.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/excludes.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/misc.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/mtree.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/spec.c#2 integrate .. //depot/projects/sio/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/sio/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/sio/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/sio/usr.sbin/pstat/pstat.c#2 integrate .. //depot/projects/sio/usr.sbin/pwd_mkdb/pwd_mkdb.c#2 integrate .. //depot/projects/sio/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/sio/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/sio/usr.sbin/rarpd/rarpd.c#2 integrate .. //depot/projects/sio/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/sio/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/sio/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.ypupdated/yp_dbdelete.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.ypupdated/yp_dbupdate.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.ypupdated/ypupdated_main.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.ypupdated/ypupdated_server.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#2 integrate .. //depot/projects/sio/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#2 integrate .. //depot/projects/sio/usr.sbin/sa/main.c#2 integrate .. //depot/projects/sio/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/sio/usr.sbin/sa/usrdb.c#2 integrate .. //depot/projects/sio/usr.sbin/slstat/slstat.c#2 integrate .. //depot/projects/sio/usr.sbin/trpt/trpt.c#2 integrate .. //depot/projects/sio/usr.sbin/vipw/vipw.c#2 integrate .. //depot/projects/sio/usr.sbin/watch/watch.c#2 integrate .. //depot/projects/sio/usr.sbin/wicontrol/wicontrol.c#2 integrate .. //depot/projects/sio/usr.sbin/yp_mkdb/yp_mkdb.c#2 integrate .. //depot/projects/sio/usr.sbin/ypbind/yp_ping.c#2 integrate .. //depot/projects/sio/usr.sbin/ypbind/ypbind.c#2 integrate .. //depot/projects/sio/usr.sbin/yppoll/yppoll.c#2 integrate .. //depot/projects/sio/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_access.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_dblookup.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_dnslookup.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_error.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_server.c#2 integrate .. //depot/projects/sio/usr.sbin/ypserv/yp_svc_udp.c#2 integrate .. //depot/projects/sio/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/sio/bin/df/df.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/sio/bin/ed/ed.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/sio/bin/ls/extern.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); +void printcol(const DISPLAY *); +void printlong(const DISPLAY *); int printname(const char *); -void printscol(DISPLAY *); -void printstream(DISPLAY *); +void printscol(const DISPLAY *); +void printstream(const DISPLAY *); void usage(void); size_t len_octal(const char *, int); int prn_octal(const char *); @@ -62,3 +62,4 @@ extern char *attrs_off; extern char *enter_bold; #endif +extern int termwidth; ==== //depot/projects/sio/bin/ls/ls.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,26 @@ */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) -static void display(FTSENT *, FTSENT *, int); -static u_quad_t makenines(u_long); +/* + * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width + * into a number that wide in decimal. + * XXX: Overflows are not considered. + */ +#define MAKENINES(n) \ + do { \ + intmax_t i; \ + \ + /* Use a loop as all values of n are small. */ \ + for (i = 1; n > 0; i *= 10) \ + n--; \ + n = i - 1; \ + } while(0) + +static void display(const FTSENT *, FTSENT *, int); static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); -static void (*printfcn)(DISPLAY *); +static void (*printfcn)(const DISPLAY *); static int (*sortfcn)(const FTSENT *, const FTSENT *); long blocksize; /* block size units */ @@ -114,7 +129,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, separate with commas */ +static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -473,10 +488,10 @@ */ if (output) { putchar('\n'); - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); } else if (argc > 1) { - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); output = 1; } @@ -499,14 +514,15 @@ * points to the parent directory of the display list. */ static void -display(FTSENT *p, FTSENT *list, int options) +display(const FTSENT *p, FTSENT *list, int options) { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + long maxblock; + u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; @@ -542,9 +558,10 @@ int ninitmax; /* Fill-in "::" as "0:0:0" for the sake of scanf. */ - jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2); + jinitmax = malloc(strlen(initmax) * 2 + 2); if (jinitmax == NULL) err(1, "malloc"); + initmax2 = jinitmax; if (*initmax == ':') strcpy(initmax2, "0:"), initmax2 += 2; else @@ -563,7 +580,7 @@ strcpy(initmax2, "0"); ninitmax = sscanf(jinitmax, - " %lu : %lu : %lu : %i : %i : %i : %llu : %lu : %lu ", + " %lu : %ld : %lu : %u : %u : %i : %jd : %lu : %lu ", &maxinode, &maxblock, &maxnlink, &maxuser, &maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr); f_notabs = 1; @@ -603,10 +620,10 @@ default: break; } - maxinode = makenines(maxinode); - maxblock = makenines(maxblock); - maxnlink = makenines(maxnlink); - maxsize = makenines(maxsize); + MAKENINES(maxinode); + MAKENINES(maxblock); + MAKENINES(maxnlink); + MAKENINES(maxsize); } bcfile = 0; flags = NULL; @@ -787,7 +804,7 @@ d.s_inode = strlen(buf); (void)snprintf(buf, sizeof(buf), "%lu", maxnlink); d.s_nlink = strlen(buf); - (void)snprintf(buf, sizeof(buf), "%qu", maxsize); + (void)snprintf(buf, sizeof(buf), "%ju", maxsize); d.s_size = strlen(buf); d.s_user = maxuser; } @@ -829,22 +846,3 @@ } return (sortfcn(*a, *b)); } - -/* - * Makenines() returns (10**n)-1. This is useful for converting a width - * into a number that wide in decimal. - */ -static u_quad_t -makenines(u_long n) -{ - u_long i; - u_quad_t reg; - - reg = 1; - /* Use a loop instead of pow(), since all values of n are small. */ - for (i = 0; i < n; i++) - reg *= 10; - reg--; - - return reg; -} ==== //depot/projects/sio/bin/ls/print.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.64 2002/12/19 01:13:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.65 2003/05/03 16:39:33 markm Exp $"); #include #include @@ -65,7 +65,7 @@ #include "ls.h" #include "extern.h" -static int printaname(FTSENT *, u_long, u_long); +static int printaname(const FTSENT *, u_long, u_long); static void printlink(const FTSENT *); static void printtime(time_t); static int printtype(u_int); @@ -74,7 +74,7 @@ static void endcolor(int); static int colortype(mode_t); #endif -static void aclmode(char *, FTSENT *, int *); +static void aclmode(char *, const FTSENT *, int *); #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) @@ -128,7 +128,7 @@ #endif void -printscol(DISPLAY *dp) +printscol(const DISPLAY *dp) { FTSENT *p; @@ -155,7 +155,7 @@ } void -printlong(DISPLAY *dp) +printlong(const DISPLAY *dp) { struct stat *sp; FTSENT *p; @@ -179,7 +179,7 @@ if (f_inode) (void)printf("%*lu ", dp->s_inode, (u_long)sp->st_ino); if (f_size) - (void)printf("%*lld ", + (void)printf("%*jd ", dp->s_block, howmany(sp->st_blocks, blocksize)); strmode(sp->st_mode, buf); /* @@ -207,7 +207,7 @@ (void)printf("%3d, %3d ", major(sp->st_rdev), minor(sp->st_rdev)); else if (dp->bcfile) - (void)printf("%*s%*lld ", + (void)printf("%*s%*jd ", 8 - dp->s_size, "", dp->s_size, sp->st_size); else printsize(dp->s_size, sp->st_size); @@ -235,10 +235,9 @@ } void -printstream(DISPLAY *dp) +printstream(const DISPLAY *dp) { FTSENT *p; - extern int termwidth; int chcnt; for (p = dp->list, chcnt = 0; p; p = p->fts_link) { @@ -260,9 +259,8 @@ } void -printcol(DISPLAY *dp) +printcol(const DISPLAY *dp) { - extern int termwidth; static FTSENT **array; static int lastentries = -1; FTSENT *p; @@ -352,7 +350,7 @@ * return # of characters printed, no trailing characters. */ static int -printaname(FTSENT *p, u_long inodefield, u_long sizefield) +printaname(const FTSENT *p, u_long inodefield, u_long sizefield) { struct stat *sp; int chcnt; @@ -365,7 +363,7 @@ if (f_inode) chcnt += printf("%*lu ", (int)inodefield, (u_long)sp->st_ino); if (f_size) - chcnt += printf("%*lld ", + chcnt += printf("%*jd ", (int)sizefield, howmany(sp->st_blocks, blocksize)); #ifdef COLORLS if (f_color) @@ -385,7 +383,7 @@ printtime(time_t ftime) { char longstring[80]; - static time_t now; + static time_t now = 0; const char *format; static int d_first = -1; @@ -457,7 +455,7 @@ static int writech(int c) { - char tmp = c; + char tmp = (char)c; (void)write(STDOUT_FILENO, &tmp, 1); return 0; @@ -518,6 +516,7 @@ case S_IFCHR: printcolor(C_CHR); return (1); + default:; } if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) { if (mode & S_ISUID) @@ -543,10 +542,10 @@ if (cs == NULL) cs = ""; /* LSCOLORS not set */ len = strlen(cs); - for (i = 0; i < C_NUMCOLORS; i++) { + for (i = 0; i < (int)C_NUMCOLORS; i++) { colors[i].bold = 0; - if (len <= 2 * i) { + if (len <= 2 * (size_t)i) { c[0] = defcolors[2 * i]; c[1] = defcolors[2 * i + 1]; } else { @@ -568,7 +567,7 @@ else if (c[j] >= 'A' && c[j] <= 'H') { colors[i].num[j] = c[j] - 'A'; colors[i].bold = 1; - } else if (tolower((unsigned char)c[j] == 'x')) + } else if (tolower((unsigned char)c[j]) == 'x') colors[i].num[j] = -1; else { warnx("invalid character '%c' in LSCOLORS" @@ -622,12 +621,12 @@ unit = unit_adjust(&dbytes); if (dbytes == 0) - (void)printf("%*s ", width, "0B"); + (void)printf("%*s ", (u_int)width, "0B"); else - (void)printf("%*.*f%c ", width - 1, dbytes > 10 ? 0 : 1, - dbytes, "BKMGTPE"[unit]); + (void)printf("%*.*f%c ", (u_int)width - 1, + dbytes > 10 ? 0 : 1, dbytes, "BKMGTPE"[unit]); } else - (void)printf("%*lld ", width, bytes); + (void)printf("%*jd ", (u_int)width, bytes); } /* @@ -658,7 +657,7 @@ } static void -aclmode(char *buf, FTSENT *p, int *haveacls) +aclmode(char *buf, const FTSENT *p, int *haveacls) { char name[MAXPATHLEN + 1]; int entries, ret; ==== //depot/projects/sio/bin/ls/util.c#2 (text+ko) ==== @@ -39,8 +39,8 @@ static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ #endif -#include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.30 2002/06/30 05:13:54 obrien Exp $"); +#include +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.31 2003/05/03 16:39:33 markm Exp $"); #include #include ==== //depot/projects/sio/bin/pax/ar_io.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.22 2003/01/01 18:48:39 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.23 2003/05/03 16:39:33 markm Exp $"); #include #include @@ -69,8 +69,10 @@ #define EXT_MODE O_RDONLY /* open mode for list/extract */ #define AR_MODE (O_WRONLY | O_CREAT | O_TRUNC) /* mode for archive */ #define APP_MODE O_RDWR /* mode for append */ -#define STDO "" /* pseudo name for stdout */ -#define STDN "" /* pseudo name for stdin */ + +static char none[] = ""; /* pseudo name for no file */ +static char stdo[] = ""; /* pseudo name for stdout */ +static char stdn[] = ""; /* pseudo name for stdin */ static int arfd = -1; /* archive file descriptor */ static int artyp = ISREG; /* archive type: file/FIFO/tape */ static int arvol = 1; /* archive volume number */ @@ -82,7 +84,7 @@ static int invld_rec; /* tape has out of spec record size */ static int wr_trail = 1; /* trailer was rewritten in append */ static int can_unlnk = 0; /* do we unlink null archives? */ -char *arcname; /* printable name of archive */ +const char *arcname; /* printable name of archive */ const char *gzip_program; /* name of gzip program */ static pid_t zpid = -1; /* pid of child process */ @@ -100,7 +102,7 @@ */ int -ar_open(char *name) +ar_open(const char *name) { struct mtget mb; @@ -119,7 +121,7 @@ case EXTRACT: if (name == NULL) { arfd = STDIN_FILENO; - arcname = STDN; + arcname = stdn; } else if ((arfd = open(name, EXT_MODE, DMOD)) < 0) syswarn(0, errno, "Failed open to read on %s", name); if (arfd != -1 && gzip_program != NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 3 15:12:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170EB37B404; Sat, 3 May 2003 15:12:59 -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 AA64D37B401 for ; Sat, 3 May 2003 15:12:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AF3F43FBD for ; Sat, 3 May 2003 15:12:58 -0700 (PDT) (envelope-from marcel@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 h43MCv0U084330 for ; Sat, 3 May 2003 15:12:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43MCvM2084327 for perforce@freebsd.org; Sat, 3 May 2003 15:12:57 -0700 (PDT) Date: Sat, 3 May 2003 15:12:57 -0700 (PDT) Message-Id: <200305032212.h43MCvM2084327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30481 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: Sat, 03 May 2003 22:13:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=30481 Change 30481 by marcel@marcel_nfs on 2003/05/03 15:12:53 Get i386 to compile again. MD support functions for GDB support have been put in db_interface.c. This should have the MI framework mostly in good shape. The only real hardcoding is in the first packet: we assume there's a PC, FP and SP. Porting the other architectures should make it clear whether we can get away with it or not. I'll cross that bridge when I come to it. Affected files ... .. //depot/projects/sio/sys/ddb/db_gdb.c#2 edit .. //depot/projects/sio/sys/i386/i386/db_interface.c#3 edit .. //depot/projects/sio/sys/i386/include/db_machdep.h#3 edit Differences ... ==== //depot/projects/sio/sys/ddb/db_gdb.c#2 (text+ko) ==== @@ -224,6 +224,94 @@ static int encdecsz; static __inline void +gdb_dec_begin(char *buf, int size) +{ + encdecp = buf; + encdecsz = size; +} + +static __inline int +gdb_dec_char(void) +{ + int c; + if (encdecsz > 0) { + c = *encdecp++; + encdecsz--; + } else + c = -1; + return (c); +} + +static __inline int +gdb_dec_int8(void) +{ + int h, l; + h = gdb_hex(gdb_dec_char()); + l = gdb_hex(gdb_dec_char()); + if (h != -1 && l != -1) + return ((h << 4) | (l & 0xf)); + else + return (-1); +} + +static __inline int +gdb_dec_int16(void) +{ + int h, l; + h = gdb_dec_int8(); + l = gdb_dec_int8(); + if (h != -1 && l != -1) + return ((h << 8) | (l & 0xff)); + else + return (-1); +} + +static __inline int32_t +gdb_dec_int32(void) +{ + int32_t h, l; + h = gdb_dec_int16(); + l = gdb_dec_int16(); + if (h != -1 && l != -1) + return ((h << 16) | (l & 0xffff)); + else + return (-1); +} + +static __inline uint64_t +gdb_dec_int64(void) +{ + int64_t h, l; + h = gdb_dec_int32(); + l = gdb_dec_int32(); + if (h != -1 && l != -1) + return ((h << 32) | (l & 0xffffffff)); + else + return (-1); +} + +static __inline int +gdb_dec_block(gdb_addr addr, int len) +{ + uint8_t *p = (void*)(intptr_t)addr; + int c; + while (len > 0) { + c = gdb_dec_int8(); + if (c == -1) + return (-1); + *p++ = c; + len--; + } + return 0; +} + +static __inline int +gdb_dec_registers(struct gdb_registers *regs) +{ + return (gdb_dec_block((intptr_t)regs, sizeof(*regs))); +} + +static __inline void gdb_enc_begin(char *buf, int size) { encdecp = buf; @@ -280,6 +368,20 @@ gdb_enc_int32(i & 0xffffffff); } +static __inline void +gdb_enc_block(gdb_addr addr, int len) +{ + uint8_t *p = (void*)(intptr_t)addr; + while (len > 0) + gdb_enc_int8(*p++), len--; +} + +static __inline void +gdb_enc_registers(struct gdb_registers *regs) +{ + gdb_enc_block((intptr_t)regs, sizeof(*regs)); +} + /* * gdb_handle_exception * @@ -327,8 +429,12 @@ int gdb_handle_exception(db_regs_t *raw_regs, int type) { - char *ptr; - int addr, error, length, regno; + struct gdb_registers regs; + gdb_addr addr; + gdb_reg reg; + int c, error, len, regno; + + gdb_getregs(®s, raw_regs); /* "TxxPC:xxxxxxxx;FP:xxxxxxxx;SP:xxxxxxxx;" */ gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); @@ -336,19 +442,18 @@ gdb_enc_int8(gdb_signal(type)); gdb_enc_int8(GDB_REGNUM_PC); gdb_enc_char(':'); - gdb_enc_register(raw_regs->eip); + gdb_enc_reg(gdb_getreg(®s, GDB_REGNUM_PC)); gdb_enc_char(';'); gdb_enc_int8(GDB_REGNUM_FP); gdb_enc_char(':'); - gdb_enc_register(raw_regs->ebp); + gdb_enc_reg(gdb_getreg(®s, GDB_REGNUM_FP)); gdb_enc_char(';'); gdb_enc_int8(GDB_REGNUM_SP); gdb_enc_char(':'); - gdb_enc_register(raw_regs->esp); + gdb_enc_reg(gdb_getreg(®s, GDB_REGNUM_SP)); gdb_enc_char(';'); - error = gdb_enc_end(); - if (!error) - error = gdb_putpacket(gdb_buffer); + gdb_enc_end(); + error = gdb_putpacket(gdb_buffer); if (error) return (error); @@ -356,7 +461,8 @@ error = gdb_getpacket(gdb_buffer); if (error) return (error); - switch (*gdb_buffer) { + gdb_dec_begin(gdb_buffer, sizeof(gdb_buffer)); + switch (gdb_dec_char()) { case '?': gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); gdb_enc_char('S'); @@ -373,25 +479,25 @@ case 'g': /* Return the value of the CPU registers */ - mem2hex((vm_offset_t)®isters, gdb_buffer, - NUMREGBYTES); + gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); + gdb_enc_registers(®s); + gdb_enc_end(); gdb_putpacket(gdb_buffer); break; case 'G': /* Set the value of the CPU registers - return OK */ - hex2mem(gdb_buffer + 1, (vm_offset_t)®isters, - NUMREGBYTES); + gdb_dec_registers(®s); gdb_putpacket("OK"); break; case 'P': /* Set the value of one register */ - ptr = gdb_buffer + 1; - if (hexToInt(&ptr, ®no) && *ptr++ == '=' && - regno < NUM_REGS) { - hex2mem(ptr, - (vm_offset_t)®isters + regno * 4, 4); + regno = gdb_dec_int32(); + c = gdb_dec_char(); + reg = gdb_dec_reg(); + if (regno > 0 && c == '=') { + gdb_setreg(®s, regno, reg); gdb_putpacket("OK"); } else gdb_putpacket("P01"); @@ -400,15 +506,15 @@ case 'm': /* mAA..AA,LLLL Read LLLL bytes at address AA..AA */ /* Try to read %x,%x. */ - ptr = gdb_buffer + 1; - if (hexToInt(&ptr, &addr) && *(ptr++) == ',' && - hexToInt (&ptr, &length)) { - if (mem2hex((vm_offset_t)addr, - gdb_buffer, length) == NULL) - gdb_putpacket("E03"); - else - gdb_putpacket(gdb_buffer); - break; + addr = gdb_dec_addr(); + c = gdb_dec_char(); + len = gdb_dec_int32(); + if (c == ',' && len > 0) { + gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); + gdb_enc_block(addr, len); + gdb_enc_end(); + gdb_putpacket(gdb_buffer); + /* XXX return "E03" when encoding fails. */ } else gdb_putpacket("E01"); break; @@ -417,31 +523,34 @@ /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA */ /* return OK */ /* Try to read '%x,%x:'. */ - ptr = gdb_buffer + 1; - if (hexToInt(&ptr,&addr) && *(ptr++) == ',' && - hexToInt(&ptr, &length) && *(ptr++) == ':') { - if (hex2mem(ptr, (vm_offset_t)addr, length) - == NULL) - gdb_putpacket("E03"); - else - gdb_putpacket("OK"); + addr = gdb_dec_addr(); + c = gdb_dec_char(); + len = gdb_dec_int32(); + if (c == ',' && len > 0 && gdb_dec_char() == ':') { + gdb_dec_block(addr, len); + gdb_putpacket("OK"); + /* XXX return "E03" when decoding fails. */ } else gdb_putpacket("E02"); break; case 'c' : /* cAA..AA Continue at address AA..AA (opt) */ - /* FALLTHROUGH */ + gdb_singlestep(®s, 0); + addr = gdb_dec_addr(); + if (addr != ~0U) + gdb_setreg(®s, GDB_REGNUM_PC, addr); + gdb_setregs(®s, raw_regs); + return (0); + case 's' : /* sAA..AA Step one instruction from AA..AA (opt) */ - gdb_cpu_set_regs(®s); - /* try to read optional parameter */ - ptr = gdb_buffer + 1; - if (hexToInt(&ptr,&addr)) - gdb_cpu_set_pc(addr); - /* set the trace bit if we're stepping */ - gdb_cpu_singlestep((*gdb_buffer == 's') ? 1 : 0); - return 0; + gdb_singlestep(®s, 1); + addr = gdb_dec_addr(); + if (addr != ~0U) + gdb_setreg(®s, GDB_REGNUM_PC, addr); + gdb_setregs(®s, raw_regs); + return (0); } /* switch */ } ==== //depot/projects/sio/sys/i386/i386/db_interface.c#3 (text+ko) ==== @@ -303,6 +303,100 @@ } } +int +gdb_signal(int vector) +{ + switch (vector & ~T_USER) { + case 0: return (SIGFPE); /* divide by zero */ + case 1: return (SIGTRAP); /* debug exception */ + case 3: return (SIGTRAP); /* breakpoint */ + case 4: return (SIGURG); /* into instr (overflow) */ + case 5: return (SIGURG); /* bound instruction */ + case 6: return (SIGILL); /* Invalid opcode */ + case 7: return (SIGFPE); /* npx not available */ + case 8: return (SIGEMT); /* double fault */ + case 9: return (SIGSEGV); /* npx segment overrun */ + case 10: return (SIGTRAP); /* Invalid TSS (also single-step) */ + case 11: return (SIGSEGV); /* Segment not present */ + case 12: return (SIGSEGV); /* stack exception */ + case 13: return (SIGSEGV); /* general protection */ + case 14: return (SIGSEGV); /* page fault */ + case 16: return (SIGEMT); /* coprocessor error */ + } + return (SIGEMT); +} + +gdb_reg +gdb_getreg(struct gdb_registers *regs, int regnum) +{ + gdb_reg *regp; + + regp = (void*)regs; + if ((void*)(regp + regnum) < (void*)(regs + 1)) + return (regp[regnum]); + /* XXX complain. */ + return (~0); +} + +void +gdb_setreg(struct gdb_registers *regs, int regnum, gdb_reg val) +{ + gdb_reg *regp; + + regp = (void*)regs; + if ((void*)(regp + regnum) < (void*)(regs + 1)) + regp[regnum] = val; +} + +void +gdb_getregs(struct gdb_registers *regs, db_regs_t *raw_regs) +{ + + regs->eax = raw_regs->tf_eax; + regs->ebx = raw_regs->tf_ebx; + regs->ecx = raw_regs->tf_ecx; + regs->edx = raw_regs->tf_edx; + regs->esp = raw_regs->tf_esp; + regs->ebp = raw_regs->tf_ebp; + regs->esi = raw_regs->tf_esi; + regs->edi = raw_regs->tf_edi; + regs->eip = raw_regs->tf_eip; + regs->eflags = raw_regs->tf_eflags; + regs->cs = raw_regs->tf_cs; + regs->ss = raw_regs->tf_ss; + regs->ds = raw_regs->tf_ds; + regs->es = raw_regs->tf_es; +} + +void +gdb_setregs(struct gdb_registers *regs, db_regs_t *raw_regs) +{ + + raw_regs->tf_eax = regs->eax; + raw_regs->tf_ebx = regs->ebx; + raw_regs->tf_ecx = regs->ecx; + raw_regs->tf_edx = regs->edx; + raw_regs->tf_esp = regs->esp; + raw_regs->tf_ebp = regs->ebp; + raw_regs->tf_esi = regs->esi; + raw_regs->tf_edi = regs->edi; + raw_regs->tf_eip = regs->eip; + raw_regs->tf_eflags = regs->eflags; + raw_regs->tf_cs = regs->cs; + raw_regs->tf_ss = regs->ss; + raw_regs->tf_ds = regs->ds; + raw_regs->tf_es = regs->es; +} + +void +gdb_singlestep(struct gdb_registers *regs, int set) +{ + if (set) + regs->eflags |= PSL_T; + else + regs->eflags &= ~PSL_T; +} + /* * XXX * Move this to machdep.c and allow it to be called if any debugger is ==== //depot/projects/sio/sys/i386/include/db_machdep.h#3 (text+ko) ==== @@ -97,9 +97,35 @@ #define GDB_REGNUM_FP 5 #define GDB_REGNUM_PC 8 -/* What size are registers? */ -#define gdb_enc_register gdb_enc_int32 +typedef uint32_t gdb_reg; +typedef uint32_t gdb_addr; + +#define gdb_dec_addr gdb_dec_int32 +#define gdb_dec_reg gdb_dec_int32 +#define gdb_enc_reg gdb_enc_int32 + +struct gdb_registers { + gdb_reg eax; + gdb_reg ecx; + gdb_reg edx; + gdb_reg ebx; + gdb_reg esp; + gdb_reg ebp; + gdb_reg esi; + gdb_reg edi; + gdb_reg eip; + gdb_reg eflags; + gdb_reg cs; + gdb_reg ss; + gdb_reg ds; + gdb_reg es; +}; -int gdb_signal(int); +gdb_reg gdb_getreg(struct gdb_registers *, int); +void gdb_getregs(struct gdb_registers *, db_regs_t *); +void gdb_setreg(struct gdb_registers *, int, gdb_reg); +void gdb_setregs(struct gdb_registers *, db_regs_t *); +void gdb_singlestep(struct gdb_registers *, int); +int gdb_signal(int); #endif /* !_MACHINE_DB_MACHDEP_H_ */ From owner-p4-projects@FreeBSD.ORG Sat May 3 15:41:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 227B837B404; Sat, 3 May 2003 15:41:55 -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 ACE5337B401 for ; Sat, 3 May 2003 15:41:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8891C43F3F for ; Sat, 3 May 2003 15:41:52 -0700 (PDT) (envelope-from marcel@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 h43Mfq0U085837 for ; Sat, 3 May 2003 15:41:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43MfXg6085832 for perforce@freebsd.org; Sat, 3 May 2003 15:41:33 -0700 (PDT) Date: Sat, 3 May 2003 15:41:33 -0700 (PDT) Message-Id: <200305032241.h43MfXg6085832@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30483 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: Sat, 03 May 2003 22:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=30483 Change 30483 by marcel@marcel_pluto1 on 2003/05/03 15:40:39 IFC @30477 Affected files ... .. //depot/projects/tty/MAINTAINERS#4 integrate .. //depot/projects/tty/Makefile#4 integrate .. //depot/projects/tty/Makefile.inc1#5 integrate .. //depot/projects/tty/Makefile.upgrade#2 delete .. //depot/projects/tty/UPDATING#4 integrate .. //depot/projects/tty/bin/cat/cat.c#2 integrate .. //depot/projects/tty/bin/chflags/chflags.1#2 integrate .. //depot/projects/tty/bin/chflags/chflags.c#2 integrate .. //depot/projects/tty/bin/chio/chio.1#2 integrate .. //depot/projects/tty/bin/chio/chio.c#2 integrate .. //depot/projects/tty/bin/chmod/chmod.c#3 integrate .. //depot/projects/tty/bin/cp/cp.1#2 integrate .. //depot/projects/tty/bin/cp/cp.c#2 integrate .. //depot/projects/tty/bin/cp/extern.h#2 integrate .. //depot/projects/tty/bin/cp/utils.c#2 integrate .. //depot/projects/tty/bin/csh/Makefile#2 integrate .. //depot/projects/tty/bin/dd/args.c#3 integrate .. //depot/projects/tty/bin/dd/dd.c#4 integrate .. //depot/projects/tty/bin/df/df.c#2 integrate .. //depot/projects/tty/bin/domainname/domainname.c#2 integrate .. //depot/projects/tty/bin/echo/echo.1#2 integrate .. //depot/projects/tty/bin/echo/echo.c#2 integrate .. //depot/projects/tty/bin/ed/ed.1#2 integrate .. //depot/projects/tty/bin/ed/main.c#2 integrate .. //depot/projects/tty/bin/hostname/hostname.c#2 integrate .. //depot/projects/tty/bin/kill/kill.c#2 integrate .. //depot/projects/tty/bin/ln/ln.c#2 integrate .. //depot/projects/tty/bin/ls/extern.h#3 integrate .. //depot/projects/tty/bin/ls/ls.c#3 integrate .. //depot/projects/tty/bin/ls/print.c#3 integrate .. //depot/projects/tty/bin/ls/util.c#3 integrate .. //depot/projects/tty/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/tty/bin/mv/mv.c#2 integrate .. //depot/projects/tty/bin/pax/ar_io.c#2 integrate .. //depot/projects/tty/bin/pax/ar_subs.c#2 integrate .. //depot/projects/tty/bin/pax/cache.c#2 integrate .. //depot/projects/tty/bin/pax/cpio.c#2 integrate .. //depot/projects/tty/bin/pax/extern.h#2 integrate .. //depot/projects/tty/bin/pax/gen_subs.c#2 integrate .. //depot/projects/tty/bin/pax/getoldopt.c#2 integrate .. //depot/projects/tty/bin/pax/options.c#2 integrate .. //depot/projects/tty/bin/pax/pat_rep.c#2 integrate .. //depot/projects/tty/bin/pax/pax.c#2 integrate .. //depot/projects/tty/bin/pax/pax.h#2 integrate .. //depot/projects/tty/bin/pax/tar.1#2 integrate .. //depot/projects/tty/bin/pax/tar.c#2 integrate .. //depot/projects/tty/bin/ps/Makefile#2 integrate .. //depot/projects/tty/bin/ps/fmt.c#3 integrate .. //depot/projects/tty/bin/ps/keyword.c#3 integrate .. //depot/projects/tty/bin/ps/print.c#3 integrate .. //depot/projects/tty/bin/ps/ps.1#2 integrate .. //depot/projects/tty/bin/ps/ps.h#2 integrate .. //depot/projects/tty/bin/pwd/pwd.1#2 integrate .. //depot/projects/tty/bin/pwd/pwd.c#2 integrate .. //depot/projects/tty/bin/rcp/rcp.c#2 integrate .. //depot/projects/tty/bin/rm/rm.c#2 integrate .. //depot/projects/tty/bin/rmdir/rmdir.c#2 integrate .. //depot/projects/tty/bin/sh/Makefile#2 integrate .. //depot/projects/tty/bin/sh/arith.y#2 integrate .. //depot/projects/tty/bin/sh/arith_lex.l#2 integrate .. //depot/projects/tty/bin/sh/expand.c#2 integrate .. //depot/projects/tty/bin/sh/jobs.c#3 integrate .. //depot/projects/tty/bin/sh/mknodes.c#2 integrate .. //depot/projects/tty/bin/sh/mksyntax.c#2 integrate .. //depot/projects/tty/bin/sh/sh.1#3 integrate .. //depot/projects/tty/bin/sleep/sleep.c#2 integrate .. //depot/projects/tty/bin/stty/gfmt.c#2 integrate .. //depot/projects/tty/bin/stty/stty.c#2 integrate .. //depot/projects/tty/bin/sync/sync.c#2 integrate .. //depot/projects/tty/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/tty/contrib/gcc/FAQ#2 delete .. //depot/projects/tty/contrib/gcc/GNATS#2 delete .. //depot/projects/tty/contrib/gcc/MAINTAINERS#2 delete .. //depot/projects/tty/contrib/gcc/bugs.html#2 delete .. //depot/projects/tty/contrib/gcc/config-ml.in#2 delete .. //depot/projects/tty/contrib/gcc/config.if#2 delete .. //depot/projects/tty/contrib/gcc/config.sub#2 delete .. //depot/projects/tty/contrib/gcc/config/ChangeLog#2 delete .. //depot/projects/tty/contrib/gcc/config/acinclude.m4#2 delete .. //depot/projects/tty/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/tty/contrib/gcc/config/i386/i386.h#3 integrate .. //depot/projects/tty/contrib/gcc/config/mh-a68bsd#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-aix386#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-apollo68#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-armpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-cxux#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-cygwin#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-decstation#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-delta88#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-dgux#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-dgux386#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-djgpp#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-elfalphapic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-hp300#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-hpux#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-hpux8#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-i370pic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-ia64pic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-interix#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-irix4#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-irix5#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-irix6#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-lynxos#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-lynxrs6k#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-m68kpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-mingw32#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-ncr3000#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-ncrsvr43#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-necv4#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-openedition#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-papic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-ppcpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-riscos#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-sco#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-solaris#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-sparcpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-sun3#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-sysv#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-sysv4#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-sysv5#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-vaxult2#2 delete .. //depot/projects/tty/contrib/gcc/config/mh-x86pic#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw-mh-mpw#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/ChangeLog#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/MoveIfChange#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/README#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/forward-include#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/g-mpw-make.sed#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/mpw-touch#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/mpw-true#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/null-command#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/open-brace#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/tr-7to8-src#2 delete .. //depot/projects/tty/contrib/gcc/config/mpw/true#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-aix43#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-alphaieee#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-armpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-d30v#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-elfalphapic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-i370pic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-ia64pic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-linux#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-m68kpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-netware#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-ospace#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-papic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-ppcpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-sparcpic#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-v810#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-wince#2 delete .. //depot/projects/tty/contrib/gcc/config/mt-x86pic#2 delete .. //depot/projects/tty/contrib/gcc/config/rs6000/sysv4.h#3 integrate .. //depot/projects/tty/contrib/gcc/contrib/ChangeLog#2 delete .. //depot/projects/tty/contrib/gcc/contrib/analyze_brprob#2 delete .. //depot/projects/tty/contrib/gcc/contrib/compare_tests#2 delete .. //depot/projects/tty/contrib/gcc/contrib/convert_to_f2c#2 delete .. //depot/projects/tty/contrib/gcc/contrib/convert_to_g2c#2 delete .. //depot/projects/tty/contrib/gcc/contrib/download_f2c#2 delete .. //depot/projects/tty/contrib/gcc/contrib/gcc_build#2 delete .. //depot/projects/tty/contrib/gcc/contrib/gcc_update#2 delete .. //depot/projects/tty/contrib/gcc/contrib/gccbug.el#2 delete .. //depot/projects/tty/contrib/gcc/contrib/gennews#2 delete .. //depot/projects/tty/contrib/gcc/contrib/index-prop#2 delete .. //depot/projects/tty/contrib/gcc/contrib/newcvsroot#2 delete .. //depot/projects/tty/contrib/gcc/contrib/regression/ChangeLog#2 delete .. //depot/projects/tty/contrib/gcc/contrib/regression/README#2 delete .. //depot/projects/tty/contrib/gcc/contrib/regression/btest-gcc.sh#2 delete .. //depot/projects/tty/contrib/gcc/contrib/regression/objs-gcc.sh#2 delete .. //depot/projects/tty/contrib/gcc/contrib/regression/site.exp#2 delete .. //depot/projects/tty/contrib/gcc/contrib/test_installed#2 delete .. //depot/projects/tty/contrib/gcc/contrib/test_summary#2 delete .. //depot/projects/tty/contrib/gcc/contrib/texi2pod.pl#2 delete .. //depot/projects/tty/contrib/gcc/contrib/warn_summary#2 delete .. //depot/projects/tty/contrib/gcc/faq.html#2 delete .. //depot/projects/tty/contrib/gcc/gnats.html#2 delete .. //depot/projects/tty/contrib/gcc/include/COPYING#2 delete .. //depot/projects/tty/contrib/gcc/include/ChangeLog#2 delete .. //depot/projects/tty/contrib/gcc/include/ansidecl.h#2 delete .. //depot/projects/tty/contrib/gcc/include/demangle.h#2 delete .. //depot/projects/tty/contrib/gcc/include/dyn-string.h#2 delete .. //depot/projects/tty/contrib/gcc/include/fibheap.h#2 delete .. //depot/projects/tty/contrib/gcc/include/floatformat.h#2 delete .. //depot/projects/tty/contrib/gcc/include/fnmatch.h#2 delete .. //depot/projects/tty/contrib/gcc/include/getopt.h#2 delete .. //depot/projects/tty/contrib/gcc/include/hashtab.h#2 delete .. //depot/projects/tty/contrib/gcc/include/libiberty.h#2 delete .. //depot/projects/tty/contrib/gcc/include/md5.h#2 delete .. //depot/projects/tty/contrib/gcc/include/objalloc.h#2 delete .. //depot/projects/tty/contrib/gcc/include/obstack.h#2 delete .. //depot/projects/tty/contrib/gcc/include/partition.h#2 delete .. //depot/projects/tty/contrib/gcc/include/safe-ctype.h#2 delete .. //depot/projects/tty/contrib/gcc/include/sort.h#2 delete .. //depot/projects/tty/contrib/gcc/include/splay-tree.h#2 delete .. //depot/projects/tty/contrib/gcc/include/symcat.h#2 delete .. //depot/projects/tty/contrib/gcc/include/ternary.h#2 delete .. //depot/projects/tty/contrib/gcc/include/xregex.h#2 delete .. //depot/projects/tty/contrib/gcc/include/xregex2.h#2 delete .. //depot/projects/tty/contrib/gcc/install-sh#2 delete .. //depot/projects/tty/contrib/gcc/libtool.m4#2 delete .. //depot/projects/tty/contrib/gcc/ltcf-c.sh#2 delete .. //depot/projects/tty/contrib/gcc/ltcf-cxx.sh#2 delete .. //depot/projects/tty/contrib/gcc/ltcf-gcj.sh#2 delete .. //depot/projects/tty/contrib/gcc/ltconfig#2 delete .. //depot/projects/tty/contrib/gcc/ltmain.sh#2 delete .. //depot/projects/tty/contrib/gcc/missing#2 delete .. //depot/projects/tty/contrib/gcc/mkdep#2 delete .. //depot/projects/tty/contrib/gcc/mkinstalldirs#2 delete .. //depot/projects/tty/contrib/gcc/symlink-tree#2 delete .. //depot/projects/tty/contrib/gcc/ylwrap#2 delete .. //depot/projects/tty/contrib/gdtoa/README#2 integrate .. //depot/projects/tty/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/tty/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/tty/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/tty/contrib/groff/ChangeLog#2 integrate .. //depot/projects/tty/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/groff/INSTALL#2 integrate .. //depot/projects/tty/contrib/groff/MANIFEST#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.ccpg#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.comm#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.dev#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.in#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.lib#2 integrate .. //depot/projects/tty/contrib/groff/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/NEWS#2 integrate .. //depot/projects/tty/contrib/groff/PROBLEMS#2 integrate .. //depot/projects/tty/contrib/groff/REVISION#2 integrate .. //depot/projects/tty/contrib/groff/VERSION#2 integrate .. //depot/projects/tty/contrib/groff/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/groff/configure#2 integrate .. //depot/projects/tty/contrib/groff/configure.ac#2 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/README#1 branch .. //depot/projects/tty/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/tty/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/ChangeLog#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/groff_mm.man#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/m.tmac#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mm/mm/4.MT#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/examples/typeset.mom#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/tty/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/tty/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/tty/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/tty/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-10#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-11#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-4#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-5#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-6#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-7#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-8#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff-9#2 integrate .. //depot/projects/tty/contrib/groff/doc/groff.texinfo#2 integrate .. //depot/projects/tty/contrib/groff/doc/pic.ms#2 integrate .. //depot/projects/tty/contrib/groff/doc/texinfo.tex#2 integrate .. //depot/projects/tty/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/CBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/NB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/NBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/NI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/NR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100-12/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/CBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/NB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/NBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/NI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/NR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX100/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/CBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/NB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/NBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/NI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/NR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75-12/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/CBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/NB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/NBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/NI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/NR#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devX75/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devascii/R.proto#2 integrate .. //depot/projects/tty/contrib/groff/font/devcp1047/R.proto#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/CW#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/CWEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/CWI#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/CWIEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/CWITC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/CWTC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/EX#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HBEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HBIEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HBITC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HBTC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HIEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HITC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HREC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/HRTC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/MI#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/SC#1 branch .. //depot/projects/tty/contrib/groff/font/devdvi/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TBEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TBIEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TBITC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TBTC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TIEC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TITC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TREC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/TRTC#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/Makefile#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/ec.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/tc.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/texb.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/texex.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/texi.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/texmi.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/texr.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/texsy.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devdvi/generate/textex.map#1 branch .. //depot/projects/tty/contrib/groff/font/devdvi/generate/textt.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devhtml/DESC.proto#2 integrate .. //depot/projects/tty/contrib/groff/font/devhtml/R.proto#2 integrate .. //depot/projects/tty/contrib/groff/font/devlatin1/R.proto#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/EB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/EI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/ER#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HNB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HNBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HNI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HNR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlbp/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/ALBB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/ALBR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AOB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AOI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/AOR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CLARENDON#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CORONET#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/GR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/LGB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/LGI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/LGR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/MARIGOLD#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/OR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCB#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UCR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UI#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/UR#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devlj4/generate/text.map#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/AB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/ABI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/AI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/AR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/BMB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/BMBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/BMI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/BMR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/CB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/CBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/CI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/CR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/EURO#1 branch .. //depot/projects/tty/contrib/groff/font/devps/HB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HNR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/HR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/NB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/NBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/NI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/NR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/PB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/PBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/PI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/PR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/S#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/TB#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/TBI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/TI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/TR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/ZCMI#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/ZD#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/ZDR#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/download#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/freeeuro.afm#1 branch .. //depot/projects/tty/contrib/groff/font/devps/freeeuro.pfa#1 branch .. //depot/projects/tty/contrib/groff/font/devps/generate/Makefile#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/generate/freeeuro.sfd#1 branch .. //depot/projects/tty/contrib/groff/font/devps/generate/sfdtopfa.pe#1 branch .. //depot/projects/tty/contrib/groff/font/devps/generate/symbolchars#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/generate/textmap#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/prologue.ps#2 integrate .. //depot/projects/tty/contrib/groff/font/devps/symbolmap#2 integrate .. //depot/projects/tty/contrib/groff/font/devutf8/NOTES#2 integrate .. //depot/projects/tty/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/tty/contrib/groff/man/groff.man#2 integrate .. //depot/projects/tty/contrib/groff/man/groff_char.man#2 integrate .. //depot/projects/tty/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/tty/contrib/groff/man/groff_font.man#2 integrate .. //depot/projects/tty/contrib/groff/man/groff_out.man#3 integrate .. //depot/projects/tty/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/tty/contrib/groff/man/roff.man#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grodvi/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grodvi/dvi.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grodvi/dvi.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grodvi/grodvi.man#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-table.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-table.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-text.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-text.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grohtml/html-text.h#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grohtml/output.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grohtml/output.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grohtml/post-html.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grohtml/post-html.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grolbp/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolbp/charset.h#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolbp/lbp.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grolbp/lbp.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grolbp/lbp.h#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolj4/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grolj4/lj4.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grolj4/lj4.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grops/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/TODO#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/grops.man#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/ps.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grops/ps.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grops/ps.h#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grops/psrm.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grops/psrm.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/devices/grotty/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/devices/grotty/tty.cc#2 delete .. //depot/projects/tty/contrib/groff/src/devices/grotty/tty.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/tty/contrib/groff/src/include/driver.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/html-strings.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/lib.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/nonposix.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/printer.h#2 integrate .. //depot/projects/tty/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libbib/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libbib/common.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libbib/common.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libbib/index.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libbib/index.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libbib/linear.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libbib/linear.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libbib/search.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libbib/search.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libdriver/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libdriver/input.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libdriver/input.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libdriver/printer.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libdriver/printer.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/libs/libgroff/assert.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/assert.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/change_lf.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/change_lf.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/cmap.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/cmap.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/color.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/color.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/cset.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/cset.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/device.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/device.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/errarg.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/errarg.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/error.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/error.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fatal.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fatal.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/filename.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/filename.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/font.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/font.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fontfile.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/fontfile.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/geometry.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/geometry.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/htmlhint.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/htmlhint.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/invalid.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/invalid.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/lf.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/lf.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/lineno.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/lineno.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/macropath.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/macropath.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/maxfilename.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/maxfilename.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/mksdir.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/mksdir.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/mkstemp.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/mkstemp.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/nametoindex.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/nametoindex.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/new.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/new.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/paper.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/paper.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/prime.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/prime.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/progname.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/progname.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/ptable.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/ptable.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/searchpath.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/searchpath.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strcasecmp.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/string.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/string.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strncasecmp.c#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strsave.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/strsave.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/tmpfile.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/tmpfile.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/libs/libgroff/tmpname.cc#2 delete .. //depot/projects/tty/contrib/groff/src/libs/libgroff/tmpname.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/box.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/box.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/delim.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/delim.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/lex.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/lex.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/limit.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/limit.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/list.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/list.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/main.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/main.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/mark.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/mark.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/eqn/other.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/other.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/over.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/over.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/pile.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/pile.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/script.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/script.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/special.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/special.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/sqrt.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/sqrt.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/eqn/text.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/eqn/text.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/grn/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/README#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/grn/hdb.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/grn/hdb.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/grn/hgraph.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/grn/hgraph.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/grn/hpoint.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/grn/hpoint.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/grn/main.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/grn/main.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/html/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/html/pre-html.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/html/pre-html.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/html/pushback.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/html/pushback.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/common.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/pic/common.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/pic/lex.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/pic/lex.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/pic/main.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/pic/main.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/pic/object.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/pic/object.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/pic/pic.h#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/pic.man#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/pic.y#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/pic/tex.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/pic/tex.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/pic/troff.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/pic/troff.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/refer/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/command.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/refer/command.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/refer/ref.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/refer/ref.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/refer/refer.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/refer/refer.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/refer/token.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/refer/token.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/soelim/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/soelim/soelim.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/soelim/soelim.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/preproc/tbl/main.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/tbl/main.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/tbl/table.cc#2 delete .. //depot/projects/tty/contrib/groff/src/preproc/tbl/table.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/preproc/tbl/tbl.man#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/groff.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/groff/groff.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/groff/groff.man#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/groff/pipeline.c#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/grog/grog.man#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/nroff/nroff.man#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/nroff/nroff.sh#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/charinfo.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/column.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/column.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/dictionary.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/dictionary.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/div.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/div.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/div.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/env.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/env.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/glyphuni.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/input.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/input.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/node.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/node.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/node.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/number.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/number.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/reg.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/reg.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/symbol.cc#2 delete .. //depot/projects/tty/contrib/groff/src/roff/troff/symbol.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/token.h#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/troff.man#2 integrate .. //depot/projects/tty/contrib/groff/src/roff/troff/unicode.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/unicode.h#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/uniglyph.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/roff/troff/uniuni.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/addftinfo.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/addftinfo.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/guess.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/addftinfo/guess.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/afmtodit/afmtodit.man#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/afmtodit/afmtodit.pl#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/hpftodit.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/hpftodit.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/hpftodit/hpftodit.man#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/indxbib/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/indxbib/indxbib.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/indxbib/indxbib.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/lkbib/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/lkbib/lkbib.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/lkbib/lkbib.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/lookbib/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/lookbib/lookbib.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/lookbib/lookbib.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/utils/pfbtops/pfbtops.c#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/pfbtops/pfbtops.man#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/tfmtodit/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#2 delete .. //depot/projects/tty/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#1 branch .. //depot/projects/tty/contrib/groff/src/xditview/ChangeLog#2 integrate .. //depot/projects/tty/contrib/groff/src/xditview/DviChar.c#2 integrate .. //depot/projects/tty/contrib/groff/src/xditview/Imakefile.in#2 integrate .. //depot/projects/tty/contrib/groff/src/xditview/draw.c#2 integrate .. //depot/projects/tty/contrib/groff/tmac/Makefile.sub#2 integrate .. //depot/projects/tty/contrib/groff/tmac/README#2 integrate .. //depot/projects/tty/contrib/groff/tmac/X.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/Xps.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/a4.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/an-old.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/composite.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/cp1047.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-ditroff#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-nroff#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/dvi.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/ec.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/eqnrc#2 integrate .. //depot/projects/tty/contrib/groff/tmac/europs.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/groff_man.man#2 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/tty/contrib/groff/tmac/html-end.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/html.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/hyphen.us#2 integrate .. //depot/projects/tty/contrib/groff/tmac/hyphenex.pl#1 branch .. //depot/projects/tty/contrib/groff/tmac/hyphenex.us#1 branch .. //depot/projects/tty/contrib/groff/tmac/latin1.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/latin2.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/latin9.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/lbp.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/lj4.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/papersize.tmac#1 branch .. //depot/projects/tty/contrib/groff/tmac/ps.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/pspic.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/troffrc#2 integrate .. //depot/projects/tty/contrib/groff/tmac/troffrc-end#2 integrate .. //depot/projects/tty/contrib/groff/tmac/tty-char.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/tty.tmac#2 integrate .. //depot/projects/tty/contrib/groff/tmac/www.tmac#2 integrate .. //depot/projects/tty/contrib/groff/win32-diffs#2 delete .. //depot/projects/tty/contrib/ipfilter/Makefile#3 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipmon.8#3 integrate .. //depot/projects/tty/contrib/isc-dhcp/client/dhclient.8#2 integrate .. //depot/projects/tty/contrib/isc-dhcp/client/dhclient.c#2 integrate .. //depot/projects/tty/contrib/one-true-awk/FIXES#2 integrate .. //depot/projects/tty/contrib/one-true-awk/README#2 integrate .. //depot/projects/tty/contrib/one-true-awk/b.c#2 integrate .. //depot/projects/tty/contrib/one-true-awk/lib.c#2 integrate .. //depot/projects/tty/contrib/one-true-awk/main.c#2 integrate .. //depot/projects/tty/contrib/one-true-awk/makefile#2 integrate .. //depot/projects/tty/contrib/one-true-awk/run.c#2 integrate .. //depot/projects/tty/contrib/openpam/HISTORY#2 integrate .. //depot/projects/tty/contrib/openpam/README#2 integrate .. //depot/projects/tty/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/tty/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/tty/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_impl.h#3 integrate .. //depot/projects/tty/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_getenv.c#3 integrate .. //depot/projects/tty/contrib/openpam/lib/pam_set_item.c#3 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#4 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/README#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/cfhead.m4#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/proto.m4#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#4 integrate .. //depot/projects/tty/contrib/sendmail/cf/mailer/usenet.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/tty/contrib/sendmail/doc/op/op.me#4 integrate .. //depot/projects/tty/contrib/sendmail/editmap/editmap.8#2 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/index.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/installation.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/sample.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_getsymval.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/clock.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libsm/config.c#2 integrate .. //depot/projects/tty/contrib/sendmail/mail.local/mail.local.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/README#4 integrate .. //depot/projects/tty/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/deliver.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/tty/contrib/sendmail/src/main.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/milter.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/readcf.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/tty/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/tls.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#4 integrate .. //depot/projects/tty/contrib/smbfs/lib/smb/ctx.c#2 integrate .. //depot/projects/tty/contrib/smbfs/smbutil/common.h#2 integrate .. //depot/projects/tty/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/tty/contrib/texinfo/COPYING#2 integrate .. //depot/projects/tty/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/tty/contrib/texinfo/ChangeLog#2 integrate .. //depot/projects/tty/contrib/texinfo/FREEBSD-Xlist#2 integrate .. //depot/projects/tty/contrib/texinfo/FREEBSD-upgrade#2 integrate .. //depot/projects/tty/contrib/texinfo/INSTALL#2 integrate .. //depot/projects/tty/contrib/texinfo/INTRODUCTION#2 integrate .. //depot/projects/tty/contrib/texinfo/NEWS#2 integrate .. //depot/projects/tty/contrib/texinfo/README#2 integrate .. //depot/projects/tty/contrib/texinfo/TODO#2 integrate .. //depot/projects/tty/contrib/texinfo/config.h#2 integrate .. //depot/projects/tty/contrib/texinfo/config.h.in#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/README#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/help2man#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/info-stnd.texi#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/info.1#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/info.texi#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/install-info.1#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/makeinfo.1#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/texindex.1#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/texinfo.txi#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/tty/contrib/texinfo/doc/version.texi#2 integrate .. //depot/projects/tty/contrib/texinfo/info/README#2 integrate .. //depot/projects/tty/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/tty/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/tty/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/doc.c#2 integrate .. //depot/projects/tty/contrib/texinfo/info/doc.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/echo-area.c#2 integrate .. //depot/projects/tty/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/filesys.c#2 integrate .. //depot/projects/tty/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/tty/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/funs.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/tty/contrib/texinfo/info/indices.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 3 16:07:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA09C37B410; Sat, 3 May 2003 16:07:31 -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 767F437B405 for ; Sat, 3 May 2003 16:07:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D81AA43FAF for ; Sat, 3 May 2003 16:07:29 -0700 (PDT) (envelope-from marcel@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 h43N7T0U088076 for ; Sat, 3 May 2003 16:07:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43N7TdW088072 for perforce@freebsd.org; Sat, 3 May 2003 16:07:29 -0700 (PDT) Date: Sat, 3 May 2003 16:07:29 -0700 (PDT) Message-Id: <200305032307.h43N7TdW088072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30489 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: Sat, 03 May 2003 23:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=30489 Change 30489 by marcel@marcel_pluto1 on 2003/05/03 16:06:53 IFC @30487 Affected files ... .. //depot/projects/ia64/contrib/groff/tmac/doc-common#10 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#10 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#87 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#28 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/locore.s#14 integrate Differences ... ==== //depot/projects/ia64/contrib/groff/tmac/doc-common#10 (text+ko) ==== @@ -554,7 +554,10 @@ . as doc-header-string "\|.\|.\|. . \} . tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] -. sp \n[doc-header-space]u +. ie !\n[cR] \ +. sp \n[doc-header-space]u +. el \ +. sp 1v . ev . ns .. @@ -665,7 +668,7 @@ .\" NS width register `Nd' set above . .de Nd -. nop \- \$* +. nop \[em] \$* .. . . ==== //depot/projects/ia64/contrib/groff/tmac/doc-ditroff#5 (text+ko) ==== @@ -118,13 +118,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space .5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space .5i . . .\" NS doc-display-vertical global register @@ -138,13 +138,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/ia64/contrib/groff/tmac/doc-nroff#5 (text+ko) ==== @@ -97,13 +97,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space 0.5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space 0.5i . . .\" NS doc-display-vertical global register @@ -117,13 +117,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#10 (text+ko) ==== @@ -16,17 +16,21 @@ %release; + +X"> +X"> + ]>
- Early Adopter's Guide to &os; 5.0-RELEASE + Early Adopter's Guide to &os; &release.current; The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.14 2003/04/07 11:20:24 murray Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.15 2003/05/03 22:14:55 bmah Exp $ 2002 @@ -34,35 +38,50 @@ The &os; Release Engineering Team + + + This article describes the status of &os; + &release.current;, from the standpoint of users who may be new + to the &release.5x; series of releases or to &os; in general. + It presents some background information on release + engineering, some highlights of new features, and some + possible drawbacks that might be faced by early adopters. It + also contains some of the future release engineering plans for + the 4-STABLE development branch and some tips on upgrading + existing systems. + Introduction - &os; 5.0 marks the first new major version of &os; in + &os; &release.5x; marks the first new major version of &os; in over two years. Besides a number of new features, it also contains a number of major developments in the underlying system architecture. Along with these advances, however, comes a system that incorporates a tremendous amount of new and not-widely-tested code. Compared to the existing line of - 4.X releases, 5.0 may have regressions + &release.4x; releases, the first few &release.5x; releases + may have regressions in areas of stability, performance, and occasionally functionality. - For these reasons, the &a.re; does not - encourage users to blindly update from older &os; releases to - 5.0. Specifically, for more conservative users, we recommend - running 4.X releases (such as + For these reasons, the &a.re; specifically + discourages users from updating from older &os; releases to + &release.current; unless they are aware of (and prepared to deal + with) possible regressions in the newer releases. + Specifically, for more conservative users, we recommend + running &release.4x; releases (such as 4.8-RELEASE) for the near-term future. We feel that such users are probably best served by - upgrading to 5.X only after a + upgrading to &release.5x; only after a 5-STABLE development branch has been created; this may be around - the time of 5.1-RELEASE or 5.2-RELEASE. + the time of 5.2-RELEASE. - (&os; 5.0 suffers from what has been described as a + (&os; &release.5x; suffers from what has been described as a chicken and egg problem. The entire project has - a goal of producing a 5.0-RELEASE that is as stable and reliable + a goal of producing releases that are as stable and reliable as possible. This stability and reliability requires widespread testing, particularly of the system's newer features. However, getting a large number of users to test the system, in a @@ -70,14 +89,14 @@ release first!) This article describes some of the issues involved in - installing and running &os; 5.0-RELEASE. We begin with a + installing and running &os; &release.current;. We begin with a brief overview of the &os; release process. We then present - some of the more noteworthy new features in &os; 5.0, along + some of the more noteworthy new features in &os; &release.current;, along with some areas that may prove troublesome for unwary users. For those users choosing to remain with 4-STABLE-based releases, we give some of the short- to medium-term plans for this development branch. Finally, we present some notes on upgrading - existing 4.X systems to 5.0. + existing &release.4x; systems to &release.current;. @@ -98,12 +117,12 @@ these branches after some amount of testing in CURRENT. At the moment, only one STABLE branch is under active development; this branch is referred to as 4-STABLE, and all of the - &os; 4.X releases were based on + &os; &release.4x; releases were based on it. This branch has the tag RELENG_4 in the CVS repository. - &os; 5.0 will be based on the CURRENT branch. This - will be the first release from this branch in over two years (the + &os; 5.0 and 5.1 are based on the CURRENT branch. These + are the first releases from this branch in over two years (the last was &os; 4.0, in March 2000). At some point after the release of &os; 5.0, a @@ -112,31 +131,37 @@ The past two stable branches (3-STABLE and 4-STABLE) were created immediately after their respective dot-oh releases (3.0 and 4.0, respectively). In hindsight, this - practice did not give sufficient time for either CURRENT or the new - STABLE branches to stabilize after the new branches were - created. + practice did not give sufficient time for either CURRENT + to stabilize before the new branches were + created. This in turn resulted in wasted effort porting bug + fixes between branches, as well as some architectural changes + that could not be ported between branches at all. Therefore, the release engineering team will only create the - 5-STABLE branch in the CVS repository after they have found a + 5-STABLE branch in the CVS repository after we have found a relatively stable state to use as its basis. It is likely that there will be - multiple releases in the 5.X series + multiple releases in the &release.5x; series before this happens; we estimate that the 5-STABLE branch will be created sometime after - 5.1-RELEASE or 5.2-RELEASE. + 5.2-RELEASE. More information on &os; release engineering processes can be found on the Release - Engineering Web pages and in the &os; Release - Engineering article. + Engineering Web pages and in the &os; Release + Engineering article. Specific issues for the upcoming + 5-STABLE development branch can be found in The + Roadmap for 5-STABLE. New Features - A large attraction of &os; 5.0 is a number of new + A large attraction of &os; &release.5x; is a number of new features. These new features and functionality generally involve large architectural changes that were not feasible to port back to the &os; 4-STABLE development branch. (By contrast, many @@ -149,13 +174,15 @@ SMPng: The next generation support for SMP machines (work in progress). There is now partial support for multiple processors to be running in the kernel - at the same time. + at the same time. This work is ongoing. KSE: Kernel Scheduled Entities allow a single process to have multiple kernel-level threads, similar to Scheduler - Activations. + Activations. The (experimental) libkse + and libthr libraries make this + feature available to multi-threaded userland programs. @@ -166,7 +193,7 @@ GCC: The compiler toolchain is now based on GCC - 3.2.1, rather than GCC + 3.2.2, rather than GCC 2.95.X. @@ -190,7 +217,9 @@ UFS2: A new UFS2 on-disk format has been added, which supports extended per-file attributes and larger file - sizes. + sizes. UFS2 is now the default format for &man.newfs.8;. + On all platforms except for pc98, filesystems created from + within &man.sysinstall.8; will use UFS2 by default. @@ -200,14 +229,14 @@ A more comprehensive list of new features can be found in - the release notes for &os; 5.0. + the release notes for &os; &release.prev; and &os; &release.current;. Drawbacks to Early Adoption - Along with the new features of &os; 5.0 come some areas + Along with the new features of &os; &release.5x; come some areas that can cause problems, or at least can lead to unexpected behavior. Generally, these come from the fact that a number of features are works-in-progress. A partial list of these @@ -217,7 +246,9 @@ A number of features are not yet finished. Examples - from the feature list above include SMPng and KSE. + from the feature list above include SMPng and KSE. While + suitable for testing and experimentation, these features may + not be ready for production use. @@ -238,6 +269,14 @@ + Some parts of the &os; base system have fallen into a + state of disrepair due to a lack of users and maintainers. + These have been removed. Specific examples include the + generation of a.out-style executables, XNS networking + support, and the X-10 controller driver. + + + A number of ports and packages do not build or do not run correctly under &os; 5.0, whereas they did under &os; 4-STABLE. Generally these problems are caused by compiler @@ -245,8 +284,7 @@ - Because &os; 5.0 is the first release from the - CURRENT branch in over two years, many of its features are + Many &os; &release.5x; features are seeing wide exposure for the first time. Many of these features (such as SMPng) have broad impacts on the kernel. @@ -264,7 +302,7 @@ branch after a settling time in -CURRENT. &os; 5.0 does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development - branch will be created sometime after 5.1-RELEASE or + branch will be created sometime after 5.2-RELEASE.) @@ -273,7 +311,7 @@ url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook and FAQ) - may not reflect changes recently made to &os; 5.0. + may not reflect changes recently made to &os; &release.5x;. @@ -281,7 +319,7 @@ Because a number of these drawbacks affect system stability, the release engineering team recommends that more conservative sites and users stick to releases based on the 4-STABLE branch until - the 5.X series is more polished. + the &release.5x; series is more polished. @@ -289,27 +327,26 @@ Plans for the 4-STABLE Branch The release of &os; 5.0 does not mean the end of the - 4-STABLE branch. There will most likely be at least one more release on + 4-STABLE branch. Indeed, &os; 4.8 was released two months after + 5.0, in April 2003. There will most likely be at least one more release on this branch, namely 4.9-RELEASE, currently scheduled for summer - 2003. - - As of this writing, the release engineering team has no - definite plans for future releases (past 4.8) on the 4-STABLE - branch. However, a 4.9-RELEASE or even a 4.10-RELEASE are - likely possibilities. Any future releases from this branch will + 2003. + A 4.10-RELEASE is a likely possibility as well. + Future releases from this branch will depend on several factors. The most important of these is the existence and stability of the 5-STABLE branch. If CURRENT is not sufficiently stable to allow the creation of a 5-STABLE branch, this may require and permit more releases from the 4-STABLE branch. Until the last declared release - on the 4-STABLE branch, new features may be merged from HEAD at + on the 4-STABLE branch, new features may be merged from HEAD at the discretion of developers, subject to existing release engineering policies. - To some extent, the release engineering team will take into + To some extent, the release engineering team (as well as the + developer community as a whole) will take into account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering - resources (in terms of personnel, computing resources, and mirror + resources (particularly developers' time, computing resources, and mirror archive space). The &a.security-officer; will continue to support releases @@ -319,20 +356,20 @@ page on the &os; web site. Generally, the two most recent releases from any branch will be supported with respect to security advisories and security fixes. At its discretion, - the team may support other releases. + the team may support other releases for specific issues. - Notes on Upgrading + Notes on Upgrading from &os; &release.4x; For those users with existing &os; systems, this section offers a few notes on upgrading a &os; - 4.X system to - 5.X. As with any &os; upgrade, it + &release.4x; system to + &release.5x;. As with any &os; upgrade, it is crucial to read the release notes and the errata for the version in question, as well as - src/UPDATING for source upgrades. + src/UPDATING in the case of source upgrades. Binary Upgrades @@ -341,14 +378,16 @@ backup everything, reformat, reinstall, and restore everything. This eliminates problems of incompatible or obsolete executables or configuration files polluting the - new system. + new system. It allows new filesystems to be created to take + advantage of new functionality (most notably, the UFS2 + defaults). As of this time, the binary upgrade option in &man.sysinstall.8; has not been well-tested for cross-major-version upgrades. Using this feature is not recommended. In particular, a binary upgrade will leave behind a number of files that are present in &os; - 4.X but not in 5.0. These obsolete + &release.4x; but not in &release.5x;. These obsolete files may create some problems. On the i386 and pc98 platforms, a UserConfig utility @@ -371,7 +410,7 @@ rather than the stripped-down kernel on the floppy images. In theory, any system capable of booting the Microsoft Windows NT 4 installation CDROMs should be able to cope with the &os; - 5.0 CDROMs. + &release.5x; CDROMs. @@ -402,8 +441,8 @@ users will not notice this change. It is generally possible to run old - 4.X executables under - 5.X, but this requires the + &release.4x; executables under + &release.5x;, but this requires the compat4x distribution to be installed. Thus, using old ports may be possible. @@ -417,22 +456,38 @@ (especially with C++ programs) as the compiler may wind up using a mixture of obsolete and current header files. - MAKEDEV is no longer available. - FreeBSD 5.X uses a device filesystem. For more information, + MAKEDEV is no longer available, nor + is it required. + FreeBSD &release.5x; uses a device filesystem, which automatically + creates device nodes on demand. For more information, please see &man.devfs.5;. + UFS2 is the default on-disk format for file systems + created using &man.newfs.8;. For all platforms except pc98, + it is also the default for file systems created using the disk + labeling screen within &man.sysinstall.8;. Because &os; + &release.4x; only understands UFS1 (not UFS2), disk partitions + that need to be accessed by both &release.5x; and &release.4x; + must be created with UFS1. This can be specified using the + option to &man.newfs.8;, or on the disk + labeling screen in &man.sysinstall.8;. This situation most + often arises with a a single machine that dual-boots &os; + &release.4x; and &os; &release.5x;. Note that there is no way + to convert file systems between the two on-disk formats (other + than backing up, re-creating the file system, and + restoring). + - Summary - While &os; 5.0 contains a number of new and exciting + While &os; &release.current; contains a number of new and exciting features, it may not be suitable for all users at this time. In this document, we presented some background on release - engineering, some of the more notable new features of the 5.X + engineering, some of the more notable new features of the &release.5x; series, and some drawbacks to early adoption. We also presented some future plans for the 4-STABLE development branch and some tips on upgrading for early adopters. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#87 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.558 2003/05/03 09:44:25 dougb Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.560 2003/05/03 22:18:49 bmah Exp $ 2000 @@ -23,9 +23,10 @@ recent changes made to the &os; base system on the &release.branch; development branch. ]]> - Both changes for kernel and userland are listed, as well as - applicable security advisories that were issued since the last - release. Some brief remarks on upgrading are also presented. + This document lists applicable security advisories that were issued since + the last release, as well as significant changes to the &os; + kernel and userland. + Some brief remarks on upgrading are also presented. @@ -61,6 +62,24 @@ Handbook. ]]> + + Users who are new to the &release.branch; series of &os; + &release.type;s should also read the Early Adopters Guide + to &os; &release.current;. This document can generally be + found in the same location as the release notes (either as a part of a + &os; distribution or on the &os; Web site). It contains important + information regarding the advantages and disadvantages of using + &os; &release.current;, as opposed to releases based on the &os; + 4-STABLE development branch. + + All users are encouraged to consult the release errata before + installing &os;. The errata document is updated with + late-breaking information discovered late in the + release cycle or after the release. Typically, it contains + information on known bugs, security advisories, and corrections to + documentation. An up-to-date copy of the errata for &os; + &release.current; can be found on the &os; Web site. + @@ -78,21 +97,22 @@ since &release.prev;. It includes items that are unique to the &release.branch; branch, as well as some features that may have been recently merged to - other branches (after &os; &release.prev.historic;). The later + other branches (after &os; &release.prev.historic;). The latter items are marked as &merged;. ]]> Typical release note items - document new drivers or hardware support, new commands or options, - major bug fixes, or contributed software upgrades. Applicable security - advisories issued after &release.prev.historic; are also listed. + document recent security advisories issued after + &release.prev.historic;, + new drivers or hardware support, new commands or options, + major bug fixes, or contributed software upgrades. They may also + list changes to major ports/packages or release engineering + practices. Clearly the release notes cannot list every single + change made to &os; between releases; this document focuses + primarily on security advisories, user-visible changes, and major + architectural improvements. - Many additional changes were made to &os; that are not listed - here for lack of space. For example, documentation was corrected - and improved, minor bugs were fixed, insecure coding practices - were audited and corrected, and source code was cleaned up. - Security Advisories @@ -276,7 +296,7 @@ Modules designed for use with &os; 4.X are likely to - panic and should be used with extreme caution. + panic when loaded into a &os; &release.current; kernel and should be used with extreme caution. @@ -301,7 +321,7 @@ SHDSL modem has been added. &merged; A new &man.wlan.4; module provides 802.11 link-layer support. The - &man.wi.4; driver now uses this facility. + &man.wi.4; and &man.an.4; drivers now use this facility. A timing bug in the &man.xl.4; driver, which could cause a kernel panic (or other @@ -403,7 +423,7 @@ programs are &man.camcontrol.8; in the base system, the sysutils/cdrtools port, and the - multimedia/xmmsport. + multimedia/xmms port. @@ -513,7 +533,7 @@ &man.disklabel.8; is now only built for architectures where it is useful (i386, pc98, alpha, and ia64). - The to &man.disklabel.8; has been + The option to &man.disklabel.8; has been removed because the i386 boot loader now resides in a single file. @@ -600,7 +620,7 @@ conjunction with the recently-added net.inet.ip.portrange.reservedhigh sysctl. - The MAKEDEV script is now unnecessary, due to the mandatory + The MAKEDEV script is now unnecessary, due to the mandatory presence of &man.devfs.5;, and has been removed. &man.mergemaster.8; now supports a @@ -634,7 +654,7 @@ &man.newfs.8; will now create UFS2 file systems by default, unless UFS1 is specifically requested with the - . + option. &man.newsyslog.8; now supports a W flag to force previously-started compression jobs for an entry (or @@ -679,9 +699,11 @@ remains unsuitable for all but trivial uses.) &man.rtld.1; now has support for the dynamic mapping of - shared object dependencies. More information can be found in - &man.libmap.conf.5;. This is an optional feature, disabled by - default. + shared object dependencies. This optional feature is especially + useful when experimenting with different threading libraries. + It is not, however, built by default. More information on + enabling and using this feature can be found in + &man.libmap.conf.5;. &man.sem.open.3; now correctly handles multiple opens of the same semaphore; as a result, &man.sem.close.3; no longer crashes @@ -958,7 +980,7 @@ Users with existing &os; systems are highly encouraged to read the Early - Adopter's Guide to &os; 5.0. This document generally has + Adopter's Guide to &os; &release.current;. This document generally has the filename EARLY.TXT on the distribution media, or any other place that the release notes can be found. It offers some notes on upgrading, but more importantly, also ==== //depot/projects/ia64/sys/dev/bge/if_bge.c#28 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.37 2003/05/03 19:06:50 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.38 2003/05/03 22:58:45 ps Exp $"); #include #include @@ -1003,6 +1003,7 @@ struct bge_softc *sc; { int i; + u_int32_t dma_rw_ctl; /* Set endianness before we access any non-PCI registers. */ #if BYTE_ORDER == BIG_ENDIAN @@ -1042,14 +1043,45 @@ if (pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & BGE_PCISTATE_PCI_BUSMODE) { /* Conventional PCI bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x3F000F, 4); + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); } else { /* PCI-X bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x1B000F, 4); + /* + * The 5704 uses a different encoding of read/write + * watermarks. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); + else + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x3 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); + + /* + * 5703 and 5704 need ONEDMA_AT_ONCE as a workaround + * for hardware bugs. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) { + u_int32_t tmp; + + tmp = CSR_READ_4(sc, BGE_PCI_CLKCTL) & 0x1f; + if (tmp == 0x6 || tmp == 0x7) + dma_rw_ctl |= BGE_PCIDMARWCTL_ONEDMA_ATONCE; + } } + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl &= ~BGE_PCIDMARWCTL_MINDMA; + pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, dma_rw_ctl, 4); + /* * Set up general mode register. */ @@ -1415,7 +1447,7 @@ CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK); } else { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16); - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, BGE_EVTENB_MI_INTERRUPT); } @@ -1620,10 +1652,6 @@ pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & BGE_PCIMISCCTL_ASICREV; - /* Pretend all 5700s are the same */ - if ((sc->bge_asicrev & 0xFF000000) == BGE_ASICREV_BCM5700) - sc->bge_asicrev = BGE_ASICREV_BCM5700; - /* * Figure out what sort of media we have by checking the * hardware config word in the first 32k of NIC internal memory, @@ -2037,7 +2065,7 @@ * the interrupt handler. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) { u_int32_t status; status = CSR_READ_4(sc, BGE_MAC_STS); ==== //depot/projects/ia64/sys/dev/bge/if_bgereg.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.14 2003/05/02 19:53:40 ps Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.15 2003/05/03 22:58:45 ps Exp $ */ /* @@ -231,7 +231,11 @@ #define BGE_ASICREV_BCM5704_A2 0x20020000 /* shorthand one */ -#define BGE_ASICREV_BCM5700 0x71000000 +#define BGE_ASICREV(x) ((x) >> 28) +#define BGE_ASICREV_BCM5700 0x07 +#define BGE_ASICREV_BCM5701 0x00 +#define BGE_ASICREV_BCM5703 0x01 +#define BGE_ASICREV_BCM5704 0x02 /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF @@ -239,11 +243,15 @@ #define BGE_PCIDMARWCTL_WRADDR_BNDRY 0x00003800 #define BGE_PCIDMARWCTL_ONEDMA_ATONCE 0x00004000 #define BGE_PCIDMARWCTL_RD_WAT 0x00070000 +# define BGE_PCIDMARWCTL_RD_WAT_SHIFT 16 #define BGE_PCIDMARWCTL_WR_WAT 0x00380000 +# define BGE_PCIDMARWCTL_WR_WAT_SHIFT 19 #define BGE_PCIDMARWCTL_USE_MRM 0x00400000 #define BGE_PCIDMARWCTL_ASRT_ALL_BE 0x00800000 #define BGE_PCIDMARWCTL_DFLT_PCI_RD_CMD 0x0F000000 +# define BGE_PCIDMA_RWCTL_PCI_RD_CMD_SHIFT 24 #define BGE_PCIDMARWCTL_DFLT_PCI_WR_CMD 0xF0000000 +# define BGE_PCIDMA_RWCTL_PCI_WR_CMD_SHIFT 28 #define BGE_PCI_READ_BNDRY_DISABLE 0x00000000 #define BGE_PCI_READ_BNDRY_16BYTES 0x00000100 ==== //depot/projects/ia64/sys/ia64/ia64/locore.s#14 (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/ia64/ia64/locore.s,v 1.28 2003/04/06 21:31:26 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/locore.s,v 1.29 2003/05/03 23:05:16 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -333,9 +333,9 @@ intr_n = 0 .rept INTRCNT_COUNT - 1 .ascii "#" - .byte intr_n / 100 + '0 - .byte (intr_n % 100) / 10 + '0 - .byte intr_n % 10 + '0 + .byte intr_n / 100 + '0' + .byte (intr_n % 100) / 10 + '0' + .byte intr_n % 10 + '0' .fill INTRNAME_LEN - 1 - 3 - 1, 1, ' ' .byte 0 intr_n = intr_n + 1 From owner-p4-projects@FreeBSD.ORG Sat May 3 16:08:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A3D837B404; Sat, 3 May 2003 16:08: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 054AF37B401 for ; Sat, 3 May 2003 16:08:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB6BD43FBF for ; Sat, 3 May 2003 16:08:31 -0700 (PDT) (envelope-from marcel@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 h43N8V0U088173 for ; Sat, 3 May 2003 16:08:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43N8VAt088169 for perforce@freebsd.org; Sat, 3 May 2003 16:08:31 -0700 (PDT) Date: Sat, 3 May 2003 16:08:31 -0700 (PDT) Message-Id: <200305032308.h43N8VAt088169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30490 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: Sat, 03 May 2003 23:08:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30490 Change 30490 by marcel@marcel_pluto1 on 2003/05/03 16:07:36 IFia64 Affected files ... .. //depot/projects/ia64_epc/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/doc-ditroff#4 integrate .. //depot/projects/ia64_epc/contrib/groff/tmac/doc-nroff#4 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#16 integrate Differences ... ==== //depot/projects/ia64_epc/contrib/groff/tmac/doc-common#4 (text+ko) ==== @@ -554,7 +554,10 @@ . as doc-header-string "\|.\|.\|. . \} . tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] -. sp \n[doc-header-space]u +. ie !\n[cR] \ +. sp \n[doc-header-space]u +. el \ +. sp 1v . ev . ns .. @@ -665,7 +668,7 @@ .\" NS width register `Nd' set above . .de Nd -. nop \- \$* +. nop \[em] \$* .. . . ==== //depot/projects/ia64_epc/contrib/groff/tmac/doc-ditroff#4 (text+ko) ==== @@ -118,13 +118,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space .5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space .5i . . .\" NS doc-display-vertical global register @@ -138,13 +138,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/ia64_epc/contrib/groff/tmac/doc-nroff#4 (text+ko) ==== @@ -97,13 +97,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space 0.5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space 0.5i . . .\" NS doc-display-vertical global register @@ -117,13 +117,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 (text+ko) ==== @@ -16,17 +16,21 @@ %release; + +X"> +X"> + ]>
- Early Adopter's Guide to &os; 5.0-RELEASE + Early Adopter's Guide to &os; &release.current; The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.14 2003/04/07 11:20:24 murray Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.15 2003/05/03 22:14:55 bmah Exp $ 2002 @@ -34,35 +38,50 @@ The &os; Release Engineering Team + + + This article describes the status of &os; + &release.current;, from the standpoint of users who may be new + to the &release.5x; series of releases or to &os; in general. + It presents some background information on release + engineering, some highlights of new features, and some + possible drawbacks that might be faced by early adopters. It + also contains some of the future release engineering plans for + the 4-STABLE development branch and some tips on upgrading + existing systems. + Introduction - &os; 5.0 marks the first new major version of &os; in + &os; &release.5x; marks the first new major version of &os; in over two years. Besides a number of new features, it also contains a number of major developments in the underlying system architecture. Along with these advances, however, comes a system that incorporates a tremendous amount of new and not-widely-tested code. Compared to the existing line of - 4.X releases, 5.0 may have regressions + &release.4x; releases, the first few &release.5x; releases + may have regressions in areas of stability, performance, and occasionally functionality. - For these reasons, the &a.re; does not - encourage users to blindly update from older &os; releases to - 5.0. Specifically, for more conservative users, we recommend - running 4.X releases (such as + For these reasons, the &a.re; specifically + discourages users from updating from older &os; releases to + &release.current; unless they are aware of (and prepared to deal + with) possible regressions in the newer releases. + Specifically, for more conservative users, we recommend + running &release.4x; releases (such as 4.8-RELEASE) for the near-term future. We feel that such users are probably best served by - upgrading to 5.X only after a + upgrading to &release.5x; only after a 5-STABLE development branch has been created; this may be around - the time of 5.1-RELEASE or 5.2-RELEASE. + the time of 5.2-RELEASE. - (&os; 5.0 suffers from what has been described as a + (&os; &release.5x; suffers from what has been described as a chicken and egg problem. The entire project has - a goal of producing a 5.0-RELEASE that is as stable and reliable + a goal of producing releases that are as stable and reliable as possible. This stability and reliability requires widespread testing, particularly of the system's newer features. However, getting a large number of users to test the system, in a @@ -70,14 +89,14 @@ release first!) This article describes some of the issues involved in - installing and running &os; 5.0-RELEASE. We begin with a + installing and running &os; &release.current;. We begin with a brief overview of the &os; release process. We then present - some of the more noteworthy new features in &os; 5.0, along + some of the more noteworthy new features in &os; &release.current;, along with some areas that may prove troublesome for unwary users. For those users choosing to remain with 4-STABLE-based releases, we give some of the short- to medium-term plans for this development branch. Finally, we present some notes on upgrading - existing 4.X systems to 5.0. + existing &release.4x; systems to &release.current;. @@ -98,12 +117,12 @@ these branches after some amount of testing in CURRENT. At the moment, only one STABLE branch is under active development; this branch is referred to as 4-STABLE, and all of the - &os; 4.X releases were based on + &os; &release.4x; releases were based on it. This branch has the tag RELENG_4 in the CVS repository. - &os; 5.0 will be based on the CURRENT branch. This - will be the first release from this branch in over two years (the + &os; 5.0 and 5.1 are based on the CURRENT branch. These + are the first releases from this branch in over two years (the last was &os; 4.0, in March 2000). At some point after the release of &os; 5.0, a @@ -112,31 +131,37 @@ The past two stable branches (3-STABLE and 4-STABLE) were created immediately after their respective dot-oh releases (3.0 and 4.0, respectively). In hindsight, this - practice did not give sufficient time for either CURRENT or the new - STABLE branches to stabilize after the new branches were - created. + practice did not give sufficient time for either CURRENT + to stabilize before the new branches were + created. This in turn resulted in wasted effort porting bug + fixes between branches, as well as some architectural changes + that could not be ported between branches at all. Therefore, the release engineering team will only create the - 5-STABLE branch in the CVS repository after they have found a + 5-STABLE branch in the CVS repository after we have found a relatively stable state to use as its basis. It is likely that there will be - multiple releases in the 5.X series + multiple releases in the &release.5x; series before this happens; we estimate that the 5-STABLE branch will be created sometime after - 5.1-RELEASE or 5.2-RELEASE. + 5.2-RELEASE. More information on &os; release engineering processes can be found on the Release - Engineering Web pages and in the &os; Release - Engineering article. + Engineering Web pages and in the &os; Release + Engineering article. Specific issues for the upcoming + 5-STABLE development branch can be found in The + Roadmap for 5-STABLE. New Features - A large attraction of &os; 5.0 is a number of new + A large attraction of &os; &release.5x; is a number of new features. These new features and functionality generally involve large architectural changes that were not feasible to port back to the &os; 4-STABLE development branch. (By contrast, many @@ -149,13 +174,15 @@ SMPng: The next generation support for SMP machines (work in progress). There is now partial support for multiple processors to be running in the kernel - at the same time. + at the same time. This work is ongoing. KSE: Kernel Scheduled Entities allow a single process to have multiple kernel-level threads, similar to Scheduler - Activations. + Activations. The (experimental) libkse + and libthr libraries make this + feature available to multi-threaded userland programs. @@ -166,7 +193,7 @@ GCC: The compiler toolchain is now based on GCC - 3.2.1, rather than GCC + 3.2.2, rather than GCC 2.95.X. @@ -190,7 +217,9 @@ UFS2: A new UFS2 on-disk format has been added, which supports extended per-file attributes and larger file - sizes. + sizes. UFS2 is now the default format for &man.newfs.8;. + On all platforms except for pc98, filesystems created from + within &man.sysinstall.8; will use UFS2 by default. @@ -200,14 +229,14 @@ A more comprehensive list of new features can be found in - the release notes for &os; 5.0. + the release notes for &os; &release.prev; and &os; &release.current;. Drawbacks to Early Adoption - Along with the new features of &os; 5.0 come some areas + Along with the new features of &os; &release.5x; come some areas that can cause problems, or at least can lead to unexpected behavior. Generally, these come from the fact that a number of features are works-in-progress. A partial list of these @@ -217,7 +246,9 @@ A number of features are not yet finished. Examples - from the feature list above include SMPng and KSE. + from the feature list above include SMPng and KSE. While + suitable for testing and experimentation, these features may + not be ready for production use. @@ -238,6 +269,14 @@ + Some parts of the &os; base system have fallen into a + state of disrepair due to a lack of users and maintainers. + These have been removed. Specific examples include the + generation of a.out-style executables, XNS networking + support, and the X-10 controller driver. + + + A number of ports and packages do not build or do not run correctly under &os; 5.0, whereas they did under &os; 4-STABLE. Generally these problems are caused by compiler @@ -245,8 +284,7 @@ - Because &os; 5.0 is the first release from the - CURRENT branch in over two years, many of its features are + Many &os; &release.5x; features are seeing wide exposure for the first time. Many of these features (such as SMPng) have broad impacts on the kernel. @@ -264,7 +302,7 @@ branch after a settling time in -CURRENT. &os; 5.0 does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development - branch will be created sometime after 5.1-RELEASE or + branch will be created sometime after 5.2-RELEASE.) @@ -273,7 +311,7 @@ url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook and FAQ) - may not reflect changes recently made to &os; 5.0. + may not reflect changes recently made to &os; &release.5x;. @@ -281,7 +319,7 @@ Because a number of these drawbacks affect system stability, the release engineering team recommends that more conservative sites and users stick to releases based on the 4-STABLE branch until - the 5.X series is more polished. + the &release.5x; series is more polished. @@ -289,27 +327,26 @@ Plans for the 4-STABLE Branch The release of &os; 5.0 does not mean the end of the - 4-STABLE branch. There will most likely be at least one more release on + 4-STABLE branch. Indeed, &os; 4.8 was released two months after + 5.0, in April 2003. There will most likely be at least one more release on this branch, namely 4.9-RELEASE, currently scheduled for summer - 2003. - - As of this writing, the release engineering team has no - definite plans for future releases (past 4.8) on the 4-STABLE - branch. However, a 4.9-RELEASE or even a 4.10-RELEASE are - likely possibilities. Any future releases from this branch will + 2003. + A 4.10-RELEASE is a likely possibility as well. + Future releases from this branch will depend on several factors. The most important of these is the existence and stability of the 5-STABLE branch. If CURRENT is not sufficiently stable to allow the creation of a 5-STABLE branch, this may require and permit more releases from the 4-STABLE branch. Until the last declared release - on the 4-STABLE branch, new features may be merged from HEAD at + on the 4-STABLE branch, new features may be merged from HEAD at the discretion of developers, subject to existing release engineering policies. - To some extent, the release engineering team will take into + To some extent, the release engineering team (as well as the + developer community as a whole) will take into account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering - resources (in terms of personnel, computing resources, and mirror + resources (particularly developers' time, computing resources, and mirror archive space). The &a.security-officer; will continue to support releases @@ -319,20 +356,20 @@ page on the &os; web site. Generally, the two most recent releases from any branch will be supported with respect to security advisories and security fixes. At its discretion, - the team may support other releases. + the team may support other releases for specific issues. - Notes on Upgrading + Notes on Upgrading from &os; &release.4x; For those users with existing &os; systems, this section offers a few notes on upgrading a &os; - 4.X system to - 5.X. As with any &os; upgrade, it + &release.4x; system to + &release.5x;. As with any &os; upgrade, it is crucial to read the release notes and the errata for the version in question, as well as - src/UPDATING for source upgrades. + src/UPDATING in the case of source upgrades. Binary Upgrades @@ -341,14 +378,16 @@ backup everything, reformat, reinstall, and restore everything. This eliminates problems of incompatible or obsolete executables or configuration files polluting the - new system. + new system. It allows new filesystems to be created to take + advantage of new functionality (most notably, the UFS2 + defaults). As of this time, the binary upgrade option in &man.sysinstall.8; has not been well-tested for cross-major-version upgrades. Using this feature is not recommended. In particular, a binary upgrade will leave behind a number of files that are present in &os; - 4.X but not in 5.0. These obsolete + &release.4x; but not in &release.5x;. These obsolete files may create some problems. On the i386 and pc98 platforms, a UserConfig utility @@ -371,7 +410,7 @@ rather than the stripped-down kernel on the floppy images. In theory, any system capable of booting the Microsoft Windows NT 4 installation CDROMs should be able to cope with the &os; - 5.0 CDROMs. + &release.5x; CDROMs. @@ -402,8 +441,8 @@ users will not notice this change. It is generally possible to run old - 4.X executables under - 5.X, but this requires the + &release.4x; executables under + &release.5x;, but this requires the compat4x distribution to be installed. Thus, using old ports may be possible. @@ -417,22 +456,38 @@ (especially with C++ programs) as the compiler may wind up using a mixture of obsolete and current header files. - MAKEDEV is no longer available. - FreeBSD 5.X uses a device filesystem. For more information, + MAKEDEV is no longer available, nor + is it required. + FreeBSD &release.5x; uses a device filesystem, which automatically + creates device nodes on demand. For more information, please see &man.devfs.5;. + UFS2 is the default on-disk format for file systems + created using &man.newfs.8;. For all platforms except pc98, + it is also the default for file systems created using the disk + labeling screen within &man.sysinstall.8;. Because &os; + &release.4x; only understands UFS1 (not UFS2), disk partitions + that need to be accessed by both &release.5x; and &release.4x; + must be created with UFS1. This can be specified using the + option to &man.newfs.8;, or on the disk + labeling screen in &man.sysinstall.8;. This situation most + often arises with a a single machine that dual-boots &os; + &release.4x; and &os; &release.5x;. Note that there is no way + to convert file systems between the two on-disk formats (other + than backing up, re-creating the file system, and + restoring). + - Summary - While &os; 5.0 contains a number of new and exciting + While &os; &release.current; contains a number of new and exciting features, it may not be suitable for all users at this time. In this document, we presented some background on release - engineering, some of the more notable new features of the 5.X + engineering, some of the more notable new features of the &release.5x; series, and some drawbacks to early adoption. We also presented some future plans for the 4-STABLE development branch and some tips on upgrading for early adopters. ==== //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.558 2003/05/03 09:44:25 dougb Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.560 2003/05/03 22:18:49 bmah Exp $ 2000 @@ -23,9 +23,10 @@ recent changes made to the &os; base system on the &release.branch; development branch. ]]> - Both changes for kernel and userland are listed, as well as - applicable security advisories that were issued since the last - release. Some brief remarks on upgrading are also presented. + This document lists applicable security advisories that were issued since + the last release, as well as significant changes to the &os; + kernel and userland. + Some brief remarks on upgrading are also presented. @@ -61,6 +62,24 @@ Handbook. ]]> + + Users who are new to the &release.branch; series of &os; + &release.type;s should also read the Early Adopters Guide + to &os; &release.current;. This document can generally be + found in the same location as the release notes (either as a part of a + &os; distribution or on the &os; Web site). It contains important + information regarding the advantages and disadvantages of using + &os; &release.current;, as opposed to releases based on the &os; + 4-STABLE development branch. + + All users are encouraged to consult the release errata before + installing &os;. The errata document is updated with + late-breaking information discovered late in the + release cycle or after the release. Typically, it contains + information on known bugs, security advisories, and corrections to + documentation. An up-to-date copy of the errata for &os; + &release.current; can be found on the &os; Web site. + @@ -78,21 +97,22 @@ since &release.prev;. It includes items that are unique to the &release.branch; branch, as well as some features that may have been recently merged to - other branches (after &os; &release.prev.historic;). The later + other branches (after &os; &release.prev.historic;). The latter items are marked as &merged;. ]]> Typical release note items - document new drivers or hardware support, new commands or options, - major bug fixes, or contributed software upgrades. Applicable security - advisories issued after &release.prev.historic; are also listed. + document recent security advisories issued after + &release.prev.historic;, + new drivers or hardware support, new commands or options, + major bug fixes, or contributed software upgrades. They may also + list changes to major ports/packages or release engineering + practices. Clearly the release notes cannot list every single + change made to &os; between releases; this document focuses + primarily on security advisories, user-visible changes, and major + architectural improvements. - Many additional changes were made to &os; that are not listed - here for lack of space. For example, documentation was corrected - and improved, minor bugs were fixed, insecure coding practices - were audited and corrected, and source code was cleaned up. - Security Advisories @@ -276,7 +296,7 @@ Modules designed for use with &os; 4.X are likely to - panic and should be used with extreme caution. + panic when loaded into a &os; &release.current; kernel and should be used with extreme caution. @@ -301,7 +321,7 @@ SHDSL modem has been added. &merged; A new &man.wlan.4; module provides 802.11 link-layer support. The - &man.wi.4; driver now uses this facility. + &man.wi.4; and &man.an.4; drivers now use this facility. A timing bug in the &man.xl.4; driver, which could cause a kernel panic (or other @@ -403,7 +423,7 @@ programs are &man.camcontrol.8; in the base system, the sysutils/cdrtools port, and the - multimedia/xmmsport. + multimedia/xmms port. @@ -513,7 +533,7 @@ &man.disklabel.8; is now only built for architectures where it is useful (i386, pc98, alpha, and ia64). - The to &man.disklabel.8; has been + The option to &man.disklabel.8; has been removed because the i386 boot loader now resides in a single file. @@ -600,7 +620,7 @@ conjunction with the recently-added net.inet.ip.portrange.reservedhigh sysctl. - The MAKEDEV script is now unnecessary, due to the mandatory + The MAKEDEV script is now unnecessary, due to the mandatory presence of &man.devfs.5;, and has been removed. &man.mergemaster.8; now supports a @@ -634,7 +654,7 @@ &man.newfs.8; will now create UFS2 file systems by default, unless UFS1 is specifically requested with the - . + option. &man.newsyslog.8; now supports a W flag to force previously-started compression jobs for an entry (or @@ -679,9 +699,11 @@ remains unsuitable for all but trivial uses.) &man.rtld.1; now has support for the dynamic mapping of - shared object dependencies. More information can be found in - &man.libmap.conf.5;. This is an optional feature, disabled by - default. + shared object dependencies. This optional feature is especially + useful when experimenting with different threading libraries. + It is not, however, built by default. More information on + enabling and using this feature can be found in + &man.libmap.conf.5;. &man.sem.open.3; now correctly handles multiple opens of the same semaphore; as a result, &man.sem.close.3; no longer crashes @@ -958,7 +980,7 @@ Users with existing &os; systems are highly encouraged to read the Early - Adopter's Guide to &os; 5.0. This document generally has + Adopter's Guide to &os; &release.current;. This document generally has the filename EARLY.TXT on the distribution media, or any other place that the release notes can be found. It offers some notes on upgrading, but more importantly, also ==== //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#8 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.37 2003/05/03 19:06:50 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.38 2003/05/03 22:58:45 ps Exp $"); #include #include @@ -1003,6 +1003,7 @@ struct bge_softc *sc; { int i; + u_int32_t dma_rw_ctl; /* Set endianness before we access any non-PCI registers. */ #if BYTE_ORDER == BIG_ENDIAN @@ -1042,14 +1043,45 @@ if (pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & BGE_PCISTATE_PCI_BUSMODE) { /* Conventional PCI bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x3F000F, 4); + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); } else { /* PCI-X bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x1B000F, 4); + /* + * The 5704 uses a different encoding of read/write + * watermarks. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); + else + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x3 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); + + /* + * 5703 and 5704 need ONEDMA_AT_ONCE as a workaround + * for hardware bugs. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) { + u_int32_t tmp; + + tmp = CSR_READ_4(sc, BGE_PCI_CLKCTL) & 0x1f; + if (tmp == 0x6 || tmp == 0x7) + dma_rw_ctl |= BGE_PCIDMARWCTL_ONEDMA_ATONCE; + } } + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl &= ~BGE_PCIDMARWCTL_MINDMA; + pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, dma_rw_ctl, 4); + /* * Set up general mode register. */ @@ -1415,7 +1447,7 @@ CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK); } else { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16); - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, BGE_EVTENB_MI_INTERRUPT); } @@ -1620,10 +1652,6 @@ pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & BGE_PCIMISCCTL_ASICREV; - /* Pretend all 5700s are the same */ - if ((sc->bge_asicrev & 0xFF000000) == BGE_ASICREV_BCM5700) - sc->bge_asicrev = BGE_ASICREV_BCM5700; - /* * Figure out what sort of media we have by checking the * hardware config word in the first 32k of NIC internal memory, @@ -2037,7 +2065,7 @@ * the interrupt handler. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) { u_int32_t status; status = CSR_READ_4(sc, BGE_MAC_STS); ==== //depot/projects/ia64_epc/sys/dev/bge/if_bgereg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.14 2003/05/02 19:53:40 ps Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.15 2003/05/03 22:58:45 ps Exp $ */ /* @@ -231,7 +231,11 @@ #define BGE_ASICREV_BCM5704_A2 0x20020000 /* shorthand one */ -#define BGE_ASICREV_BCM5700 0x71000000 +#define BGE_ASICREV(x) ((x) >> 28) +#define BGE_ASICREV_BCM5700 0x07 +#define BGE_ASICREV_BCM5701 0x00 +#define BGE_ASICREV_BCM5703 0x01 +#define BGE_ASICREV_BCM5704 0x02 /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF @@ -239,11 +243,15 @@ #define BGE_PCIDMARWCTL_WRADDR_BNDRY 0x00003800 #define BGE_PCIDMARWCTL_ONEDMA_ATONCE 0x00004000 #define BGE_PCIDMARWCTL_RD_WAT 0x00070000 +# define BGE_PCIDMARWCTL_RD_WAT_SHIFT 16 #define BGE_PCIDMARWCTL_WR_WAT 0x00380000 +# define BGE_PCIDMARWCTL_WR_WAT_SHIFT 19 #define BGE_PCIDMARWCTL_USE_MRM 0x00400000 #define BGE_PCIDMARWCTL_ASRT_ALL_BE 0x00800000 #define BGE_PCIDMARWCTL_DFLT_PCI_RD_CMD 0x0F000000 +# define BGE_PCIDMA_RWCTL_PCI_RD_CMD_SHIFT 24 #define BGE_PCIDMARWCTL_DFLT_PCI_WR_CMD 0xF0000000 +# define BGE_PCIDMA_RWCTL_PCI_WR_CMD_SHIFT 28 #define BGE_PCI_READ_BNDRY_DISABLE 0x00000000 #define BGE_PCI_READ_BNDRY_16BYTES 0x00000100 ==== //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#16 (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/ia64/ia64/locore.s,v 1.28 2003/04/06 21:31:26 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/locore.s,v 1.29 2003/05/03 23:05:16 marcel Exp $ */ #include @@ -308,9 +308,9 @@ intr_n = 0 .rept INTRCNT_COUNT - 1 .ascii "#" - .byte intr_n / 100 + '0 - .byte (intr_n % 100) / 10 + '0 - .byte intr_n % 10 + '0 + .byte intr_n / 100 + '0' + .byte (intr_n % 100) / 10 + '0' + .byte intr_n % 10 + '0' .fill INTRNAME_LEN - 1 - 3 - 1, 1, ' ' .byte 0 intr_n = intr_n + 1 From owner-p4-projects@FreeBSD.ORG Sat May 3 16:09:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537D437B404; Sat, 3 May 2003 16:09:35 -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 00C5A37B401 for ; Sat, 3 May 2003 16:09:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4BB143FAF for ; Sat, 3 May 2003 16:09:33 -0700 (PDT) (envelope-from marcel@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 h43N9X0U088250 for ; Sat, 3 May 2003 16:09:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43N9XRQ088247 for perforce@freebsd.org; Sat, 3 May 2003 16:09:33 -0700 (PDT) Date: Sat, 3 May 2003 16:09:33 -0700 (PDT) Message-Id: <200305032309.h43N9XRQ088247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30491 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: Sat, 03 May 2003 23:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30491 Change 30491 by marcel@marcel_pluto1 on 2003/05/03 16:08:50 IFC @30487 Affected files ... .. //depot/projects/sio/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/sio/contrib/groff/tmac/doc-ditroff#3 integrate .. //depot/projects/sio/contrib/groff/tmac/doc-nroff#3 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/sio/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/sio/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/sio/sys/ia64/ia64/locore.s#2 integrate Differences ... ==== //depot/projects/sio/contrib/groff/tmac/doc-common#3 (text+ko) ==== @@ -554,7 +554,10 @@ . as doc-header-string "\|.\|.\|. . \} . tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] -. sp \n[doc-header-space]u +. ie !\n[cR] \ +. sp \n[doc-header-space]u +. el \ +. sp 1v . ev . ns .. @@ -665,7 +668,7 @@ .\" NS width register `Nd' set above . .de Nd -. nop \- \$* +. nop \[em] \$* .. . . ==== //depot/projects/sio/contrib/groff/tmac/doc-ditroff#3 (text+ko) ==== @@ -118,13 +118,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space .5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space .5i . . .\" NS doc-display-vertical global register @@ -138,13 +138,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/sio/contrib/groff/tmac/doc-nroff#3 (text+ko) ==== @@ -97,13 +97,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space 0.5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space 0.5i . . .\" NS doc-display-vertical global register @@ -117,13 +117,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/sio/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 (text+ko) ==== @@ -16,17 +16,21 @@ %release; + +X"> +X"> + ]>
- Early Adopter's Guide to &os; 5.0-RELEASE + Early Adopter's Guide to &os; &release.current; The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.14 2003/04/07 11:20:24 murray Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.15 2003/05/03 22:14:55 bmah Exp $ 2002 @@ -34,35 +38,50 @@ The &os; Release Engineering Team + + + This article describes the status of &os; + &release.current;, from the standpoint of users who may be new + to the &release.5x; series of releases or to &os; in general. + It presents some background information on release + engineering, some highlights of new features, and some + possible drawbacks that might be faced by early adopters. It + also contains some of the future release engineering plans for + the 4-STABLE development branch and some tips on upgrading + existing systems. + Introduction - &os; 5.0 marks the first new major version of &os; in + &os; &release.5x; marks the first new major version of &os; in over two years. Besides a number of new features, it also contains a number of major developments in the underlying system architecture. Along with these advances, however, comes a system that incorporates a tremendous amount of new and not-widely-tested code. Compared to the existing line of - 4.X releases, 5.0 may have regressions + &release.4x; releases, the first few &release.5x; releases + may have regressions in areas of stability, performance, and occasionally functionality. - For these reasons, the &a.re; does not - encourage users to blindly update from older &os; releases to - 5.0. Specifically, for more conservative users, we recommend - running 4.X releases (such as + For these reasons, the &a.re; specifically + discourages users from updating from older &os; releases to + &release.current; unless they are aware of (and prepared to deal + with) possible regressions in the newer releases. + Specifically, for more conservative users, we recommend + running &release.4x; releases (such as 4.8-RELEASE) for the near-term future. We feel that such users are probably best served by - upgrading to 5.X only after a + upgrading to &release.5x; only after a 5-STABLE development branch has been created; this may be around - the time of 5.1-RELEASE or 5.2-RELEASE. + the time of 5.2-RELEASE. - (&os; 5.0 suffers from what has been described as a + (&os; &release.5x; suffers from what has been described as a chicken and egg problem. The entire project has - a goal of producing a 5.0-RELEASE that is as stable and reliable + a goal of producing releases that are as stable and reliable as possible. This stability and reliability requires widespread testing, particularly of the system's newer features. However, getting a large number of users to test the system, in a @@ -70,14 +89,14 @@ release first!) This article describes some of the issues involved in - installing and running &os; 5.0-RELEASE. We begin with a + installing and running &os; &release.current;. We begin with a brief overview of the &os; release process. We then present - some of the more noteworthy new features in &os; 5.0, along + some of the more noteworthy new features in &os; &release.current;, along with some areas that may prove troublesome for unwary users. For those users choosing to remain with 4-STABLE-based releases, we give some of the short- to medium-term plans for this development branch. Finally, we present some notes on upgrading - existing 4.X systems to 5.0. + existing &release.4x; systems to &release.current;. @@ -98,12 +117,12 @@ these branches after some amount of testing in CURRENT. At the moment, only one STABLE branch is under active development; this branch is referred to as 4-STABLE, and all of the - &os; 4.X releases were based on + &os; &release.4x; releases were based on it. This branch has the tag RELENG_4 in the CVS repository. - &os; 5.0 will be based on the CURRENT branch. This - will be the first release from this branch in over two years (the + &os; 5.0 and 5.1 are based on the CURRENT branch. These + are the first releases from this branch in over two years (the last was &os; 4.0, in March 2000). At some point after the release of &os; 5.0, a @@ -112,31 +131,37 @@ The past two stable branches (3-STABLE and 4-STABLE) were created immediately after their respective dot-oh releases (3.0 and 4.0, respectively). In hindsight, this - practice did not give sufficient time for either CURRENT or the new - STABLE branches to stabilize after the new branches were - created. + practice did not give sufficient time for either CURRENT + to stabilize before the new branches were + created. This in turn resulted in wasted effort porting bug + fixes between branches, as well as some architectural changes + that could not be ported between branches at all. Therefore, the release engineering team will only create the - 5-STABLE branch in the CVS repository after they have found a + 5-STABLE branch in the CVS repository after we have found a relatively stable state to use as its basis. It is likely that there will be - multiple releases in the 5.X series + multiple releases in the &release.5x; series before this happens; we estimate that the 5-STABLE branch will be created sometime after - 5.1-RELEASE or 5.2-RELEASE. + 5.2-RELEASE. More information on &os; release engineering processes can be found on the Release - Engineering Web pages and in the &os; Release - Engineering article. + Engineering Web pages and in the &os; Release + Engineering article. Specific issues for the upcoming + 5-STABLE development branch can be found in The + Roadmap for 5-STABLE. New Features - A large attraction of &os; 5.0 is a number of new + A large attraction of &os; &release.5x; is a number of new features. These new features and functionality generally involve large architectural changes that were not feasible to port back to the &os; 4-STABLE development branch. (By contrast, many @@ -149,13 +174,15 @@ SMPng: The next generation support for SMP machines (work in progress). There is now partial support for multiple processors to be running in the kernel - at the same time. + at the same time. This work is ongoing. KSE: Kernel Scheduled Entities allow a single process to have multiple kernel-level threads, similar to Scheduler - Activations. + Activations. The (experimental) libkse + and libthr libraries make this + feature available to multi-threaded userland programs. @@ -166,7 +193,7 @@ GCC: The compiler toolchain is now based on GCC - 3.2.1, rather than GCC + 3.2.2, rather than GCC 2.95.X. @@ -190,7 +217,9 @@ UFS2: A new UFS2 on-disk format has been added, which supports extended per-file attributes and larger file - sizes. + sizes. UFS2 is now the default format for &man.newfs.8;. + On all platforms except for pc98, filesystems created from + within &man.sysinstall.8; will use UFS2 by default. @@ -200,14 +229,14 @@ A more comprehensive list of new features can be found in - the release notes for &os; 5.0. + the release notes for &os; &release.prev; and &os; &release.current;. Drawbacks to Early Adoption - Along with the new features of &os; 5.0 come some areas + Along with the new features of &os; &release.5x; come some areas that can cause problems, or at least can lead to unexpected behavior. Generally, these come from the fact that a number of features are works-in-progress. A partial list of these @@ -217,7 +246,9 @@ A number of features are not yet finished. Examples - from the feature list above include SMPng and KSE. + from the feature list above include SMPng and KSE. While + suitable for testing and experimentation, these features may + not be ready for production use. @@ -238,6 +269,14 @@ + Some parts of the &os; base system have fallen into a + state of disrepair due to a lack of users and maintainers. + These have been removed. Specific examples include the + generation of a.out-style executables, XNS networking + support, and the X-10 controller driver. + + + A number of ports and packages do not build or do not run correctly under &os; 5.0, whereas they did under &os; 4-STABLE. Generally these problems are caused by compiler @@ -245,8 +284,7 @@ - Because &os; 5.0 is the first release from the - CURRENT branch in over two years, many of its features are + Many &os; &release.5x; features are seeing wide exposure for the first time. Many of these features (such as SMPng) have broad impacts on the kernel. @@ -264,7 +302,7 @@ branch after a settling time in -CURRENT. &os; 5.0 does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development - branch will be created sometime after 5.1-RELEASE or + branch will be created sometime after 5.2-RELEASE.) @@ -273,7 +311,7 @@ url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook and FAQ) - may not reflect changes recently made to &os; 5.0. + may not reflect changes recently made to &os; &release.5x;. @@ -281,7 +319,7 @@ Because a number of these drawbacks affect system stability, the release engineering team recommends that more conservative sites and users stick to releases based on the 4-STABLE branch until - the 5.X series is more polished. + the &release.5x; series is more polished. @@ -289,27 +327,26 @@ Plans for the 4-STABLE Branch The release of &os; 5.0 does not mean the end of the - 4-STABLE branch. There will most likely be at least one more release on + 4-STABLE branch. Indeed, &os; 4.8 was released two months after + 5.0, in April 2003. There will most likely be at least one more release on this branch, namely 4.9-RELEASE, currently scheduled for summer - 2003. - - As of this writing, the release engineering team has no - definite plans for future releases (past 4.8) on the 4-STABLE - branch. However, a 4.9-RELEASE or even a 4.10-RELEASE are - likely possibilities. Any future releases from this branch will + 2003. + A 4.10-RELEASE is a likely possibility as well. + Future releases from this branch will depend on several factors. The most important of these is the existence and stability of the 5-STABLE branch. If CURRENT is not sufficiently stable to allow the creation of a 5-STABLE branch, this may require and permit more releases from the 4-STABLE branch. Until the last declared release - on the 4-STABLE branch, new features may be merged from HEAD at + on the 4-STABLE branch, new features may be merged from HEAD at the discretion of developers, subject to existing release engineering policies. - To some extent, the release engineering team will take into + To some extent, the release engineering team (as well as the + developer community as a whole) will take into account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering - resources (in terms of personnel, computing resources, and mirror + resources (particularly developers' time, computing resources, and mirror archive space). The &a.security-officer; will continue to support releases @@ -319,20 +356,20 @@ page on the &os; web site. Generally, the two most recent releases from any branch will be supported with respect to security advisories and security fixes. At its discretion, - the team may support other releases. + the team may support other releases for specific issues. - Notes on Upgrading + Notes on Upgrading from &os; &release.4x; For those users with existing &os; systems, this section offers a few notes on upgrading a &os; - 4.X system to - 5.X. As with any &os; upgrade, it + &release.4x; system to + &release.5x;. As with any &os; upgrade, it is crucial to read the release notes and the errata for the version in question, as well as - src/UPDATING for source upgrades. + src/UPDATING in the case of source upgrades. Binary Upgrades @@ -341,14 +378,16 @@ backup everything, reformat, reinstall, and restore everything. This eliminates problems of incompatible or obsolete executables or configuration files polluting the - new system. + new system. It allows new filesystems to be created to take + advantage of new functionality (most notably, the UFS2 + defaults). As of this time, the binary upgrade option in &man.sysinstall.8; has not been well-tested for cross-major-version upgrades. Using this feature is not recommended. In particular, a binary upgrade will leave behind a number of files that are present in &os; - 4.X but not in 5.0. These obsolete + &release.4x; but not in &release.5x;. These obsolete files may create some problems. On the i386 and pc98 platforms, a UserConfig utility @@ -371,7 +410,7 @@ rather than the stripped-down kernel on the floppy images. In theory, any system capable of booting the Microsoft Windows NT 4 installation CDROMs should be able to cope with the &os; - 5.0 CDROMs. + &release.5x; CDROMs. @@ -402,8 +441,8 @@ users will not notice this change. It is generally possible to run old - 4.X executables under - 5.X, but this requires the + &release.4x; executables under + &release.5x;, but this requires the compat4x distribution to be installed. Thus, using old ports may be possible. @@ -417,22 +456,38 @@ (especially with C++ programs) as the compiler may wind up using a mixture of obsolete and current header files. - MAKEDEV is no longer available. - FreeBSD 5.X uses a device filesystem. For more information, + MAKEDEV is no longer available, nor + is it required. + FreeBSD &release.5x; uses a device filesystem, which automatically + creates device nodes on demand. For more information, please see &man.devfs.5;. + UFS2 is the default on-disk format for file systems + created using &man.newfs.8;. For all platforms except pc98, + it is also the default for file systems created using the disk + labeling screen within &man.sysinstall.8;. Because &os; + &release.4x; only understands UFS1 (not UFS2), disk partitions + that need to be accessed by both &release.5x; and &release.4x; + must be created with UFS1. This can be specified using the + option to &man.newfs.8;, or on the disk + labeling screen in &man.sysinstall.8;. This situation most + often arises with a a single machine that dual-boots &os; + &release.4x; and &os; &release.5x;. Note that there is no way + to convert file systems between the two on-disk formats (other + than backing up, re-creating the file system, and + restoring). + - Summary - While &os; 5.0 contains a number of new and exciting + While &os; &release.current; contains a number of new and exciting features, it may not be suitable for all users at this time. In this document, we presented some background on release - engineering, some of the more notable new features of the 5.X + engineering, some of the more notable new features of the &release.5x; series, and some drawbacks to early adoption. We also presented some future plans for the 4-STABLE development branch and some tips on upgrading for early adopters. ==== //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.558 2003/05/03 09:44:25 dougb Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.560 2003/05/03 22:18:49 bmah Exp $ 2000 @@ -23,9 +23,10 @@ recent changes made to the &os; base system on the &release.branch; development branch. ]]> - Both changes for kernel and userland are listed, as well as - applicable security advisories that were issued since the last - release. Some brief remarks on upgrading are also presented. + This document lists applicable security advisories that were issued since + the last release, as well as significant changes to the &os; + kernel and userland. + Some brief remarks on upgrading are also presented. @@ -61,6 +62,24 @@ Handbook. ]]> + + Users who are new to the &release.branch; series of &os; + &release.type;s should also read the Early Adopters Guide + to &os; &release.current;. This document can generally be + found in the same location as the release notes (either as a part of a + &os; distribution or on the &os; Web site). It contains important + information regarding the advantages and disadvantages of using + &os; &release.current;, as opposed to releases based on the &os; + 4-STABLE development branch. + + All users are encouraged to consult the release errata before + installing &os;. The errata document is updated with + late-breaking information discovered late in the + release cycle or after the release. Typically, it contains + information on known bugs, security advisories, and corrections to + documentation. An up-to-date copy of the errata for &os; + &release.current; can be found on the &os; Web site. + @@ -78,21 +97,22 @@ since &release.prev;. It includes items that are unique to the &release.branch; branch, as well as some features that may have been recently merged to - other branches (after &os; &release.prev.historic;). The later + other branches (after &os; &release.prev.historic;). The latter items are marked as &merged;. ]]> Typical release note items - document new drivers or hardware support, new commands or options, - major bug fixes, or contributed software upgrades. Applicable security - advisories issued after &release.prev.historic; are also listed. + document recent security advisories issued after + &release.prev.historic;, + new drivers or hardware support, new commands or options, + major bug fixes, or contributed software upgrades. They may also + list changes to major ports/packages or release engineering + practices. Clearly the release notes cannot list every single + change made to &os; between releases; this document focuses + primarily on security advisories, user-visible changes, and major + architectural improvements. - Many additional changes were made to &os; that are not listed - here for lack of space. For example, documentation was corrected - and improved, minor bugs were fixed, insecure coding practices - were audited and corrected, and source code was cleaned up. - Security Advisories @@ -276,7 +296,7 @@ Modules designed for use with &os; 4.X are likely to - panic and should be used with extreme caution. + panic when loaded into a &os; &release.current; kernel and should be used with extreme caution. @@ -301,7 +321,7 @@ SHDSL modem has been added. &merged; A new &man.wlan.4; module provides 802.11 link-layer support. The - &man.wi.4; driver now uses this facility. + &man.wi.4; and &man.an.4; drivers now use this facility. A timing bug in the &man.xl.4; driver, which could cause a kernel panic (or other @@ -403,7 +423,7 @@ programs are &man.camcontrol.8; in the base system, the sysutils/cdrtools port, and the - multimedia/xmmsport. + multimedia/xmms port. @@ -513,7 +533,7 @@ &man.disklabel.8; is now only built for architectures where it is useful (i386, pc98, alpha, and ia64). - The to &man.disklabel.8; has been + The option to &man.disklabel.8; has been removed because the i386 boot loader now resides in a single file. @@ -600,7 +620,7 @@ conjunction with the recently-added net.inet.ip.portrange.reservedhigh sysctl. - The MAKEDEV script is now unnecessary, due to the mandatory + The MAKEDEV script is now unnecessary, due to the mandatory presence of &man.devfs.5;, and has been removed. &man.mergemaster.8; now supports a @@ -634,7 +654,7 @@ &man.newfs.8; will now create UFS2 file systems by default, unless UFS1 is specifically requested with the - . + option. &man.newsyslog.8; now supports a W flag to force previously-started compression jobs for an entry (or @@ -679,9 +699,11 @@ remains unsuitable for all but trivial uses.) &man.rtld.1; now has support for the dynamic mapping of - shared object dependencies. More information can be found in - &man.libmap.conf.5;. This is an optional feature, disabled by - default. + shared object dependencies. This optional feature is especially + useful when experimenting with different threading libraries. + It is not, however, built by default. More information on + enabling and using this feature can be found in + &man.libmap.conf.5;. &man.sem.open.3; now correctly handles multiple opens of the same semaphore; as a result, &man.sem.close.3; no longer crashes @@ -958,7 +980,7 @@ Users with existing &os; systems are highly encouraged to read the Early - Adopter's Guide to &os; 5.0. This document generally has + Adopter's Guide to &os; &release.current;. This document generally has the filename EARLY.TXT on the distribution media, or any other place that the release notes can be found. It offers some notes on upgrading, but more importantly, also ==== //depot/projects/sio/sys/dev/bge/if_bge.c#4 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.37 2003/05/03 19:06:50 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.38 2003/05/03 22:58:45 ps Exp $"); #include #include @@ -1003,6 +1003,7 @@ struct bge_softc *sc; { int i; + u_int32_t dma_rw_ctl; /* Set endianness before we access any non-PCI registers. */ #if BYTE_ORDER == BIG_ENDIAN @@ -1042,14 +1043,45 @@ if (pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & BGE_PCISTATE_PCI_BUSMODE) { /* Conventional PCI bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x3F000F, 4); + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); } else { /* PCI-X bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x1B000F, 4); + /* + * The 5704 uses a different encoding of read/write + * watermarks. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); + else + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x3 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); + + /* + * 5703 and 5704 need ONEDMA_AT_ONCE as a workaround + * for hardware bugs. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) { + u_int32_t tmp; + + tmp = CSR_READ_4(sc, BGE_PCI_CLKCTL) & 0x1f; + if (tmp == 0x6 || tmp == 0x7) + dma_rw_ctl |= BGE_PCIDMARWCTL_ONEDMA_ATONCE; + } } + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl &= ~BGE_PCIDMARWCTL_MINDMA; + pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, dma_rw_ctl, 4); + /* * Set up general mode register. */ @@ -1415,7 +1447,7 @@ CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK); } else { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16); - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, BGE_EVTENB_MI_INTERRUPT); } @@ -1620,10 +1652,6 @@ pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & BGE_PCIMISCCTL_ASICREV; - /* Pretend all 5700s are the same */ - if ((sc->bge_asicrev & 0xFF000000) == BGE_ASICREV_BCM5700) - sc->bge_asicrev = BGE_ASICREV_BCM5700; - /* * Figure out what sort of media we have by checking the * hardware config word in the first 32k of NIC internal memory, @@ -2037,7 +2065,7 @@ * the interrupt handler. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) { u_int32_t status; status = CSR_READ_4(sc, BGE_MAC_STS); ==== //depot/projects/sio/sys/dev/bge/if_bgereg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.14 2003/05/02 19:53:40 ps Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.15 2003/05/03 22:58:45 ps Exp $ */ /* @@ -231,7 +231,11 @@ #define BGE_ASICREV_BCM5704_A2 0x20020000 /* shorthand one */ -#define BGE_ASICREV_BCM5700 0x71000000 +#define BGE_ASICREV(x) ((x) >> 28) +#define BGE_ASICREV_BCM5700 0x07 +#define BGE_ASICREV_BCM5701 0x00 +#define BGE_ASICREV_BCM5703 0x01 +#define BGE_ASICREV_BCM5704 0x02 /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF @@ -239,11 +243,15 @@ #define BGE_PCIDMARWCTL_WRADDR_BNDRY 0x00003800 #define BGE_PCIDMARWCTL_ONEDMA_ATONCE 0x00004000 #define BGE_PCIDMARWCTL_RD_WAT 0x00070000 +# define BGE_PCIDMARWCTL_RD_WAT_SHIFT 16 #define BGE_PCIDMARWCTL_WR_WAT 0x00380000 +# define BGE_PCIDMARWCTL_WR_WAT_SHIFT 19 #define BGE_PCIDMARWCTL_USE_MRM 0x00400000 #define BGE_PCIDMARWCTL_ASRT_ALL_BE 0x00800000 #define BGE_PCIDMARWCTL_DFLT_PCI_RD_CMD 0x0F000000 +# define BGE_PCIDMA_RWCTL_PCI_RD_CMD_SHIFT 24 #define BGE_PCIDMARWCTL_DFLT_PCI_WR_CMD 0xF0000000 +# define BGE_PCIDMA_RWCTL_PCI_WR_CMD_SHIFT 28 #define BGE_PCI_READ_BNDRY_DISABLE 0x00000000 #define BGE_PCI_READ_BNDRY_16BYTES 0x00000100 ==== //depot/projects/sio/sys/ia64/ia64/locore.s#2 (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/ia64/ia64/locore.s,v 1.28 2003/04/06 21:31:26 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/locore.s,v 1.29 2003/05/03 23:05:16 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -358,9 +358,9 @@ intr_n = 0 .rept INTRCNT_COUNT - 1 .ascii "#" - .byte intr_n / 100 + '0 - .byte (intr_n % 100) / 10 + '0 - .byte intr_n % 10 + '0 + .byte intr_n / 100 + '0' + .byte (intr_n % 100) / 10 + '0' + .byte intr_n % 10 + '0' .fill INTRNAME_LEN - 1 - 3 - 1, 1, ' ' .byte 0 intr_n = intr_n + 1 From owner-p4-projects@FreeBSD.ORG Sat May 3 16:10:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 709FC37B404; Sat, 3 May 2003 16:10:37 -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 2591837B401 for ; Sat, 3 May 2003 16:10:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB67643F75 for ; Sat, 3 May 2003 16:10:35 -0700 (PDT) (envelope-from marcel@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 h43NAZ0U088374 for ; Sat, 3 May 2003 16:10:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h43NAZWE088364 for perforce@freebsd.org; Sat, 3 May 2003 16:10:35 -0700 (PDT) Date: Sat, 3 May 2003 16:10:35 -0700 (PDT) Message-Id: <200305032310.h43NAZWE088364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30492 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: Sat, 03 May 2003 23:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=30492 Change 30492 by marcel@marcel_pluto1 on 2003/05/03 16:09:37 IFC @30487 Affected files ... .. //depot/projects/tty/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-ditroff#4 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-nroff#4 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/tty/sys/ia64/ia64/locore.s#3 integrate Differences ... ==== //depot/projects/tty/contrib/groff/tmac/doc-common#4 (text+ko) ==== @@ -554,7 +554,10 @@ . as doc-header-string "\|.\|.\|. . \} . tl \*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[] -. sp \n[doc-header-space]u +. ie !\n[cR] \ +. sp \n[doc-header-space]u +. el \ +. sp 1v . ev . ns .. @@ -665,7 +668,7 @@ .\" NS width register `Nd' set above . .de Nd -. nop \- \$* +. nop \[em] \$* .. . . ==== //depot/projects/tty/contrib/groff/tmac/doc-ditroff#4 (text+ko) ==== @@ -118,13 +118,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space .5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space .5i . . .\" NS doc-display-vertical global register @@ -138,13 +138,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/tty/contrib/groff/tmac/doc-nroff#4 (text+ko) ==== @@ -97,13 +97,13 @@ .\" NS doc-header-space global register .\" NS the space between header and body . -.nr doc-header-space 0 +.nr doc-header-space 0.5i . . .\" NS doc-footer-space global register .\" NS the space between body and footer . -.nr doc-footer-space 0 +.nr doc-footer-space 0.5i . . .\" NS doc-display-vertical global register @@ -117,13 +117,8 @@ .\" NS .\" NS modifies: .\" NS doc-display-vertical -.\" NS doc-footer-space -.\" NS doc-header-space . .de doc-setup-page-layout -. nr doc-header-space .5i -. nr doc-footer-space .5i -. . ie r LL \ . ll \n[LL]u . el \ ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 (text+ko) ==== @@ -16,17 +16,21 @@ %release; + +X"> +X"> + ]>
- Early Adopter's Guide to &os; 5.0-RELEASE + Early Adopter's Guide to &os; &release.current; The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.14 2003/04/07 11:20:24 murray Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.15 2003/05/03 22:14:55 bmah Exp $ 2002 @@ -34,35 +38,50 @@ The &os; Release Engineering Team + + + This article describes the status of &os; + &release.current;, from the standpoint of users who may be new + to the &release.5x; series of releases or to &os; in general. + It presents some background information on release + engineering, some highlights of new features, and some + possible drawbacks that might be faced by early adopters. It + also contains some of the future release engineering plans for + the 4-STABLE development branch and some tips on upgrading + existing systems. + Introduction - &os; 5.0 marks the first new major version of &os; in + &os; &release.5x; marks the first new major version of &os; in over two years. Besides a number of new features, it also contains a number of major developments in the underlying system architecture. Along with these advances, however, comes a system that incorporates a tremendous amount of new and not-widely-tested code. Compared to the existing line of - 4.X releases, 5.0 may have regressions + &release.4x; releases, the first few &release.5x; releases + may have regressions in areas of stability, performance, and occasionally functionality. - For these reasons, the &a.re; does not - encourage users to blindly update from older &os; releases to - 5.0. Specifically, for more conservative users, we recommend - running 4.X releases (such as + For these reasons, the &a.re; specifically + discourages users from updating from older &os; releases to + &release.current; unless they are aware of (and prepared to deal + with) possible regressions in the newer releases. + Specifically, for more conservative users, we recommend + running &release.4x; releases (such as 4.8-RELEASE) for the near-term future. We feel that such users are probably best served by - upgrading to 5.X only after a + upgrading to &release.5x; only after a 5-STABLE development branch has been created; this may be around - the time of 5.1-RELEASE or 5.2-RELEASE. + the time of 5.2-RELEASE. - (&os; 5.0 suffers from what has been described as a + (&os; &release.5x; suffers from what has been described as a chicken and egg problem. The entire project has - a goal of producing a 5.0-RELEASE that is as stable and reliable + a goal of producing releases that are as stable and reliable as possible. This stability and reliability requires widespread testing, particularly of the system's newer features. However, getting a large number of users to test the system, in a @@ -70,14 +89,14 @@ release first!) This article describes some of the issues involved in - installing and running &os; 5.0-RELEASE. We begin with a + installing and running &os; &release.current;. We begin with a brief overview of the &os; release process. We then present - some of the more noteworthy new features in &os; 5.0, along + some of the more noteworthy new features in &os; &release.current;, along with some areas that may prove troublesome for unwary users. For those users choosing to remain with 4-STABLE-based releases, we give some of the short- to medium-term plans for this development branch. Finally, we present some notes on upgrading - existing 4.X systems to 5.0. + existing &release.4x; systems to &release.current;. @@ -98,12 +117,12 @@ these branches after some amount of testing in CURRENT. At the moment, only one STABLE branch is under active development; this branch is referred to as 4-STABLE, and all of the - &os; 4.X releases were based on + &os; &release.4x; releases were based on it. This branch has the tag RELENG_4 in the CVS repository. - &os; 5.0 will be based on the CURRENT branch. This - will be the first release from this branch in over two years (the + &os; 5.0 and 5.1 are based on the CURRENT branch. These + are the first releases from this branch in over two years (the last was &os; 4.0, in March 2000). At some point after the release of &os; 5.0, a @@ -112,31 +131,37 @@ The past two stable branches (3-STABLE and 4-STABLE) were created immediately after their respective dot-oh releases (3.0 and 4.0, respectively). In hindsight, this - practice did not give sufficient time for either CURRENT or the new - STABLE branches to stabilize after the new branches were - created. + practice did not give sufficient time for either CURRENT + to stabilize before the new branches were + created. This in turn resulted in wasted effort porting bug + fixes between branches, as well as some architectural changes + that could not be ported between branches at all. Therefore, the release engineering team will only create the - 5-STABLE branch in the CVS repository after they have found a + 5-STABLE branch in the CVS repository after we have found a relatively stable state to use as its basis. It is likely that there will be - multiple releases in the 5.X series + multiple releases in the &release.5x; series before this happens; we estimate that the 5-STABLE branch will be created sometime after - 5.1-RELEASE or 5.2-RELEASE. + 5.2-RELEASE. More information on &os; release engineering processes can be found on the Release - Engineering Web pages and in the &os; Release - Engineering article. + Engineering Web pages and in the &os; Release + Engineering article. Specific issues for the upcoming + 5-STABLE development branch can be found in The + Roadmap for 5-STABLE. New Features - A large attraction of &os; 5.0 is a number of new + A large attraction of &os; &release.5x; is a number of new features. These new features and functionality generally involve large architectural changes that were not feasible to port back to the &os; 4-STABLE development branch. (By contrast, many @@ -149,13 +174,15 @@ SMPng: The next generation support for SMP machines (work in progress). There is now partial support for multiple processors to be running in the kernel - at the same time. + at the same time. This work is ongoing. KSE: Kernel Scheduled Entities allow a single process to have multiple kernel-level threads, similar to Scheduler - Activations. + Activations. The (experimental) libkse + and libthr libraries make this + feature available to multi-threaded userland programs. @@ -166,7 +193,7 @@ GCC: The compiler toolchain is now based on GCC - 3.2.1, rather than GCC + 3.2.2, rather than GCC 2.95.X. @@ -190,7 +217,9 @@ UFS2: A new UFS2 on-disk format has been added, which supports extended per-file attributes and larger file - sizes. + sizes. UFS2 is now the default format for &man.newfs.8;. + On all platforms except for pc98, filesystems created from + within &man.sysinstall.8; will use UFS2 by default. @@ -200,14 +229,14 @@ A more comprehensive list of new features can be found in - the release notes for &os; 5.0. + the release notes for &os; &release.prev; and &os; &release.current;. Drawbacks to Early Adoption - Along with the new features of &os; 5.0 come some areas + Along with the new features of &os; &release.5x; come some areas that can cause problems, or at least can lead to unexpected behavior. Generally, these come from the fact that a number of features are works-in-progress. A partial list of these @@ -217,7 +246,9 @@ A number of features are not yet finished. Examples - from the feature list above include SMPng and KSE. + from the feature list above include SMPng and KSE. While + suitable for testing and experimentation, these features may + not be ready for production use. @@ -238,6 +269,14 @@ + Some parts of the &os; base system have fallen into a + state of disrepair due to a lack of users and maintainers. + These have been removed. Specific examples include the + generation of a.out-style executables, XNS networking + support, and the X-10 controller driver. + + + A number of ports and packages do not build or do not run correctly under &os; 5.0, whereas they did under &os; 4-STABLE. Generally these problems are caused by compiler @@ -245,8 +284,7 @@ - Because &os; 5.0 is the first release from the - CURRENT branch in over two years, many of its features are + Many &os; &release.5x; features are seeing wide exposure for the first time. Many of these features (such as SMPng) have broad impacts on the kernel. @@ -264,7 +302,7 @@ branch after a settling time in -CURRENT. &os; 5.0 does not have the stabilizing influence of a -STABLE branch. (It is likely that the 5-STABLE development - branch will be created sometime after 5.1-RELEASE or + branch will be created sometime after 5.2-RELEASE.) @@ -273,7 +311,7 @@ url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook and FAQ) - may not reflect changes recently made to &os; 5.0. + may not reflect changes recently made to &os; &release.5x;. @@ -281,7 +319,7 @@ Because a number of these drawbacks affect system stability, the release engineering team recommends that more conservative sites and users stick to releases based on the 4-STABLE branch until - the 5.X series is more polished. + the &release.5x; series is more polished. @@ -289,27 +327,26 @@ Plans for the 4-STABLE Branch The release of &os; 5.0 does not mean the end of the - 4-STABLE branch. There will most likely be at least one more release on + 4-STABLE branch. Indeed, &os; 4.8 was released two months after + 5.0, in April 2003. There will most likely be at least one more release on this branch, namely 4.9-RELEASE, currently scheduled for summer - 2003. - - As of this writing, the release engineering team has no - definite plans for future releases (past 4.8) on the 4-STABLE - branch. However, a 4.9-RELEASE or even a 4.10-RELEASE are - likely possibilities. Any future releases from this branch will + 2003. + A 4.10-RELEASE is a likely possibility as well. + Future releases from this branch will depend on several factors. The most important of these is the existence and stability of the 5-STABLE branch. If CURRENT is not sufficiently stable to allow the creation of a 5-STABLE branch, this may require and permit more releases from the 4-STABLE branch. Until the last declared release - on the 4-STABLE branch, new features may be merged from HEAD at + on the 4-STABLE branch, new features may be merged from HEAD at the discretion of developers, subject to existing release engineering policies. - To some extent, the release engineering team will take into + To some extent, the release engineering team (as well as the + developer community as a whole) will take into account user demand for future 4-STABLE releases. This demand, however, will need to be balanced with release engineering - resources (in terms of personnel, computing resources, and mirror + resources (particularly developers' time, computing resources, and mirror archive space). The &a.security-officer; will continue to support releases @@ -319,20 +356,20 @@ page on the &os; web site. Generally, the two most recent releases from any branch will be supported with respect to security advisories and security fixes. At its discretion, - the team may support other releases. + the team may support other releases for specific issues. - Notes on Upgrading + Notes on Upgrading from &os; &release.4x; For those users with existing &os; systems, this section offers a few notes on upgrading a &os; - 4.X system to - 5.X. As with any &os; upgrade, it + &release.4x; system to + &release.5x;. As with any &os; upgrade, it is crucial to read the release notes and the errata for the version in question, as well as - src/UPDATING for source upgrades. + src/UPDATING in the case of source upgrades. Binary Upgrades @@ -341,14 +378,16 @@ backup everything, reformat, reinstall, and restore everything. This eliminates problems of incompatible or obsolete executables or configuration files polluting the - new system. + new system. It allows new filesystems to be created to take + advantage of new functionality (most notably, the UFS2 + defaults). As of this time, the binary upgrade option in &man.sysinstall.8; has not been well-tested for cross-major-version upgrades. Using this feature is not recommended. In particular, a binary upgrade will leave behind a number of files that are present in &os; - 4.X but not in 5.0. These obsolete + &release.4x; but not in &release.5x;. These obsolete files may create some problems. On the i386 and pc98 platforms, a UserConfig utility @@ -371,7 +410,7 @@ rather than the stripped-down kernel on the floppy images. In theory, any system capable of booting the Microsoft Windows NT 4 installation CDROMs should be able to cope with the &os; - 5.0 CDROMs. + &release.5x; CDROMs. @@ -402,8 +441,8 @@ users will not notice this change. It is generally possible to run old - 4.X executables under - 5.X, but this requires the + &release.4x; executables under + &release.5x;, but this requires the compat4x distribution to be installed. Thus, using old ports may be possible. @@ -417,22 +456,38 @@ (especially with C++ programs) as the compiler may wind up using a mixture of obsolete and current header files. - MAKEDEV is no longer available. - FreeBSD 5.X uses a device filesystem. For more information, + MAKEDEV is no longer available, nor + is it required. + FreeBSD &release.5x; uses a device filesystem, which automatically + creates device nodes on demand. For more information, please see &man.devfs.5;. + UFS2 is the default on-disk format for file systems + created using &man.newfs.8;. For all platforms except pc98, + it is also the default for file systems created using the disk + labeling screen within &man.sysinstall.8;. Because &os; + &release.4x; only understands UFS1 (not UFS2), disk partitions + that need to be accessed by both &release.5x; and &release.4x; + must be created with UFS1. This can be specified using the + option to &man.newfs.8;, or on the disk + labeling screen in &man.sysinstall.8;. This situation most + often arises with a a single machine that dual-boots &os; + &release.4x; and &os; &release.5x;. Note that there is no way + to convert file systems between the two on-disk formats (other + than backing up, re-creating the file system, and + restoring). + - Summary - While &os; 5.0 contains a number of new and exciting + While &os; &release.current; contains a number of new and exciting features, it may not be suitable for all users at this time. In this document, we presented some background on release - engineering, some of the more notable new features of the 5.X + engineering, some of the more notable new features of the &release.5x; series, and some drawbacks to early adoption. We also presented some future plans for the 4-STABLE development branch and some tips on upgrading for early adopters. ==== //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.558 2003/05/03 09:44:25 dougb Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.560 2003/05/03 22:18:49 bmah Exp $ 2000 @@ -23,9 +23,10 @@ recent changes made to the &os; base system on the &release.branch; development branch. ]]> - Both changes for kernel and userland are listed, as well as - applicable security advisories that were issued since the last - release. Some brief remarks on upgrading are also presented. + This document lists applicable security advisories that were issued since + the last release, as well as significant changes to the &os; + kernel and userland. + Some brief remarks on upgrading are also presented. @@ -61,6 +62,24 @@ Handbook. ]]> + + Users who are new to the &release.branch; series of &os; + &release.type;s should also read the Early Adopters Guide + to &os; &release.current;. This document can generally be + found in the same location as the release notes (either as a part of a + &os; distribution or on the &os; Web site). It contains important + information regarding the advantages and disadvantages of using + &os; &release.current;, as opposed to releases based on the &os; + 4-STABLE development branch. + + All users are encouraged to consult the release errata before + installing &os;. The errata document is updated with + late-breaking information discovered late in the + release cycle or after the release. Typically, it contains + information on known bugs, security advisories, and corrections to + documentation. An up-to-date copy of the errata for &os; + &release.current; can be found on the &os; Web site. + @@ -78,21 +97,22 @@ since &release.prev;. It includes items that are unique to the &release.branch; branch, as well as some features that may have been recently merged to - other branches (after &os; &release.prev.historic;). The later + other branches (after &os; &release.prev.historic;). The latter items are marked as &merged;. ]]> Typical release note items - document new drivers or hardware support, new commands or options, - major bug fixes, or contributed software upgrades. Applicable security - advisories issued after &release.prev.historic; are also listed. + document recent security advisories issued after + &release.prev.historic;, + new drivers or hardware support, new commands or options, + major bug fixes, or contributed software upgrades. They may also + list changes to major ports/packages or release engineering + practices. Clearly the release notes cannot list every single + change made to &os; between releases; this document focuses + primarily on security advisories, user-visible changes, and major + architectural improvements. - Many additional changes were made to &os; that are not listed - here for lack of space. For example, documentation was corrected - and improved, minor bugs were fixed, insecure coding practices - were audited and corrected, and source code was cleaned up. - Security Advisories @@ -276,7 +296,7 @@ Modules designed for use with &os; 4.X are likely to - panic and should be used with extreme caution. + panic when loaded into a &os; &release.current; kernel and should be used with extreme caution. @@ -301,7 +321,7 @@ SHDSL modem has been added. &merged; A new &man.wlan.4; module provides 802.11 link-layer support. The - &man.wi.4; driver now uses this facility. + &man.wi.4; and &man.an.4; drivers now use this facility. A timing bug in the &man.xl.4; driver, which could cause a kernel panic (or other @@ -403,7 +423,7 @@ programs are &man.camcontrol.8; in the base system, the sysutils/cdrtools port, and the - multimedia/xmmsport. + multimedia/xmms port. @@ -513,7 +533,7 @@ &man.disklabel.8; is now only built for architectures where it is useful (i386, pc98, alpha, and ia64). - The to &man.disklabel.8; has been + The option to &man.disklabel.8; has been removed because the i386 boot loader now resides in a single file. @@ -600,7 +620,7 @@ conjunction with the recently-added net.inet.ip.portrange.reservedhigh sysctl. - The MAKEDEV script is now unnecessary, due to the mandatory + The MAKEDEV script is now unnecessary, due to the mandatory presence of &man.devfs.5;, and has been removed. &man.mergemaster.8; now supports a @@ -634,7 +654,7 @@ &man.newfs.8; will now create UFS2 file systems by default, unless UFS1 is specifically requested with the - . + option. &man.newsyslog.8; now supports a W flag to force previously-started compression jobs for an entry (or @@ -679,9 +699,11 @@ remains unsuitable for all but trivial uses.) &man.rtld.1; now has support for the dynamic mapping of - shared object dependencies. More information can be found in - &man.libmap.conf.5;. This is an optional feature, disabled by - default. + shared object dependencies. This optional feature is especially + useful when experimenting with different threading libraries. + It is not, however, built by default. More information on + enabling and using this feature can be found in + &man.libmap.conf.5;. &man.sem.open.3; now correctly handles multiple opens of the same semaphore; as a result, &man.sem.close.3; no longer crashes @@ -958,7 +980,7 @@ Users with existing &os; systems are highly encouraged to read the Early - Adopter's Guide to &os; 5.0. This document generally has + Adopter's Guide to &os; &release.current;. This document generally has the filename EARLY.TXT on the distribution media, or any other place that the release notes can be found. It offers some notes on upgrading, but more importantly, also ==== //depot/projects/tty/sys/dev/bge/if_bge.c#5 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.37 2003/05/03 19:06:50 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.38 2003/05/03 22:58:45 ps Exp $"); #include #include @@ -1003,6 +1003,7 @@ struct bge_softc *sc; { int i; + u_int32_t dma_rw_ctl; /* Set endianness before we access any non-PCI registers. */ #if BYTE_ORDER == BIG_ENDIAN @@ -1042,14 +1043,45 @@ if (pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & BGE_PCISTATE_PCI_BUSMODE) { /* Conventional PCI bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x3F000F, 4); + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x7 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); } else { /* PCI-X bus */ - pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, - BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD|0x1B000F, 4); + /* + * The 5704 uses a different encoding of read/write + * watermarks. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); + else + dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | + (0x3 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | + (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT) | + (0x0F); + + /* + * 5703 and 5704 need ONEDMA_AT_ONCE as a workaround + * for hardware bugs. + */ + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) { + u_int32_t tmp; + + tmp = CSR_READ_4(sc, BGE_PCI_CLKCTL) & 0x1f; + if (tmp == 0x6 || tmp == 0x7) + dma_rw_ctl |= BGE_PCIDMARWCTL_ONEDMA_ATONCE; + } } + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || + BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + dma_rw_ctl &= ~BGE_PCIDMARWCTL_MINDMA; + pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, dma_rw_ctl, 4); + /* * Set up general mode register. */ @@ -1415,7 +1447,7 @@ CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK); } else { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16); - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, BGE_EVTENB_MI_INTERRUPT); } @@ -1620,10 +1652,6 @@ pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & BGE_PCIMISCCTL_ASICREV; - /* Pretend all 5700s are the same */ - if ((sc->bge_asicrev & 0xFF000000) == BGE_ASICREV_BCM5700) - sc->bge_asicrev = BGE_ASICREV_BCM5700; - /* * Figure out what sort of media we have by checking the * hardware config word in the first 32k of NIC internal memory, @@ -2037,7 +2065,7 @@ * the interrupt handler. */ - if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { + if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) { u_int32_t status; status = CSR_READ_4(sc, BGE_MAC_STS); ==== //depot/projects/tty/sys/dev/bge/if_bgereg.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.14 2003/05/02 19:53:40 ps Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.15 2003/05/03 22:58:45 ps Exp $ */ /* @@ -231,7 +231,11 @@ #define BGE_ASICREV_BCM5704_A2 0x20020000 /* shorthand one */ -#define BGE_ASICREV_BCM5700 0x71000000 +#define BGE_ASICREV(x) ((x) >> 28) +#define BGE_ASICREV_BCM5700 0x07 +#define BGE_ASICREV_BCM5701 0x00 +#define BGE_ASICREV_BCM5703 0x01 +#define BGE_ASICREV_BCM5704 0x02 /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF @@ -239,11 +243,15 @@ #define BGE_PCIDMARWCTL_WRADDR_BNDRY 0x00003800 #define BGE_PCIDMARWCTL_ONEDMA_ATONCE 0x00004000 #define BGE_PCIDMARWCTL_RD_WAT 0x00070000 +# define BGE_PCIDMARWCTL_RD_WAT_SHIFT 16 #define BGE_PCIDMARWCTL_WR_WAT 0x00380000 +# define BGE_PCIDMARWCTL_WR_WAT_SHIFT 19 #define BGE_PCIDMARWCTL_USE_MRM 0x00400000 #define BGE_PCIDMARWCTL_ASRT_ALL_BE 0x00800000 #define BGE_PCIDMARWCTL_DFLT_PCI_RD_CMD 0x0F000000 +# define BGE_PCIDMA_RWCTL_PCI_RD_CMD_SHIFT 24 #define BGE_PCIDMARWCTL_DFLT_PCI_WR_CMD 0xF0000000 +# define BGE_PCIDMA_RWCTL_PCI_WR_CMD_SHIFT 28 #define BGE_PCI_READ_BNDRY_DISABLE 0x00000000 #define BGE_PCI_READ_BNDRY_16BYTES 0x00000100 ==== //depot/projects/tty/sys/ia64/ia64/locore.s#3 (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/ia64/ia64/locore.s,v 1.28 2003/04/06 21:31:26 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/locore.s,v 1.29 2003/05/03 23:05:16 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -358,9 +358,9 @@ intr_n = 0 .rept INTRCNT_COUNT - 1 .ascii "#" - .byte intr_n / 100 + '0 - .byte (intr_n % 100) / 10 + '0 - .byte intr_n % 10 + '0 + .byte intr_n / 100 + '0' + .byte (intr_n % 100) / 10 + '0' + .byte intr_n % 10 + '0' .fill INTRNAME_LEN - 1 - 3 - 1, 1, ' ' .byte 0 intr_n = intr_n + 1 From owner-p4-projects@FreeBSD.ORG Sat May 3 18:57:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DD7237B404; Sat, 3 May 2003 18:57:08 -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 A1F7A37B401 for ; Sat, 3 May 2003 18:57:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EA6143FA3 for ; Sat, 3 May 2003 18:57:07 -0700 (PDT) (envelope-from jmallett@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 h441v70U002034 for ; Sat, 3 May 2003 18:57:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h441v6DO002031 for perforce@freebsd.org; Sat, 3 May 2003 18:57:06 -0700 (PDT) Date: Sat, 3 May 2003 18:57:06 -0700 (PDT) Message-Id: <200305040157.h441v6DO002031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30504 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: Sun, 04 May 2003 01:57:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30504 Change 30504 by jmallett@jmallett_dalek on 2003/05/03 18:56:19 Access floating point registers in terms of longlong, duh. While here, let the context switch label buffer slip through, part of DDB WIP, and useful for setjmp/longjmp from NBSD. Affected files ... .. //depot/projects/mips/sys/mips/include/reg.h#5 edit Differences ... ==== //depot/projects/mips/sys/mips/include/reg.h#5 (text+ko) ==== @@ -36,9 +36,13 @@ }; struct fpreg { - double r_regs[33]; + long long r_regs[33]; }; +typedef struct cswx { + __register_t val[12]; +} label_t; + /* * Registers for a debugger by way of procfs or ptrace. */ From owner-p4-projects@FreeBSD.ORG Sat May 3 19:01:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED13837B404; Sat, 3 May 2003 19:01:13 -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 8B74D37B401 for ; Sat, 3 May 2003 19:01:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01EA643F85 for ; Sat, 3 May 2003 19:01:13 -0700 (PDT) (envelope-from jmallett@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 h4421C0U002265 for ; Sat, 3 May 2003 19:01:12 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4421CMu002262 for perforce@freebsd.org; Sat, 3 May 2003 19:01:12 -0700 (PDT) Date: Sat, 3 May 2003 19:01:12 -0700 (PDT) Message-Id: <200305040201.h4421CMu002262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30505 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: Sun, 04 May 2003 02:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30505 Change 30505 by jmallett@jmallett_dalek on 2003/05/03 19:00:53 Drag over DDB support kicking and screaming from NetBSD. This blows up interestingly right now due to the fact I disabled our exception vectors in favor of ARCS which gives information. Working on it. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#17 edit .. //depot/projects/mips/sys/mips/include/cpu.h#11 edit .. //depot/projects/mips/sys/mips/include/db_machdep.h#3 edit .. //depot/projects/mips/sys/mips/include/mips_opcode.h#1 add .. //depot/projects/mips/sys/mips/include/pcb.h#4 edit .. //depot/projects/mips/sys/mips/include/pte.h#3 edit .. //depot/projects/mips/sys/mips/include/setjmp.h#1 add .. //depot/projects/mips/sys/mips/include/trap.h#1 add .. //depot/projects/mips/sys/mips/mips/db_disasm.c#1 add .. //depot/projects/mips/sys/mips/mips/db_hwwatch.c#1 add .. //depot/projects/mips/sys/mips/mips/db_interface.c#1 add .. //depot/projects/mips/sys/mips/mips/db_trace.c#1 add .. //depot/projects/mips/sys/mips/mips/genassym.c#7 edit .. //depot/projects/mips/sys/mips/mips/locore_mips3.S#8 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#17 (text+ko) ==== @@ -30,6 +30,11 @@ mips/mips/cache_r5k.c standard mips/mips/cache_r5k_subr.S standard +mips/mips/db_disasm.c optional ddb +mips/mips/db_hwwatch.c optional ddb +mips/mips/db_interface.c optional ddb +mips/mips/db_trace.c optional ddb + # This stanza is platform files, per platform. geom/geom_fx.c optional sgimips mips/sgimips/clock.c optional sgimips ==== //depot/projects/mips/sys/mips/include/cpu.h#11 (text+ko) ==== @@ -120,7 +120,9 @@ extern int cpu_arch; extern int mips_cpu_flags; extern int mips_has_r4k_mmu; +#define MIPS_HAS_R4K_MMU (mips_has_r4k_mmu) extern int mips_has_llsc; +#define MIPS_HAS_LLSC (mips_has_llsc) extern int mips3_pg_cached; #define CPU_MIPS_R4K_MMU 0x0001 ==== //depot/projects/mips/sys/mips/include/db_machdep.h#3 (text+ko) ==== @@ -1,5 +1,8 @@ -/*- - * Copyright (c) 2003 Juli Mallett. All rights reserved. +/* $NetBSD: db_machdep.h,v 1.14 2002/03/05 14:12:29 simonb Exp $ */ + +/* + * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author) + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,11 +12,17 @@ * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Jonathan Stone for + * the NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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) @@ -24,17 +33,86 @@ * * $FreeBSD$ */ +#ifndef _MIPS_DB_MACHDEP_H_ +#define _MIPS_DB_MACHDEP_H_ + +#include +#include +#include /* register state */ +#include /* symbolic register indices */ + + +typedef unsigned long db_addr_t; /* address - unsigned */ +typedef long db_expr_t; /* expression - signed */ + +typedef struct frame db_regs_t; + +extern db_regs_t ddb_regs; /* register state */ +#define DDB_REGS (&ddb_regs) + +#define PC_REGS(regs) ((db_addr_t)(regs)->f_regs[PC]) + +#define PC_ADVANCE(regs) do { \ + if ((db_get_value((regs)->f_regs[PC], sizeof(int), FALSE) & \ + 0xfc00003f) == 0xd) \ + (regs)->f_regs[PC] += BKPT_SIZE; \ +} while(0) + +/* Similar to PC_ADVANCE(), except only advance on cpu_Debugger()'s bpt */ +#define PC_BREAK_ADVANCE(regs) do { \ + if (db_get_value((regs)->f_regs[PC], sizeof(int), FALSE) == 0xd) \ + (regs)->f_regs[PC] += BKPT_SIZE; \ +} while(0) + +#define BKPT_INST 0x0001000D +#define BKPT_SIZE (4) /* size of breakpoint inst */ +#define BKPT_SET(inst) (BKPT_INST) + +#define IS_BREAKPOINT_TRAP(type, code) ((type) == T_BREAK) +#define IS_WATCHPOINT_TRAP(type, code) (0) /* XXX mips3 watchpoint */ + +/* + * Interface to disassembly (shared with mdb) + */ +db_addr_t db_disasm_insn(int insn, db_addr_t loc, boolean_t altfmt); + + +/* + * Entrypoints to DDB for kernel, keyboard drivers, init hook + */ +void kdb_kbd_trap(db_regs_t *); +void db_set_ddb_regs(int type, register_t *); +int kdb_trap(int type, register_t *); + +#define DB_SMALL_VALUE_MAX (0x7fffffff) +#define DB_SMALL_VALUE_MIN (-0x40001) + +/* + * Constants for KGDB. + */ +typedef register_t kgdb_reg_t; +#define KGDB_NUMREGS 90 +#define KGDB_BUFLEN 1024 -#ifndef _MACHINE_DB_MACHDEP_H_ -#define _MACHINE_DB_MACHDEP_H_ +/* + * MIPS cpus have no hardware single-step. + */ +#define SOFTWARE_SSTEP + +#define inst_trap_return(ins) ((ins)&0) -#include +boolean_t inst_branch(int inst); +boolean_t inst_call(int inst); +boolean_t inst_return(int inst); +boolean_t inst_load(int inst); +boolean_t inst_store(int inst); +boolean_t inst_unconditional_flow_transfer(int inst); +db_addr_t branch_taken(int inst, db_addr_t pc, db_regs_t *regs); +db_addr_t next_instr_address(db_addr_t pc, boolean_t bd); /* - * Machine-dependent definitions for the new kernel debugger. + * We have machine-dependent commands. */ -typedef vm_offset_t db_addr_t; -typedef long db_expr_t; -typedef struct trapframe db_regs_t; +#define DB_MACHINE_COMMANDS -#endif /* !_MACHINE_DB_MACHDEP_H_ */ +#endif /* _MIPS_DB_MACHDEP_H_ */ ==== //depot/projects/mips/sys/mips/include/pcb.h#4 (text+ko) ==== @@ -35,10 +35,14 @@ */ struct pcb { struct fpreg pcb_fpregs; /* Saved floating point registers */ - struct reg pcb_regs; /* Saved regs. XXX This is excessive. */ + register_t pcb_context[12]; /* kernel context for resume */ + char *pcb_onfault; /* for copyin/copyout faults */ + u_int32_t pcb_ppl; /* previous priority level */ }; #ifdef _KERNEL +#define PCB_FSR(pcb) ((pcb)->pcb_fpregs.r_regs[FSR - FPBASE]) + int savectx(struct pcb *pcb); #endif ==== //depot/projects/mips/sys/mips/include/pte.h#3 (text+ko) ==== @@ -176,10 +176,10 @@ #define mips3_pfn_is_ext(x) ((x) & 0x3c000000) #define mips3_paddr_to_tlbpfn(x) \ - (((paddr_t)(x) >> MIPS3_PG_SHIFT) & MIPS3_PG_FRAME) + (((vm_paddr_t)(x) >> MIPS3_PG_SHIFT) & MIPS3_PG_FRAME) #define mips3_tlbpfn_to_paddr(x) \ - ((paddr_t)((x) & MIPS3_PG_FRAME) << MIPS3_PG_SHIFT) -#define mips3_vad_to_vpn(x) ((vaddr_t)(x) & MIPS3_PG_SVPN) + ((vm_paddr_t)((x) & MIPS3_PG_FRAME) << MIPS3_PG_SHIFT) +#define mips3_vad_to_vpn(x) ((vm_offset_t)(x) & MIPS3_PG_SVPN) #define mips3_vpn_to_vad(x) ((x) & MIPS3_PG_SVPN) #define MIPS3_PTE_TO_PADDR(pte) (mips3_tlbpfn_to_paddr(pte)) @@ -224,7 +224,7 @@ #define PTE_TO_PADDR(pte) MIPS3_PTE_TO_PADDR((pte)) #define PAGE_IS_RDONLY(pte, va) MIPS3_PAGE_IS_RDONLY((pte), (va)) -#define mips_tlbpfn_to_paddr(x) mips3_tlbpfn_to_paddr((vaddr_t)(x)) +#define mips_tlbpfn_to_paddr(x) mips3_tlbpfn_to_paddr((vm_offset_t)(x)) #define mips_paddr_to_tlbpfn(x) mips3_paddr_to_tlbpfn((x)) #endif /* ! LOCORE */ @@ -234,7 +234,7 @@ * Kernel virtual address to page table entry and visa versa. */ #define kvtopte(va) \ - (kptemap + (((vaddr_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT)) + (kptemap + (((vm_offset_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT)) #define ptetokv(pte) \ ((((pt_entry_t *)(pte) - kptemap) << PGSHIFT) + VM_MIN_KERNEL_ADDRESS) ==== //depot/projects/mips/sys/mips/mips/genassym.c#7 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include +#include ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); @@ -173,6 +174,20 @@ ASSYM(TF_REG_EPC, offsetof(struct trapframe, tf_regs[TF_EPC])); ASSYM(TF_PPL, offsetof(struct trapframe, tf_ppl)); +ASSYM(CTXSWFRAME_SIZ, sizeof(label_t)); +ASSYM(SF_REG_SR, offsetof(label_t, val[11])); +ASSYM(SF_REG_RA, offsetof(label_t, val[10])); +ASSYM(SF_REG_S0, offsetof(label_t, val[0])); +ASSYM(SF_REG_S1, offsetof(label_t, val[1])); +ASSYM(SF_REG_S2, offsetof(label_t, val[2])); +ASSYM(SF_REG_S3, offsetof(label_t, val[3])); +ASSYM(SF_REG_S4, offsetof(label_t, val[4])); +ASSYM(SF_REG_S5, offsetof(label_t, val[5])); +ASSYM(SF_REG_S6, offsetof(label_t, val[6])); +ASSYM(SF_REG_S7, offsetof(label_t, val[7])); +ASSYM(SF_REG_SP, offsetof(label_t, val[8])); +ASSYM(SF_REG_S8, offsetof(label_t, val[9])); + ASSYM(VM_MIN_ADDRESS, VM_MIN_ADDRESS); ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); ASSYM(VM_MAX_ADDRESS, VM_MAX_ADDRESS); ==== //depot/projects/mips/sys/mips/mips/locore_mips3.S#8 (text+ko) ==== @@ -87,6 +87,8 @@ * $FreeBSD$ */ +#include "opt_ddb.h" + #include #include @@ -459,3 +461,47 @@ #endif #endif END(mips_maybewait_idle) + +#if defined(DDB) || defined(KGDB) +/* + * setjmp(label_t *) + * longjmp(label_t *) + */ +LEAF(setjmp) + mfc0 v0, MIPS_COP_0_STATUS + REG_S s0, SF_REG_S0(a0) + REG_S s1, SF_REG_S1(a0) + REG_S s2, SF_REG_S2(a0) + REG_S s3, SF_REG_S3(a0) + REG_S s4, SF_REG_S4(a0) + REG_S s5, SF_REG_S5(a0) + REG_S s6, SF_REG_S6(a0) + REG_S s7, SF_REG_S7(a0) + REG_S sp, SF_REG_SP(a0) + REG_S s8, SF_REG_S8(a0) + REG_S ra, SF_REG_RA(a0) + REG_S v0, SF_REG_SR(a0) + j ra + move v0, zero +END(setjmp) + +LEAF(longjmp) + REG_L v0, SF_REG_SR(a0) + DYNAMIC_STATUS_MASK(v0,ra) # machine dependent masking + REG_L ra, SF_REG_RA(a0) + REG_L s0, SF_REG_S0(a0) + REG_L s1, SF_REG_S1(a0) + REG_L s2, SF_REG_S2(a0) + REG_L s3, SF_REG_S3(a0) + REG_L s4, SF_REG_S4(a0) + REG_L s5, SF_REG_S5(a0) + REG_L s6, SF_REG_S6(a0) + REG_L s7, SF_REG_S7(a0) + REG_L sp, SF_REG_SP(a0) + REG_L s8, SF_REG_S8(a0) + mtc0 v0, MIPS_COP_0_STATUS + COP0_SYNC + j ra + li v0, 1 +END(longjmp) +#endif From owner-p4-projects@FreeBSD.ORG Sat May 3 20:29:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF29A37B404; Sat, 3 May 2003 20:29:01 -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 7C0F937B401 for ; Sat, 3 May 2003 20:29:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 020F943FAF for ; Sat, 3 May 2003 20:29:01 -0700 (PDT) (envelope-from marcel@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 h443T00U007727 for ; Sat, 3 May 2003 20:29:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h443T03B007724 for perforce@freebsd.org; Sat, 3 May 2003 20:29:00 -0700 (PDT) Date: Sat, 3 May 2003 20:29:00 -0700 (PDT) Message-Id: <200305040329.h443T03B007724@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30508 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: Sun, 04 May 2003 03:29:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=30508 Change 30508 by marcel@marcel_nfs on 2003/05/03 20:28:47 Round of fixes: o Make sure the sio_dbgport softc points at the right softc and avoid a NULL pointer dereference. o Announce for the sio device if it's the console or the debug port or both. Note that both console and debug port is only allowed if GDB_REMOTE_CHAT is defined. o Implement the MD GDB functions for i386 and provide stubs for ia64. o Remove references to the GDB option that I wanted to introduce, but didn't after all. o Warn the user if remote GDB is invoked without there being a debug port. More to come... Affected files ... .. //depot/projects/sio/sys/ddb/db_command.c#3 edit .. //depot/projects/sio/sys/ddb/db_gdb.c#3 edit .. //depot/projects/sio/sys/ddb/ddb.h#3 edit .. //depot/projects/sio/sys/dev/sio/sio.c#5 edit .. //depot/projects/sio/sys/dev/sio/sio_cons.c#4 edit .. //depot/projects/sio/sys/dev/sio/sio_dbg.c#2 edit .. //depot/projects/sio/sys/i386/include/db_machdep.h#4 edit .. //depot/projects/sio/sys/ia64/ia64/db_interface.c#3 edit .. //depot/projects/sio/sys/ia64/include/db_machdep.h#2 edit Differences ... ==== //depot/projects/sio/sys/ddb/db_command.c#3 (text+ko) ==== @@ -69,10 +69,6 @@ static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; -#ifdef GDB -static db_cmdfcn_t db_gdb; -#endif - /* XXX this is actually forward-static. */ extern struct command db_show_cmds[]; @@ -420,9 +416,7 @@ { "call", db_fncall, CS_OWN, 0 }, { "show", 0, 0, db_show_cmds }, { "ps", db_ps, 0, 0 }, -#ifdef GDB { "gdb", db_gdb, 0, 0 }, -#endif { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { (char *)0, } ==== //depot/projects/sio/sys/ddb/db_gdb.c#3 (text+ko) ==== @@ -180,7 +180,7 @@ } void -db_gdb_cmd(db_expr_t a1 __unused, boolean_t a2 __unused, db_expr_t a3 __unused, +db_gdb(db_expr_t a1 __unused, boolean_t a2 __unused, db_expr_t a3 __unused, char *a4 __unused) { @@ -434,6 +434,11 @@ gdb_reg reg; int c, error, len, regno; + if (dbgport == NULL) { + db_printf("GDB: No debug port configured.\n"); + return (ENXIO); + } + gdb_getregs(®s, raw_regs); /* "TxxPC:xxxxxxxx;FP:xxxxxxxx;SP:xxxxxxxx;" */ ==== //depot/projects/sio/sys/ddb/ddb.h#3 (text+ko) ==== @@ -156,10 +156,19 @@ db_cmdfcn_t db_write_cmd; db_cmdfcn_t db_show_one_thread; -/* Remote GDB support. */ -int gdb_handle_exception(db_regs_t *, int); -void gdb_init(void); -db_cmdfcn_t db_gdb_cmd; +/* + * Remote GDB support. + */ +db_cmdfcn_t db_gdb; + +gdb_reg gdb_getreg(struct gdb_registers *, int); +void gdb_getregs(struct gdb_registers *, db_regs_t *); +int gdb_handle_exception(db_regs_t *, int); +void gdb_init(void); +void gdb_setreg(struct gdb_registers *, int, gdb_reg); +void gdb_setregs(struct gdb_registers *, db_regs_t *); +void gdb_singlestep(struct gdb_registers *, int); +int gdb_signal(int); /* Scare the user with backtrace of curthread to console. */ void db_print_backtrace(void); ==== //depot/projects/sio/sys/dev/sio/sio.c#5 (text+ko) ==== @@ -679,7 +679,7 @@ sio_console.addr_type = com->addr_type; device_set_softc(dev, &sio_console); com = &sio_console; - } else if (com->bst == sio_dbgport->bst && + } else if (sio_dbgport != NULL && com->bst == sio_dbgport->bst && com->bsh == sio_dbgport->bsh) { sio_dbgport->addr_res = com->addr_res; sio_dbgport->addr_rid = com->addr_rid; @@ -811,8 +811,17 @@ termioschars(&com->it_in); com->it_out = com->it_in; - if (com->consdev != NULL) - device_printf(dev, "console\n"); + if (com->consdev != NULL || com->dbgport) { + device_printf(dev, "is "); + if (com->consdev != NULL) { + printf("console"); + if (com->dbgport) + printf("and "); + } + if (com->dbgport) + printf("debug port"); + printf(".\n"); + } if (sio_fast_ih == NULL) { swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, ==== //depot/projects/sio/sys/dev/sio/sio_cons.c#4 (text+ko) ==== @@ -190,6 +190,7 @@ while ((sio_getreg(&sio_console, com_lsr) & LSR_THRE) == 0 && --to) ; sio_setreg(&sio_console, com_data, c); + sio_barrier(&sio_console); splx(s); } ==== //depot/projects/sio/sys/dev/sio/sio_dbg.c#2 (text+ko) ==== @@ -88,19 +88,22 @@ * serial interface as the console. */ if (sio_console.bst == dd.bst && sio_console.bsh == dd.bsh) { + sio_dbgport = &sio_console; + if (sio_console.consdev != NULL) { #ifdef DBG_REMOTE_CHAT - sio_dbgport = &sio_console; - printf("sio: using console as debug port\n"); - return (0); + printf("sio: using console as debug port\n"); + /* XXX assume settings are the same. */ + return (0); #else - printf("sio: debug port not supported over console\n"); - return (EBUSY); + printf("sio: debug port not supported over console\n"); + return (EBUSY); #endif + } + } else { + bzero(&sio_debugport, sizeof(sio_debugport)); + sio_dbgport = &sio_debugport; } - bzero(&sio_debugport, sizeof(sio_debugport)); - sio_dbgport = &sio_debugport; - /* Minimum fields needed for rudimentary checks. */ sio_dbgport->bst = dd.bst; sio_dbgport->bsh = dd.bsh; @@ -137,10 +140,6 @@ { u_char iir; - /* Don't initialize if the debug port is the console. */ - if (sio_dbgport->consdev != NULL) - return; - /* Disable all interrupt sources. */ sio_setreg(sio_dbgport, com_ier, 0); sio_barrier(sio_dbgport); @@ -182,7 +181,7 @@ { } -void +static void siodbgputc(int c) { int to; @@ -191,6 +190,7 @@ while ((sio_getreg(sio_dbgport, com_lsr) & LSR_THRE) == 0 && --to) ; sio_setreg(sio_dbgport, com_data, c); + sio_barrier(sio_dbgport); } static int ==== //depot/projects/sio/sys/i386/include/db_machdep.h#4 (text+ko) ==== @@ -121,11 +121,4 @@ gdb_reg es; }; -gdb_reg gdb_getreg(struct gdb_registers *, int); -void gdb_getregs(struct gdb_registers *, db_regs_t *); -void gdb_setreg(struct gdb_registers *, int, gdb_reg); -void gdb_setregs(struct gdb_registers *, db_regs_t *); -void gdb_singlestep(struct gdb_registers *, int); -int gdb_signal(int); - #endif /* !_MACHINE_DB_MACHDEP_H_ */ ==== //depot/projects/sio/sys/ia64/ia64/db_interface.c#3 (text+ko) ==== @@ -548,3 +548,38 @@ db_show_mdpcpu(struct pcpu *pc) { } + +/* + * Remote GDB support. + */ +int +gdb_signal(int vector) +{ + return (SIGILL); +} + +gdb_reg +gdb_getreg(struct gdb_registers *regs, int regnum) +{ + return (~0); +} + +void +gdb_setreg(struct gdb_registers *regs, int regnum, gdb_reg val) +{ +} + +void +gdb_getregs(struct gdb_registers *regs, db_regs_t *raw_regs) +{ +} + +void +gdb_setregs(struct gdb_registers *regs, db_regs_t *raw_regs) +{ +} + +void +gdb_singlestep(struct gdb_registers *regs, int set) +{ +} ==== //depot/projects/sio/sys/ia64/include/db_machdep.h#2 (text+ko) ==== @@ -40,8 +40,6 @@ #include #include -#define DB_NO_AOUT - struct ia64_bundle; typedef vm_offset_t db_addr_t; /* address - unsigned */ @@ -111,4 +109,21 @@ */ #define DB_ELFSIZE 64 +/* + * Remote GDB support. + */ +#define GDB_REGNUM_FP -1 +#define GDB_REGNUM_PC -1 +#define GDB_REGNUM_SP -1 +typedef uint32_t gdb_reg; +typedef uint32_t gdb_addr; + +#define gdb_dec_addr gdb_dec_int32 +#define gdb_dec_reg gdb_dec_int32 +#define gdb_enc_reg gdb_enc_int32 + +struct gdb_registers { + int dummy; +}; + #endif /* _MACHINE_DB_MACHDEP_H_ */ From owner-p4-projects@FreeBSD.ORG Sat May 3 21:02:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD3E437B401; Sat, 3 May 2003 21:02:06 -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 6C99437B404; Sat, 3 May 2003 21:02:06 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7702F43FB1; Sat, 3 May 2003 21:02:05 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.8/8.12.3) with ESMTP id h44424A7034110; Sat, 3 May 2003 22:02:04 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 03 May 2003 22:01:39 -0600 (MDT) Message-Id: <20030503.220139.44793868.imp@bsdimp.com> To: jmallett@freebsd.org From: "M. Warner Losh" In-Reply-To: <200305030240.h432elND072264@repoman.freebsd.org> References: <200305030240.h432elND072264@repoman.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 30435 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: Sun, 04 May 2003 04:02:08 -0000 In message: <200305030240.h432elND072264@repoman.freebsd.org> Juli Mallett writes: : http://perforce.freebsd.org/chv.cgi?CH=30435 : : Change 30435 by jmallett@jmallett_dalek on 2003/05/02 19:40:13 : : Erk, remove redundant call to cp0_status_read. : : Affected files ... : : .. //depot/projects/mips/sys/mips/include/cpufunc.h#8 edit : : Differences ... : : ==== //depot/projects/mips/sys/mips/include/cpufunc.h#8 (text+ko) ==== : : @@ -38,7 +38,6 @@ : { : register_t s; : : - s = mips_cp0_status_read(); : mips_cp0_status_write((s = mips_cp0_status_read()) & ~MIPS_SR_IE); : return (s); : } Sure this is really redundant and not there for some weird mips box's pipeline delay requirements? Warner From owner-p4-projects@FreeBSD.ORG Sat May 3 21:06:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0F337B404; Sat, 3 May 2003 21:06:48 -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 E7A0637B401; Sat, 3 May 2003 21:06:47 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2495A43F75; Sat, 3 May 2003 21:06:47 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.8/8.12.3) with ESMTP id h4446jA7034124; Sat, 3 May 2003 22:06:45 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 03 May 2003 22:06:19 -0600 (MDT) Message-Id: <20030503.220619.74054358.imp@bsdimp.com> To: marcel@freebsd.org From: "M. Warner Losh" In-Reply-To: <200305031957.h43Jv26B068738@repoman.freebsd.org> References: <200305031957.h43Jv26B068738@repoman.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 30474 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: Sun, 04 May 2003 04:06:49 -0000 In message: <200305031957.h43Jv26B068738@repoman.freebsd.org> Marcel Moolenaar writes: : o I need to get my brain examined. I must be loosing it. Are you aware of the firewire hacks? Warner From owner-p4-projects@FreeBSD.ORG Sat May 3 21:27:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D55B37B404; Sat, 3 May 2003 21:27:16 -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 3C98037B401 for ; Sat, 3 May 2003 21:27:16 -0700 (PDT) Received: from ns1.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 631B043F3F for ; Sat, 3 May 2003 21:27:15 -0700 (PDT) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by ns1.xcllnt.net (8.12.9/8.12.9) with ESMTP id h444R8wk083182; Sat, 3 May 2003 21:27:08 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.9/8.12.9) with ESMTP id h444R8gD000800; Sat, 3 May 2003 21:27:08 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.9/8.12.9/Submit) id h444R8A0000799; Sat, 3 May 2003 21:27:08 -0700 (PDT) (envelope-from marcel) Date: Sat, 3 May 2003 21:27:08 -0700 From: Marcel Moolenaar To: "M. Warner Losh" Message-ID: <20030504042708.GB556@dhcp01.pn.xcllnt.net> References: <200305031957.h43Jv26B068738@repoman.freebsd.org> <20030503.220619.74054358.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030503.220619.74054358.imp@bsdimp.com> User-Agent: Mutt/1.5.3i cc: perforce@freebsd.org Subject: Re: PERFORCE change 30474 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: Sun, 04 May 2003 04:27:17 -0000 On Sat, May 03, 2003 at 10:06:19PM -0600, M. Warner Losh wrote: > In message: <200305031957.h43Jv26B068738@repoman.freebsd.org> > Marcel Moolenaar writes: > : o I need to get my brain examined. I must be loosing it. > > Are you aware of the firewire hacks? No. Remote GDB over firewire? -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Sat May 3 21:34:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A558F37B404; Sat, 3 May 2003 21:34:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id 416B737B401; Sat, 3 May 2003 21:34:24 -0700 (PDT) Date: Sat, 3 May 2003 23:34:24 -0500 From: Juli Mallett To: "M. Warner Losh" Message-ID: <20030503233424.A8651@FreeBSD.org> References: <200305030240.h432elND072264@repoman.freebsd.org> <20030503.220139.44793868.imp@bsdimp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20030503.220139.44793868.imp@bsdimp.com>; from imp@bsdimp.com on Sat, May 03, 2003 at 10:01:39PM -0600 X-Title: Code Maven X-Towel: Yes X-Negacore: Yes X-Authentication-Warning: localhost: juli pwned teh intarweb cc: perforce@freebsd.org Subject: Re: PERFORCE change 30435 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: Sun, 04 May 2003 04:34:25 -0000 * "M. Warner Losh" [ Date: 2003-05-03 ] [ w.r.t. Re: PERFORCE change 30435 for review ] > In message: <200305030240.h432elND072264@repoman.freebsd.org> > Juli Mallett writes: > : http://perforce.freebsd.org/chv.cgi?CH=30435 > : > : Change 30435 by jmallett@jmallett_dalek on 2003/05/02 19:40:13 > : > : Erk, remove redundant call to cp0_status_read. > : > : Affected files ... > : > : .. //depot/projects/mips/sys/mips/include/cpufunc.h#8 edit > : > : Differences ... > : > : ==== //depot/projects/mips/sys/mips/include/cpufunc.h#8 (text+ko) ==== > : > : @@ -38,7 +38,6 @@ > : { > : register_t s; > : > : - s = mips_cp0_status_read(); > : mips_cp0_status_write((s = mips_cp0_status_read()) & ~MIPS_SR_IE); > : return (s); > : } > > Sure this is really redundant and not there for some weird mips box's > pipeline delay requirements? I just forgot to dd the line after I decided to nest it. -- juli mallett. email: jmallett@freebsd.org; efnet: juli; From owner-p4-projects@FreeBSD.ORG Sat May 3 21:47:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3800037B404; Sat, 3 May 2003 21:47:07 -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 C96E037B401 for ; Sat, 3 May 2003 21:47:06 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01D6D43F3F for ; Sat, 3 May 2003 21:47:06 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.8/8.12.3) with ESMTP id h444l5A7034328; Sat, 3 May 2003 22:47:05 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 03 May 2003 22:46:39 -0600 (MDT) Message-Id: <20030503.224639.123445031.imp@bsdimp.com> To: marcel@xcllnt.net From: "M. Warner Losh" In-Reply-To: <20030504042708.GB556@dhcp01.pn.xcllnt.net> References: <200305031957.h43Jv26B068738@repoman.freebsd.org> <20030503.220619.74054358.imp@bsdimp.com> <20030504042708.GB556@dhcp01.pn.xcllnt.net> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 30474 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: Sun, 04 May 2003 04:47:08 -0000 In message: <20030504042708.GB556@dhcp01.pn.xcllnt.net> Marcel Moolenaar writes: : On Sat, May 03, 2003 at 10:06:19PM -0600, M. Warner Losh wrote: : > In message: <200305031957.h43Jv26B068738@repoman.freebsd.org> : > Marcel Moolenaar writes: : > : o I need to get my brain examined. I must be loosing it. : > : > Are you aware of the firewire hacks? : : No. Remote GDB over firewire? Yes. I'll forward you the mail. Warner