From owner-svn-src-projects@FreeBSD.ORG Sun Jan 16 00:45:06 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C6B01065670; Sun, 16 Jan 2011 00:45:06 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6BD818FC08; Sun, 16 Jan 2011 00:45:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0G0j6fs043000; Sun, 16 Jan 2011 00:45:06 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0G0j6Nx042998; Sun, 16 Jan 2011 00:45:06 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201101160045.p0G0j6Nx042998@svn.freebsd.org> From: Alexander Motin Date: Sun, 16 Jan 2011 00:45:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217467 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 00:45:06 -0000 Author: mav Date: Sun Jan 16 00:45:06 2011 New Revision: 217467 URL: http://svn.freebsd.org/changeset/base/217467 Log: Move few event logs from level 3 to level 2. Level 3 remains only for requests logging, same as in gmirror. It can be disabled as too verbose. Modified: projects/graid/head/sys/geom/raid/g_raid.c Modified: projects/graid/head/sys/geom/raid/g_raid.c ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid.c Sat Jan 15 23:31:57 2011 (r217466) +++ projects/graid/head/sys/geom/raid/g_raid.c Sun Jan 16 00:45:06 2011 (r217467) @@ -51,7 +51,7 @@ static MALLOC_DEFINE(M_RAID, "raid_data" SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, raid, CTLFLAG_RW, 0, "GEOM_RAID stuff"); -u_int g_raid_debug = 3; +u_int g_raid_debug = 2; TUNABLE_INT("kern.geom.raid.debug", &g_raid_debug); SYSCTL_UINT(_kern_geom_raid, OID_AUTO, debug, CTLFLAG_RW, &g_raid_debug, 0, "Debug level"); @@ -1186,7 +1186,7 @@ g_raid_update_volume(struct g_raid_volum sc = vol->v_softc; sx_assert(&sc->sc_lock, SX_XLOCKED); - G_RAID_DEBUG(3, "Event %s for volume %s.", + G_RAID_DEBUG(2, "Event %s for volume %s.", g_raid_volume_event2str(event), vol->v_name); switch (event) { @@ -1230,7 +1230,7 @@ g_raid_update_subdisk(struct g_raid_subd vol = sd->sd_volume; sx_assert(&sc->sc_lock, SX_XLOCKED); - G_RAID_DEBUG(3, "Event %s for subdisk %s.", + G_RAID_DEBUG(2, "Event %s for subdisk %s.", g_raid_subdisk_event2str(event), g_raid_get_subdiskname(sd)); @@ -1250,7 +1250,7 @@ g_raid_update_disk(struct g_raid_disk *d sc = disk->d_softc; sx_assert(&sc->sc_lock, SX_XLOCKED); - G_RAID_DEBUG(3, "Event %s for disk %s.", + G_RAID_DEBUG(2, "Event %s for disk %s.", g_raid_disk_event2str(event), g_raid_get_diskname(disk)); From owner-svn-src-projects@FreeBSD.ORG Sun Jan 16 22:44:42 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0C70106564A; Sun, 16 Jan 2011 22:44:42 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C03768FC13; Sun, 16 Jan 2011 22:44:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0GMigse079779; Sun, 16 Jan 2011 22:44:42 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0GMigHX079777; Sun, 16 Jan 2011 22:44:42 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201101162244.p0GMigHX079777@svn.freebsd.org> From: Dimitry Andric Date: Sun, 16 Jan 2011 22:44:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217487 - projects/binutils-2.17/gnu/usr.bin/binutils/ld X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 22:44:42 -0000 Author: dim Date: Sun Jan 16 22:44:42 2011 New Revision: 217487 URL: http://svn.freebsd.org/changeset/base/217487 Log: For ld, make sure the native emulation appears first in the list of emulations, instead of last. This gives no functional difference, but it just looks more logical, and mimics what upstream binutils does. Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile Sun Jan 16 22:11:30 2011 (r217486) +++ projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile Sun Jan 16 22:44:42 2011 (r217487) @@ -48,10 +48,9 @@ ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr x LDSCRIPTS+= ${NATIVE_EMULATION}.${ext} .endfor -EMS+= ${NATIVE_EMULATION} EMXFR= EMLST= -.for _e in ${EMS} +.for _e in ${NATIVE_EMULATION} ${EMS} EMXFR+= extern ld_emulation_xfer_type ld_${_e}_emulation; EMLST+= &ld_${_e}_emulation, .endfor From owner-svn-src-projects@FreeBSD.ORG Sun Jan 16 23:07:09 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21DB0106566B; Sun, 16 Jan 2011 23:07:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 115848FC19; Sun, 16 Jan 2011 23:07:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0GN78d0080377; Sun, 16 Jan 2011 23:07:08 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0GN780H080375; Sun, 16 Jan 2011 23:07:08 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201101162307.p0GN780H080375@svn.freebsd.org> From: Dimitry Andric Date: Sun, 16 Jan 2011 23:07:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217488 - projects/binutils-2.17/gnu/usr.bin/binutils/libbfd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 23:07:09 -0000 Author: dim Date: Sun Jan 16 23:07:08 2011 New Revision: 217488 URL: http://svn.freebsd.org/changeset/base/217488 Log: For libbfd on amd64, add not only the default i386 vector, but also all alternative 32-bit vectors (e.g. elf32_i386 and efi_app_ia32). This is needed to allow the virtualbox port on amd64 to fully link. Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Modified: projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Sun Jan 16 22:44:42 2011 (r217487) +++ projects/binutils-2.17/gnu/usr.bin/binutils/libbfd/Makefile.amd64 Sun Jan 16 23:07:08 2011 (r217488) @@ -2,8 +2,8 @@ .include "${.CURDIR}/Makefile.i386" -# Get the i386 DEFAULT_VECTOR and VECS. -I386_VECS:= ${DEFAULT_VECTOR} # ${VECS} +# Get the i386 VECS. +I386_VECS:= ${VECS} DEFAULT_VECTOR= bfd_elf64_x86_64_freebsd_vec @@ -19,7 +19,6 @@ SRCS+= elf64-x86-64.c \ VECS= ${DEFAULT_VECTOR} \ bfd_elf64_x86_64_vec \ bfd_efi_app_x86_64_vec \ - bfd_efi_app_ia32_vec \ ${I386_VECS} CLEANFILES+= pepigen.c pex64igen.c From owner-svn-src-projects@FreeBSD.ORG Mon Jan 17 18:58:28 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B686C106564A; Mon, 17 Jan 2011 18:58:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A4B5B8FC0A; Mon, 17 Jan 2011 18:58:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0HIwSdV009761; Mon, 17 Jan 2011 18:58:28 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HIwSl5009753; Mon, 17 Jan 2011 18:58:28 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201101171858.p0HIwSl5009753@svn.freebsd.org> From: Alexander Motin Date: Mon, 17 Jan 2011 18:58:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217507 - in projects/graid/head: sbin/geom/class/raid sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2011 18:58:28 -0000 Author: mav Date: Mon Jan 17 18:58:28 2011 New Revision: 217507 URL: http://svn.freebsd.org/changeset/base/217507 Log: Add FAILED disk and subdisks states. Disk falls into that state after some number of fatal I/O errors. I/O to this disk should be avoided. Same time RAID0 still can try to use it, as soon as there is no other. Disk in this state is a candidate to be replaced with spare, if present. Other option I had is to just drop failed disk out of the array, but implemented way seems more alike to what Intel MatrixRAID BIOS does. Add method to allow transformation modules claim disks as failed. Modified: projects/graid/head/sbin/geom/class/raid/geom_raid.c projects/graid/head/sys/geom/raid/g_raid.c projects/graid/head/sys/geom/raid/g_raid.h projects/graid/head/sys/geom/raid/g_raid_md_if.m projects/graid/head/sys/geom/raid/md_intel.c projects/graid/head/sys/geom/raid/tr_raid0.c projects/graid/head/sys/geom/raid/tr_raid1.c Modified: projects/graid/head/sbin/geom/class/raid/geom_raid.c ============================================================================== --- projects/graid/head/sbin/geom/class/raid/geom_raid.c Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sbin/geom/class/raid/geom_raid.c Mon Jan 17 18:58:28 2011 (r217507) @@ -65,6 +65,9 @@ struct g_command class_commands[] = { { "remove", G_FLAG_VERBOSE, NULL, G_NULL_OPTS, "[-v] name prov" }, + { "fail", G_FLAG_VERBOSE, NULL, G_NULL_OPTS, + "[-v] name prov" + }, { "stop", G_FLAG_VERBOSE, NULL, { { 'f', "force", NULL, G_TYPE_BOOL }, Modified: projects/graid/head/sys/geom/raid/g_raid.c ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid.c Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sys/geom/raid/g_raid.c Mon Jan 17 18:58:28 2011 (r217507) @@ -51,6 +51,10 @@ static MALLOC_DEFINE(M_RAID, "raid_data" SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, raid, CTLFLAG_RW, 0, "GEOM_RAID stuff"); +u_int g_raid_aggressive_spare = 0; +TUNABLE_INT("kern.geom.raid.aggressive_spare", &g_raid_aggressive_spare); +SYSCTL_UINT(_kern_geom_raid, OID_AUTO, aggressive_spare, CTLFLAG_RW, + &g_raid_aggressive_spare, 0, "Use disks without metadata as spare"); u_int g_raid_debug = 2; TUNABLE_INT("kern.geom.raid.debug", &g_raid_debug); SYSCTL_UINT(_kern_geom_raid, OID_AUTO, debug, CTLFLAG_RW, &g_raid_debug, 0, @@ -122,14 +126,18 @@ g_raid_disk_state2str(int state) switch (state) { case G_RAID_DISK_S_NONE: return ("NONE"); - case G_RAID_DISK_S_ACTIVE: - return ("ACTIVE"); - case G_RAID_DISK_S_SPARE: - return ("SPARE"); case G_RAID_DISK_S_OFFLINE: return ("OFFLINE"); + case G_RAID_DISK_S_FAILED: + return ("FAILED"); + case G_RAID_DISK_S_STALE_FAILED: + return ("STALE_FAILED"); + case G_RAID_DISK_S_SPARE: + return ("SPARE"); case G_RAID_DISK_S_STALE: return ("STALE"); + case G_RAID_DISK_S_ACTIVE: + return ("ACTIVE"); default: return ("INVALID"); } @@ -154,6 +162,8 @@ g_raid_subdisk_state2str(int state) switch (state) { case G_RAID_SUBDISK_S_NONE: return ("NONE"); + case G_RAID_SUBDISK_S_FAILED: + return ("FAILED"); case G_RAID_SUBDISK_S_NEW: return ("NEW"); case G_RAID_SUBDISK_S_STALE: @@ -1700,6 +1710,14 @@ void g_raid_write_metadata(struct g_raid G_RAID_MD_WRITE(sc->sc_md, vol, sd, disk); } +void g_raid_fail_disk(struct g_raid_softc *sc, + struct g_raid_subdisk *sd, struct g_raid_disk *disk) +{ + + if (sc->sc_md) + G_RAID_MD_FAIL_DISK(sc->sc_md, sd, disk); +} + static void g_raid_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g_consumer *cp, struct g_provider *pp) Modified: projects/graid/head/sys/geom/raid/g_raid.h ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid.h Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sys/geom/raid/g_raid.h Mon Jan 17 18:58:28 2011 (r217507) @@ -48,6 +48,7 @@ struct g_raid_tr_object; G_RAID_DEVICE_FLAG_NOFAILSYNC) #ifdef _KERNEL +extern u_int g_raid_aggressive_spare; extern u_int g_raid_debug; extern u_int g_raid_start_timeout; @@ -98,12 +99,13 @@ struct g_raid_event { int e_error; TAILQ_ENTRY(g_raid_event) e_next; }; -#define G_RAID_DISK_S_NONE 0x00 -#define G_RAID_DISK_S_ACTIVE 0x01 -#define G_RAID_DISK_S_SPARE 0x02 -#define G_RAID_DISK_S_OFFLINE 0x03 -#define G_RAID_DISK_S_STALE 0x04 -#define G_RAID_DISK_S_FAILED 0x05 +#define G_RAID_DISK_S_NONE 0x00 /* State is unknown. */ +#define G_RAID_DISK_S_OFFLINE 0x01 /* Missing disk placeholder. */ +#define G_RAID_DISK_S_FAILED 0x02 /* Failed. */ +#define G_RAID_DISK_S_STALE_FAILED 0x03 /* Old failed. */ +#define G_RAID_DISK_S_SPARE 0x04 /* Hot-spare. */ +#define G_RAID_DISK_S_STALE 0x05 /* Old disk, unused now. */ +#define G_RAID_DISK_S_ACTIVE 0x06 /* Operational. */ #define G_RAID_DISK_E_DISCONNECTED 0x01 @@ -120,14 +122,16 @@ struct g_raid_disk { }; #define G_RAID_SUBDISK_S_NONE 0x00 /* Absent. */ -#define G_RAID_SUBDISK_S_NEW 0x01 /* Blank. */ -#define G_RAID_SUBDISK_S_STALE 0x02 /* Dirty. */ -#define G_RAID_SUBDISK_S_REBUILD 0x03 /* Blank + rebuild. */ -#define G_RAID_SUBDISK_S_RESYNC 0x04 /* Dirty + check/repair. */ -#define G_RAID_SUBDISK_S_ACTIVE 0x05 /* Usable. */ +#define G_RAID_SUBDISK_S_FAILED 0x01 /* Failed. */ +#define G_RAID_SUBDISK_S_NEW 0x02 /* Blank. */ +#define G_RAID_SUBDISK_S_STALE 0x03 /* Dirty. */ +#define G_RAID_SUBDISK_S_REBUILD 0x04 /* Blank + rebuild. */ +#define G_RAID_SUBDISK_S_RESYNC 0x05 /* Dirty + check/repair. */ +#define G_RAID_SUBDISK_S_ACTIVE 0x06 /* Usable. */ #define G_RAID_SUBDISK_E_NEW 0x01 -#define G_RAID_SUBDISK_E_DISCONNECTED 0x02 +#define G_RAID_SUBDISK_E_FAILED 0x02 +#define G_RAID_SUBDISK_E_DISCONNECTED 0x03 struct g_raid_subdisk { struct g_raid_softc *sd_softc; /* Back-pointer to softc. */ @@ -310,6 +314,8 @@ void g_raid_change_volume_state(struct g void g_raid_write_metadata(struct g_raid_softc *sc, struct g_raid_volume *vol, struct g_raid_subdisk *sd, struct g_raid_disk *disk); +void g_raid_fail_disk(struct g_raid_softc *sc, + struct g_raid_subdisk *sd, struct g_raid_disk *disk); u_int g_raid_ndisks(struct g_raid_softc *sc, int state); u_int g_raid_nsubdisks(struct g_raid_volume *vol, int state); Modified: projects/graid/head/sys/geom/raid/g_raid_md_if.m ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid_md_if.m Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sys/geom/raid/g_raid_md_if.m Mon Jan 17 18:58:28 2011 (r217507) @@ -100,6 +100,13 @@ METHOD int write { struct g_raid_disk *disk; }; +# fail_disk() - mark disk as failed and remove it from use. +METHOD int fail_disk { + struct g_raid_md_object *md; + struct g_raid_subdisk *sd; + struct g_raid_disk *disk; +}; + # free_disk() - disk destructor. METHOD int free_disk { struct g_raid_md_object *md; Modified: projects/graid/head/sys/geom/raid/md_intel.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_intel.c Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sys/geom/raid/md_intel.c Mon Jan 17 18:58:28 2011 (r217507) @@ -106,10 +106,10 @@ struct intel_raid_disk { uint32_t sectors; uint32_t id; uint32_t flags; -#define INTEL_F_SPARE 0x01 -#define INTEL_F_ASSIGNED 0x02 -#define INTEL_F_DOWN 0x04 -#define INTEL_F_ONLINE 0x08 +#define INTEL_F_SPARE 0x01 +#define INTEL_F_ASSIGNED 0x02 +#define INTEL_F_FAILED 0x04 +#define INTEL_F_ONLINE 0x08 uint32_t filler[5]; } __packed; @@ -182,6 +182,7 @@ static g_raid_md_taste_t g_raid_md_taste static g_raid_md_event_t g_raid_md_event_intel; static g_raid_md_ctl_t g_raid_md_ctl_intel; static g_raid_md_write_t g_raid_md_write_intel; +static g_raid_md_fail_disk_t g_raid_md_fail_disk_intel; static g_raid_md_free_disk_t g_raid_md_free_disk_intel; static g_raid_md_free_t g_raid_md_free_intel; @@ -191,6 +192,7 @@ static kobj_method_t g_raid_md_intel_met KOBJMETHOD(g_raid_md_event, g_raid_md_event_intel), KOBJMETHOD(g_raid_md_ctl, g_raid_md_ctl_intel), KOBJMETHOD(g_raid_md_write, g_raid_md_write_intel), + KOBJMETHOD(g_raid_md_fail_disk, g_raid_md_fail_disk_intel), KOBJMETHOD(g_raid_md_free_disk, g_raid_md_free_disk_intel), KOBJMETHOD(g_raid_md_free, g_raid_md_free_intel), { 0, 0 } @@ -243,6 +245,9 @@ g_raid_md_intel_print(struct intel_raid_ struct intel_raid_map *mmap; int i, j, k; + if (g_raid_debug < 1) + return; + printf("********* ATA Intel MatrixRAID Metadata *********\n"); printf("intel_id <%.24s>\n", meta->intel_id); printf("version <%.6s>\n", meta->version); @@ -496,7 +501,10 @@ g_raid_md_intel_start_disk(struct g_raid disk_pos = intel_meta_find_disk(meta, pd->pd_disk_meta.serial); if (disk_pos < 0) { G_RAID_DEBUG(1, "Unknown, probably stale disk"); - g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); + if (pd->pd_disk_meta.flags & INTEL_F_FAILED) + g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); + else + g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE_FAILED); return; } @@ -520,7 +528,10 @@ g_raid_md_intel_start_disk(struct g_raid disk = olddisk; /* Welcome the "new" disk. */ - g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); + if (meta->disk[disk_pos].flags & INTEL_F_FAILED) + g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED); + else + g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { mvol = intel_get_volume(meta, (uintptr_t)(sd->sd_volume->v_md_data)); @@ -530,7 +541,10 @@ g_raid_md_intel_start_disk(struct g_raid else mmap1 = mmap0; - if (mvol->migr_state == 0) { + if (meta->disk[disk_pos].flags & INTEL_F_FAILED) { + g_raid_change_subdisk_state(sd, + G_RAID_SUBDISK_S_FAILED); + } else if (mvol->migr_state == 0) { if (mmap0->disk_idx[sd->sd_pos] & INTEL_DI_RBLD) { g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_NEW); @@ -918,9 +932,9 @@ g_raid_md_event_intel(struct g_raid_md_o /* Write updated metadata to all disks. */ g_raid_md_write_intel(md, NULL, NULL, NULL); - /* Check if anything left. */ - if (g_raid_ndisks(sc, G_RAID_DISK_S_NONE) == 0 && - g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) == 0) + /* Check if anything left except placeholders. */ + if (g_raid_ndisks(sc, -1) == + g_raid_ndisks(sc, G_RAID_DISK_S_OFFLINE)) g_raid_destroy_node(sc, 0); break; } @@ -934,7 +948,7 @@ g_raid_md_ctl_intel(struct g_raid_md_obj struct g_raid_softc *sc; struct g_raid_volume *vol; struct g_raid_subdisk *sd; - struct g_raid_disk *disk; + struct g_raid_disk *disk, *disk1; struct g_raid_md_intel_object *mdi; struct g_raid_md_intel_perdisk *pd; struct g_consumer *cp; @@ -944,7 +958,7 @@ g_raid_md_ctl_intel(struct g_raid_md_obj int *nargs; uint64_t size, sectorsize, strip; intmax_t *sizearg, *striparg; - int numdisks, i, len, level, qual; + int numdisks, i, len, level, qual, disk_pos; int error; sc = md->mdo_softc; @@ -1121,7 +1135,8 @@ g_raid_md_ctl_intel(struct g_raid_md_obj g_raid_md_write_intel(md, NULL, NULL, NULL); return (0); } - if (strcmp(verb, "remove") == 0) { + if (strcmp(verb, "remove") == 0 || + strcmp(verb, "fail") == 0) { if (*nargs < 2) { gctl_error(req, "Invalid number of arguments."); return (-1); @@ -1150,6 +1165,12 @@ g_raid_md_ctl_intel(struct g_raid_md_obj error = -3; break; } + + if (strcmp(verb, "fail") == 0) { + g_raid_md_fail_disk_intel(md, NULL, disk); + continue; + } + pd = (struct g_raid_md_intel_perdisk *)disk->d_md_data; /* Erase metadata on deleting disk. */ @@ -1180,9 +1201,9 @@ g_raid_md_ctl_intel(struct g_raid_md_obj /* Write updated metadata to remaining disks. */ g_raid_md_write_intel(md, NULL, NULL, NULL); - /* Check if anything left. */ - if (g_raid_ndisks(sc, G_RAID_DISK_S_NONE) == 0 && - g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) == 0) + /* Check if anything left except placeholders. */ + if (g_raid_ndisks(sc, -1) == + g_raid_ndisks(sc, G_RAID_DISK_S_OFFLINE)) g_raid_destroy_node(sc, 0); return (error); } @@ -1198,7 +1219,8 @@ g_raid_md_ctl_intel(struct g_raid_md_obj disk->d_md_data; if (pd->pd_disk_pos < 0) continue; - if (disk->d_state == G_RAID_DISK_S_OFFLINE) + if (disk->d_state == G_RAID_DISK_S_OFFLINE || + disk->d_state == G_RAID_DISK_S_FAILED) break; } if (disk == NULL) { @@ -1206,6 +1228,7 @@ g_raid_md_ctl_intel(struct g_raid_md_obj error = -2; break; } + disk_pos = pd->pd_disk_pos; /* Get disk name. */ snprintf(arg, sizeof(arg), "arg%d", i); @@ -1263,6 +1286,21 @@ g_raid_md_ctl_intel(struct g_raid_md_obj } } + /* If there is failed disk in slot - put it aside. */ + if (disk->d_state == G_RAID_DISK_S_FAILED) { + disk1 = g_raid_create_disk(sc); + disk->d_consumer->private = disk1; + disk1->d_consumer = disk->d_consumer; + disk1->d_md_data = (void *)pd; + pd->pd_disk_pos = -2; + g_raid_change_disk_state(disk, + G_RAID_DISK_S_STALE_FAILED); + + pd = malloc(sizeof(*pd), M_MD_INTEL, M_WAITOK | M_ZERO); + pd->pd_disk_pos = disk_pos; + disk->d_md_data = (void *)pd; + } + /* Read disk metadata. */ error = g_raid_md_get_label(cp, &pd->pd_disk_meta.serial[0], INTEL_SERIAL_LEN); @@ -1280,10 +1318,6 @@ g_raid_md_ctl_intel(struct g_raid_md_obj cp->private = disk; disk->d_consumer = cp; pd->pd_disk_meta.sectors = pp->mediasize / pp->sectorsize; - if (size > pp->mediasize) - size = pp->mediasize; - if (sectorsize < pp->sectorsize) - sectorsize = pp->sectorsize; pd->pd_disk_meta.id = 0; pd->pd_disk_meta.flags = INTEL_F_ASSIGNED | INTEL_F_ONLINE; @@ -1324,7 +1358,7 @@ g_raid_md_write_intel(struct g_raid_md_o sc = md->mdo_softc; mdi = (struct g_raid_md_intel_object *)md; - /* Bump generation, as written metadata may differ from previous. */ + /* Bump generation. Newly written metadata may differ from previous. */ mdi->mdio_generation++; /* Count number of disks. */ @@ -1335,13 +1369,12 @@ g_raid_md_write_intel(struct g_raid_md_o continue; numdisks++; if (disk->d_state == G_RAID_DISK_S_ACTIVE) { - pd->pd_disk_meta.flags |= INTEL_F_ASSIGNED; - pd->pd_disk_meta.flags |= INTEL_F_ONLINE; + pd->pd_disk_meta.flags = + INTEL_F_ASSIGNED | INTEL_F_ONLINE; } else if (disk->d_state == G_RAID_DISK_S_FAILED) { - pd->pd_disk_meta.flags &= ~INTEL_F_ASSIGNED; - pd->pd_disk_meta.flags |= INTEL_F_DOWN; + pd->pd_disk_meta.flags = INTEL_F_FAILED | INTEL_F_ASSIGNED; } else { - pd->pd_disk_meta.flags &= ~INTEL_F_ONLINE; + pd->pd_disk_meta.flags = INTEL_F_ASSIGNED; if (pd->pd_disk_meta.id != 0xffffffff) { pd->pd_disk_meta.id = 0xffffffff; len = strlen(pd->pd_disk_meta.serial); @@ -1490,7 +1523,8 @@ g_raid_md_write_intel(struct g_raid_md_o if (mvol->migr_state) mmap1->disk_idx[sdi] |= INTEL_DI_RBLD; } - if (sd->sd_state == G_RAID_SUBDISK_S_NONE && + if ((sd->sd_state == G_RAID_SUBDISK_S_NONE || + sd->sd_state == G_RAID_SUBDISK_S_FAILED) && mmap0->failed_disk_num == 0xff) { mmap0->failed_disk_num = sdi; if (mvol->migr_state) @@ -1524,6 +1558,52 @@ g_raid_md_write_intel(struct g_raid_md_o } static int +g_raid_md_fail_disk_intel(struct g_raid_md_object *md, + struct g_raid_subdisk *tsd, struct g_raid_disk *tdisk) +{ + struct g_raid_softc *sc; + struct g_raid_md_intel_object *mdi; + struct g_raid_md_intel_perdisk *pd; + struct g_raid_subdisk *sd; + + sc = md->mdo_softc; + mdi = (struct g_raid_md_intel_object *)md; + pd = (struct g_raid_md_intel_perdisk *)tdisk->d_md_data; + + /* We can't fail disk that is not a part of array now. */ + if (pd->pd_disk_pos < 0) + return (-1); + + /* + * Mark disk as failed in metadata and try to write that metadata + * to the disk itself to prevent it's later resurrection as STALE. + */ + mdi->mdio_meta->disk[pd->pd_disk_pos].flags = INTEL_F_FAILED; + pd->pd_disk_meta.flags = INTEL_F_FAILED; + g_raid_md_intel_print(mdi->mdio_meta); + if (tdisk->d_consumer) + intel_meta_write(tdisk->d_consumer, mdi->mdio_meta); + + /* Change states. */ + g_raid_change_disk_state(tdisk, G_RAID_DISK_S_FAILED); + TAILQ_FOREACH(sd, &tdisk->d_subdisks, sd_next) { + g_raid_change_subdisk_state(sd, + G_RAID_SUBDISK_S_FAILED); + g_raid_event_send(sd, G_RAID_SUBDISK_E_FAILED, + G_RAID_EVENT_SUBDISK); + } + + /* Write updated metadata to remaining disks. */ + g_raid_md_write_intel(md, NULL, NULL, tdisk); + + /* Check if anything left except placeholders. */ + if (g_raid_ndisks(sc, -1) == + g_raid_ndisks(sc, G_RAID_DISK_S_OFFLINE)) + g_raid_destroy_node(sc, 0); + return (0); +} + +static int g_raid_md_free_disk_intel(struct g_raid_md_object *md, struct g_raid_disk *disk) { Modified: projects/graid/head/sys/geom/raid/tr_raid0.c ============================================================================== --- projects/graid/head/sys/geom/raid/tr_raid0.c Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sys/geom/raid/tr_raid0.c Mon Jan 17 18:58:28 2011 (r217507) @@ -93,7 +93,7 @@ g_raid_tr_update_state_raid0(struct g_ra struct g_raid_tr_raid0_object *trs; struct g_raid_softc *sc; u_int s; - int n; + int n, f; sc = vol->v_softc; trs = (struct g_raid_tr_raid0_object *)vol->v_tr; @@ -101,8 +101,12 @@ g_raid_tr_update_state_raid0(struct g_ra s = G_RAID_VOLUME_S_STOPPED; else { n = g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_ACTIVE); - if (n == vol->v_disks_count) { - s = G_RAID_VOLUME_S_OPTIMAL; + f = g_raid_nsubdisks(vol, G_RAID_SUBDISK_S_FAILED); + if (n + f == vol->v_disks_count) { + if (f == 0) + s = G_RAID_VOLUME_S_OPTIMAL; + else + s = G_RAID_VOLUME_S_SUBOPTIMAL; trs->trso_starting = 0; } else if (trs->trso_starting) s = G_RAID_VOLUME_S_STARTING; @@ -134,10 +138,13 @@ g_raid_tr_event_raid0(struct g_raid_tr_o sc = vol->v_softc; if (event == G_RAID_SUBDISK_E_NEW) { state = sd->sd_state; - g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_ACTIVE); + if (state != G_RAID_SUBDISK_S_FAILED) + g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_ACTIVE); if (state != sd->sd_state && !trs->trso_starting && !trs->trso_stopped) g_raid_write_metadata(sc, vol, sd, NULL); + } else if (event == G_RAID_SUBDISK_E_FAILED) { +// g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_FAILED); } else g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_NONE); g_raid_tr_update_state_raid0(vol); Modified: projects/graid/head/sys/geom/raid/tr_raid1.c ============================================================================== --- projects/graid/head/sys/geom/raid/tr_raid1.c Mon Jan 17 17:30:35 2011 (r217506) +++ projects/graid/head/sys/geom/raid/tr_raid1.c Mon Jan 17 18:58:28 2011 (r217507) @@ -133,6 +133,8 @@ g_raid_tr_event_raid1(struct g_raid_tr_o vol = tr->tro_volume; if (event == G_RAID_SUBDISK_E_NEW) { // g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_ACTIVE); + } else if (event == G_RAID_SUBDISK_E_FAILED) { +// g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_FAILED); } else g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_NONE); g_raid_tr_update_state_raid1(vol); From owner-svn-src-projects@FreeBSD.ORG Mon Jan 17 19:53:24 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28F011065672; Mon, 17 Jan 2011 19:53:24 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1977F8FC1A; Mon, 17 Jan 2011 19:53:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0HJrN0f011051; Mon, 17 Jan 2011 19:53:23 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HJrNAD011049; Mon, 17 Jan 2011 19:53:23 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201101171953.p0HJrNAD011049@svn.freebsd.org> From: Peter Holm Date: Mon, 17 Jan 2011 19:53:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217510 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2011 19:53:24 -0000 Author: pho Date: Mon Jan 17 19:53:23 2011 New Revision: 217510 URL: http://svn.freebsd.org/changeset/base/217510 Log: Deleted unused devfs_xxx_cdevpriv() test scenario and made the fpclone.sh scenario work again. Deleted: projects/stress2/misc/cdevsw.sh Modified: projects/stress2/misc/fpclone.sh Modified: projects/stress2/misc/fpclone.sh ============================================================================== --- projects/stress2/misc/fpclone.sh Mon Jan 17 19:31:34 2011 (r217509) +++ projects/stress2/misc/fpclone.sh Mon Jan 17 19:53:23 2011 (r217510) @@ -30,7 +30,7 @@ # Test scenario by kib@freebsd.org -# Test of +# Test of patch for Giant trick in cdevsw [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 @@ -58,7 +58,7 @@ for i in `jot 10`; do done export runRUNTIME=2m -cd /home/pho/stress2; ./run.sh pty.cfg +cd ..; ./run.sh pty.cfg for i in `jot 10`; do wait @@ -80,13 +80,6 @@ EOF2 #include #include -typedef void (*cdevpriv_dtr_t)(void *data); -int devfs_get_cdevpriv(void **datap); -int devfs_set_cdevpriv(void *priv, cdevpriv_dtr_t dtr); -void devfs_clear_cdevpriv(void); -void devfs_fpdrop(struct file *fp); /* XXX This is not public KPI */ - - static d_open_t fpclone_open; static d_close_t fpclone_close; static d_read_t fpclone_read; From owner-svn-src-projects@FreeBSD.ORG Tue Jan 18 04:13:46 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA9E0106566B; Tue, 18 Jan 2011 04:13:46 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C9A048FC13; Tue, 18 Jan 2011 04:13:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0I4DktR023793; Tue, 18 Jan 2011 04:13:46 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0I4DkwG023790; Tue, 18 Jan 2011 04:13:46 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201101180413.p0I4DkwG023790@svn.freebsd.org> From: Jeff Roberson Date: Tue, 18 Jan 2011 04:13:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217528 - in projects/ofed/head/sys: amd64/include i386/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 04:13:46 -0000 Author: jeff Date: Tue Jan 18 04:13:46 2011 New Revision: 217528 URL: http://svn.freebsd.org/changeset/base/217528 Log: - Fix the type of constants shifted by more than 32. Modified: projects/ofed/head/sys/amd64/include/endian.h projects/ofed/head/sys/i386/include/endian.h Modified: projects/ofed/head/sys/amd64/include/endian.h ============================================================================== --- projects/ofed/head/sys/amd64/include/endian.h Tue Jan 18 01:20:15 2011 (r217527) +++ projects/ofed/head/sys/amd64/include/endian.h Tue Jan 18 04:13:46 2011 (r217528) @@ -102,9 +102,9 @@ __byte_swap_long_var(__uint64_t x) (((__uint64_t)x >> 40) & 0xff00) | \ (((__uint64_t)x >> 24) & 0xff0000) | \ (((__uint64_t)x >> 8) & 0xff000000) | \ - (((__uint64_t)x << 8) & (0xfful << 32)) | \ - (((__uint64_t)x << 24) & (0xfful << 40)) | \ - (((__uint64_t)x << 40) & (0xfful << 48)) | \ + (((__uint64_t)x << 8) & (0xffull << 32)) | \ + (((__uint64_t)x << 24) & (0xffull << 40)) | \ + (((__uint64_t)x << 40) & (0xffull << 48)) | \ (((__uint64_t)x << 56)))) #define __bswap64(x) (__builtin_constant_p(x) ? \ Modified: projects/ofed/head/sys/i386/include/endian.h ============================================================================== --- projects/ofed/head/sys/i386/include/endian.h Tue Jan 18 01:20:15 2011 (r217527) +++ projects/ofed/head/sys/i386/include/endian.h Tue Jan 18 04:13:46 2011 (r217528) @@ -92,9 +92,9 @@ __byte_swap_int_var(__uint32_t x) (((__uint64_t)x >> 40) & 0xff00) | \ (((__uint64_t)x >> 24) & 0xff0000) | \ (((__uint64_t)x >> 8) & 0xff000000) | \ - (((__uint64_t)x << 8) & (0xfful << 32)) | \ - (((__uint64_t)x << 24) & (0xfful << 40)) | \ - (((__uint64_t)x << 40) & (0xfful << 48)) | \ + (((__uint64_t)x << 8) & (0xffull << 32)) | \ + (((__uint64_t)x << 24) & (0xffull << 40)) | \ + (((__uint64_t)x << 40) & (0xffull << 48)) | \ (((__uint64_t)x << 56)))) #define __bswap64(x) __byte_swap_64_const(x) From owner-svn-src-projects@FreeBSD.ORG Tue Jan 18 17:35:34 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB420106564A; Tue, 18 Jan 2011 17:35:34 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 996718FC0C; Tue, 18 Jan 2011 17:35:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IHZYSd045729; Tue, 18 Jan 2011 17:35:34 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IHZYEc045727; Tue, 18 Jan 2011 17:35:34 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201101181735.p0IHZYEc045727@svn.freebsd.org> From: Alexander Motin Date: Tue, 18 Jan 2011 17:35:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217546 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 17:35:34 -0000 Author: mav Date: Tue Jan 18 17:35:34 2011 New Revision: 217546 URL: http://svn.freebsd.org/changeset/base/217546 Log: Make g_raid_md_intel_start_disk() a single entry point for any new disk. Make it replace FAILED or OFFLINE disks with new ones. Together with other changes this allows to use STALE and potentially SPARE disks to refill array after ACTIVE disk failure or unplug/disappearance. Remake `graid insert` to also use this function. Modified: projects/graid/head/sys/geom/raid/md_intel.c Modified: projects/graid/head/sys/geom/raid/md_intel.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_intel.c Tue Jan 18 17:08:27 2011 (r217545) +++ projects/graid/head/sys/geom/raid/md_intel.c Tue Jan 18 17:35:34 2011 (r217546) @@ -477,11 +477,11 @@ g_raid_md_intel_get_volume(struct g_raid return (mvol); } -static void +static int g_raid_md_intel_start_disk(struct g_raid_disk *disk) { struct g_raid_softc *sc; - struct g_raid_subdisk *sd; + struct g_raid_subdisk *sd, *tmpsd; struct g_raid_disk *olddisk; struct g_raid_md_object *md; struct g_raid_md_intel_object *mdi; @@ -489,46 +489,90 @@ g_raid_md_intel_start_disk(struct g_raid struct intel_raid_conf *meta; struct intel_raid_vol *mvol; struct intel_raid_map *mmap0, *mmap1; - int disk_pos; + int disk_pos, resurrection = 0; sc = disk->d_softc; md = sc->sc_md; mdi = (struct g_raid_md_intel_object *)md; meta = mdi->mdio_meta; pd = (struct g_raid_md_intel_perdisk *)disk->d_md_data; + olddisk = NULL; /* Find disk position in metadata by it's serial. */ disk_pos = intel_meta_find_disk(meta, pd->pd_disk_meta.serial); if (disk_pos < 0) { - G_RAID_DEBUG(1, "Unknown, probably stale disk"); - if (pd->pd_disk_meta.flags & INTEL_F_FAILED) - g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); - else + G_RAID_DEBUG(1, "Unknown, probably new or stale disk"); + /* Failed stale disk is useless for us. */ + if (pd->pd_disk_meta.flags & INTEL_F_FAILED) { g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE_FAILED); - return; + return (0); + } + /* If we are in the start process, that's all for now. */ + if (!mdi->mdio_started) { + g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); + return (0); + } + /* If we have already started - try to get use of the disk. */ + TAILQ_FOREACH(olddisk, &sc->sc_disks, d_next) { + if (olddisk->d_state != G_RAID_DISK_S_OFFLINE && + olddisk->d_state != G_RAID_DISK_S_FAILED) + continue; + /* Make sure this disk is big enough. */ + TAILQ_FOREACH(sd, &olddisk->d_subdisks, sd_next) { + if (sd->sd_offset + sd->sd_size + 4096 > + pd->pd_disk_meta.sectors * 512) { + continue; + } + } + break; + } + if (olddisk == NULL) { + g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); + return (0); + } + oldpd = (struct g_raid_md_intel_perdisk *)olddisk->d_md_data; + disk_pos = oldpd->pd_disk_pos; + resurrection = 1; } - /* Find placeholder by position. */ - olddisk = g_raid_md_intel_get_disk(sc, disk_pos); - if (olddisk == NULL) - panic("No disk at position %d!", disk_pos); - if (olddisk->d_state != G_RAID_DISK_S_OFFLINE) { - G_RAID_DEBUG(1, "More then one disk for pos %d", disk_pos); - return; - } - oldpd = (struct g_raid_md_intel_perdisk *)olddisk->d_md_data; - - /* Merge real disk and placeholder and destroy one of them. */ - disk->d_consumer->private = olddisk; - olddisk->d_consumer = disk->d_consumer; - disk->d_consumer = NULL; - oldpd->pd_meta = pd->pd_meta; - pd->pd_meta = NULL; - g_raid_destroy_disk(disk); - disk = olddisk; + if (olddisk == NULL) { + /* Find placeholder by position. */ + olddisk = g_raid_md_intel_get_disk(sc, disk_pos); + if (olddisk == NULL) + panic("No disk at position %d!", disk_pos); + if (olddisk->d_state != G_RAID_DISK_S_OFFLINE) { + G_RAID_DEBUG(1, "More then one disk for pos %d", + disk_pos); + g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); + return (0); + } + oldpd = (struct g_raid_md_intel_perdisk *)olddisk->d_md_data; + } - /* Welcome the "new" disk. */ - if (meta->disk[disk_pos].flags & INTEL_F_FAILED) + /* Replace failed disk or placeholder with new disk. */ + TAILQ_FOREACH_SAFE(sd, &olddisk->d_subdisks, sd_next, tmpsd) { + TAILQ_REMOVE(&olddisk->d_subdisks, sd, sd_next); + TAILQ_INSERT_TAIL(&disk->d_subdisks, sd, sd_next); + sd->sd_disk = disk; + oldpd->pd_disk_pos = -2; + pd->pd_disk_pos = disk_pos; + } + + /* If it was placeholder -- destroy it. */ + if (olddisk->d_state == G_RAID_DISK_S_OFFLINE) { + g_raid_destroy_disk(olddisk); + } else { + /* Otherwise, make it STALE_FAILED. */ + g_raid_change_disk_state(olddisk, G_RAID_DISK_S_STALE_FAILED); + /* Update global metadata just in case. */ + memcpy(&meta->disk[disk_pos], &pd->pd_disk_meta, + sizeof(struct intel_raid_disk)); + } + + /* Welcome the new disk. */ + if (resurrection) + g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); + else if (meta->disk[disk_pos].flags & INTEL_F_FAILED) g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED); else g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); @@ -541,7 +585,10 @@ g_raid_md_intel_start_disk(struct g_raid else mmap1 = mmap0; - if (meta->disk[disk_pos].flags & INTEL_F_FAILED) { + if (resurrection) { + g_raid_change_subdisk_state(sd, + G_RAID_SUBDISK_S_NEW); + } else if (meta->disk[disk_pos].flags & INTEL_F_FAILED) { g_raid_change_subdisk_state(sd, G_RAID_SUBDISK_S_FAILED); } else if (mvol->migr_state == 0) { @@ -580,6 +627,54 @@ g_raid_md_intel_start_disk(struct g_raid g_raid_event_send(sd, G_RAID_SUBDISK_E_NEW, G_RAID_EVENT_SUBDISK); } + return (resurrection); +} + +static void +g_raid_md_intel_refill(struct g_raid_softc *sc) +{ + struct g_raid_md_object *md; + struct g_raid_md_intel_object *mdi; + struct intel_raid_conf *meta; + struct g_raid_disk *disk; + int update; + + md = sc->sc_md; + mdi = (struct g_raid_md_intel_object *)md; + meta = mdi->mdio_meta; + update = 0; + do { + /* Make sure we miss anything. */ + if (g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) == + meta->total_disks) + break; + + G_RAID_DEBUG(1, "Array is not complete. trying to refill."); + + /* Try to get use some of STALE disks. */ + TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { + if (disk->d_state == G_RAID_DISK_S_STALE) { + update += g_raid_md_intel_start_disk(disk); + if (disk->d_state == G_RAID_DISK_S_ACTIVE) + break; + } + } + if (disk != NULL) + continue; + + /* Try to get use some of SPARE disks. */ + TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { + if (disk->d_state == G_RAID_DISK_S_SPARE) { + update += g_raid_md_intel_start_disk(disk); + if (disk->d_state == G_RAID_DISK_S_ACTIVE) + break; + } + } + } while (disk != NULL); + + /* Write new metadata if we changed something. */ + if (update) + g_raid_md_write_intel(md, NULL, NULL, NULL); } static void @@ -593,7 +688,7 @@ g_raid_md_intel_start(struct g_raid_soft struct intel_raid_map *mmap; struct g_raid_volume *vol; struct g_raid_subdisk *sd; - struct g_raid_disk *disk, *tmpdisk; + struct g_raid_disk *disk; int i, j, disk_pos; md = sc->sc_md; @@ -654,13 +749,21 @@ g_raid_md_intel_start(struct g_raid_soft } } - /* Make existing disks take their places. */ - TAILQ_FOREACH_SAFE(disk, &sc->sc_disks, d_next, tmpdisk) { - if (disk->d_state == G_RAID_DISK_S_NONE) - g_raid_md_intel_start_disk(disk); - } + /* Make all disks found till the moment take their places. */ + do { + TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { + if (disk->d_state == G_RAID_DISK_S_NONE) { + g_raid_md_intel_start_disk(disk); + break; + } + } + } while (disk != NULL); mdi->mdio_started = 1; + + /* Pickup any STALE/SPARE disks to refill array if needed. */ + g_raid_md_intel_refill(sc); + callout_stop(&mdi->mdio_start_co); G_RAID_DEBUG(1, "root_mount_rel %p", mdi->mdio_rootmount); root_mount_rel(mdi->mdio_rootmount); @@ -683,7 +786,8 @@ g_raid_md_intel_new_disk(struct g_raid_d pdmeta = pd->pd_meta; if (mdi->mdio_started) { - g_raid_md_intel_start_disk(disk); + if (g_raid_md_intel_start_disk(disk)) + g_raid_md_write_intel(md, NULL, NULL, NULL); } else { /* If we haven't started yet - check metadata freshness. */ if (mdi->mdio_meta == NULL || @@ -932,6 +1036,9 @@ g_raid_md_event_intel(struct g_raid_md_o /* Write updated metadata to all disks. */ g_raid_md_write_intel(md, NULL, NULL, NULL); + /* Pickup any STALE/SPARE disks to refill array if needed. */ + g_raid_md_intel_refill(sc); + /* Check if anything left except placeholders. */ if (g_raid_ndisks(sc, -1) == g_raid_ndisks(sc, G_RAID_DISK_S_OFFLINE)) @@ -948,17 +1055,17 @@ g_raid_md_ctl_intel(struct g_raid_md_obj struct g_raid_softc *sc; struct g_raid_volume *vol; struct g_raid_subdisk *sd; - struct g_raid_disk *disk, *disk1; + struct g_raid_disk *disk; struct g_raid_md_intel_object *mdi; struct g_raid_md_intel_perdisk *pd; struct g_consumer *cp; struct g_provider *pp; - char arg[16]; + char arg[16], serial[INTEL_SERIAL_LEN]; const char *verb, *volname, *levelname, *diskname; int *nargs; uint64_t size, sectorsize, strip; intmax_t *sizearg, *striparg; - int numdisks, i, len, level, qual, disk_pos; + int numdisks, i, len, level, qual, update; int error; sc = md->mdo_softc; @@ -1201,6 +1308,9 @@ g_raid_md_ctl_intel(struct g_raid_md_obj /* Write updated metadata to remaining disks. */ g_raid_md_write_intel(md, NULL, NULL, NULL); + /* Pickup any STALE/SPARE disks to refill array if needed. */ + g_raid_md_intel_refill(sc); + /* Check if anything left except placeholders. */ if (g_raid_ndisks(sc, -1) == g_raid_ndisks(sc, G_RAID_DISK_S_OFFLINE)) @@ -1212,24 +1322,8 @@ g_raid_md_ctl_intel(struct g_raid_md_obj gctl_error(req, "Invalid number of arguments."); return (-1); } + update = 0; for (i = 1; i < *nargs; i++) { - /* Look for empty disk slot. */ - TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { - pd = (struct g_raid_md_intel_perdisk *) - disk->d_md_data; - if (pd->pd_disk_pos < 0) - continue; - if (disk->d_state == G_RAID_DISK_S_OFFLINE || - disk->d_state == G_RAID_DISK_S_FAILED) - break; - } - if (disk == NULL) { - gctl_error(req, "No missing disks."); - error = -2; - break; - } - disk_pos = pd->pd_disk_pos; - /* Get disk name. */ snprintf(arg, sizeof(arg), "arg%d", i); diskname = gctl_get_asciiparam(req, arg); @@ -1271,39 +1365,9 @@ g_raid_md_ctl_intel(struct g_raid_md_obj } g_topology_unlock(); - /* Make sure disk is big enough. */ - TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { - if (sd->sd_offset + sd->sd_size + 4096 > - pp->mediasize) { - gctl_error(req, - "Disk '%s' too small.", - diskname); - g_topology_lock(); - g_raid_kill_consumer(sc, cp); - g_topology_unlock(); - error = -7; - break; - } - } - - /* If there is failed disk in slot - put it aside. */ - if (disk->d_state == G_RAID_DISK_S_FAILED) { - disk1 = g_raid_create_disk(sc); - disk->d_consumer->private = disk1; - disk1->d_consumer = disk->d_consumer; - disk1->d_md_data = (void *)pd; - pd->pd_disk_pos = -2; - g_raid_change_disk_state(disk, - G_RAID_DISK_S_STALE_FAILED); - - pd = malloc(sizeof(*pd), M_MD_INTEL, M_WAITOK | M_ZERO); - pd->pd_disk_pos = disk_pos; - disk->d_md_data = (void *)pd; - } - - /* Read disk metadata. */ + /* Read disk serial. */ error = g_raid_md_get_label(cp, - &pd->pd_disk_meta.serial[0], INTEL_SERIAL_LEN); + &serial[0], INTEL_SERIAL_LEN); if (error != 0) { gctl_error(req, "Can't get serial for provider '%s'.", @@ -1311,28 +1375,39 @@ g_raid_md_ctl_intel(struct g_raid_md_obj g_topology_lock(); g_raid_kill_consumer(sc, cp); g_topology_unlock(); - error = -8; + error = -7; break; } - cp->private = disk; + pd = malloc(sizeof(*pd), M_MD_INTEL, M_WAITOK | M_ZERO); + pd->pd_disk_pos = -1; + + disk = g_raid_create_disk(sc); disk->d_consumer = cp; + disk->d_consumer->private = disk; + disk->d_md_data = (void *)pd; + cp->private = disk; + + memcpy(&pd->pd_disk_meta.serial[0], &serial[0], + INTEL_SERIAL_LEN); pd->pd_disk_meta.sectors = pp->mediasize / pp->sectorsize; pd->pd_disk_meta.id = 0; pd->pd_disk_meta.flags = INTEL_F_ASSIGNED | INTEL_F_ONLINE; /* Welcome the "new" disk. */ - g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); - TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { - g_raid_change_subdisk_state(sd, - G_RAID_SUBDISK_S_NEW); - g_raid_event_send(sd, G_RAID_SUBDISK_E_NEW, - G_RAID_EVENT_SUBDISK); + update += g_raid_md_intel_start_disk(disk); + if (disk->d_state != G_RAID_DISK_S_ACTIVE) { + gctl_error(req, "Disk '%s' doesn't fit.", + diskname); + g_raid_destroy_disk(disk); + error = -8; + break; } } - /* Write updated metadata to all disks. */ - g_raid_md_write_intel(md, NULL, NULL, NULL); + /* Write new metadata if we changed something. */ + if (update) + g_raid_md_write_intel(md, NULL, NULL, NULL); return (error); } return (-100); @@ -1596,6 +1671,9 @@ g_raid_md_fail_disk_intel(struct g_raid_ /* Write updated metadata to remaining disks. */ g_raid_md_write_intel(md, NULL, NULL, tdisk); + /* Pickup any STALE/SPARE disks to refill array if needed. */ + g_raid_md_intel_refill(sc); + /* Check if anything left except placeholders. */ if (g_raid_ndisks(sc, -1) == g_raid_ndisks(sc, G_RAID_DISK_S_OFFLINE)) From owner-svn-src-projects@FreeBSD.ORG Tue Jan 18 23:35:09 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD804106566B; Tue, 18 Jan 2011 23:35:08 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC1328FC12; Tue, 18 Jan 2011 23:35:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0INZ8UM055832; Tue, 18 Jan 2011 23:35:08 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0INZ8VT055829; Tue, 18 Jan 2011 23:35:08 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201101182335.p0INZ8VT055829@svn.freebsd.org> From: Alexander Motin Date: Tue, 18 Jan 2011 23:35:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217565 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 23:35:09 -0000 Author: mav Date: Tue Jan 18 23:35:08 2011 New Revision: 217565 URL: http://svn.freebsd.org/changeset/base/217565 Log: Add spare disks support. Disk counted as spare if it's metadata tells so, or if kern.geom.raid.aggressive_spare sysctl/tunable is set, disk connected to Intel controller and has no Intel metadata. Disks marked as spare by `graid insert ...`, when array is already full. Unluckily, as soon as Intel treats spare disks as "global spare", they can't be seen via `graid list/status` at this moment, because they do not belong to any node/array and opened only when needed. Modified: projects/graid/head/sys/geom/raid/g_raid.h projects/graid/head/sys/geom/raid/md_intel.c Modified: projects/graid/head/sys/geom/raid/g_raid.h ============================================================================== --- projects/graid/head/sys/geom/raid/g_raid.h Tue Jan 18 23:00:22 2011 (r217564) +++ projects/graid/head/sys/geom/raid/g_raid.h Tue Jan 18 23:35:08 2011 (r217565) @@ -51,6 +51,7 @@ struct g_raid_tr_object; extern u_int g_raid_aggressive_spare; extern u_int g_raid_debug; extern u_int g_raid_start_timeout; +extern struct g_class g_raid_class; #define G_RAID_DEBUG(lvl, fmt, ...) do { \ if (g_raid_debug >= (lvl)) { \ Modified: projects/graid/head/sys/geom/raid/md_intel.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_intel.c Tue Jan 18 23:00:22 2011 (r217564) +++ projects/graid/head/sys/geom/raid/md_intel.c Tue Jan 18 23:35:08 2011 (r217565) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "geom/raid/g_raid.h" #include "g_raid_md_if.h" @@ -174,6 +175,7 @@ struct g_raid_md_intel_object { struct callout mdio_start_co; /* STARTING state timer. */ int mdio_disks_present; int mdio_started; + int mdio_incomplete; struct root_hold_token *mdio_rootmount; /* Root mount delay token. */ }; @@ -451,6 +453,27 @@ intel_meta_erase(struct g_consumer *cp) return (error); } +static int +intel_meta_write_spare(struct g_consumer *cp, struct intel_raid_disk *d) +{ + struct intel_raid_conf *meta; + int error; + + /* Fill anchor and single disk. */ + meta = malloc(INTEL_MAX_MD_SIZE(1), M_MD_INTEL, M_WAITOK | M_ZERO); + memcpy(&meta->intel_id[0], INTEL_MAGIC, sizeof(INTEL_MAGIC)); + memcpy(&meta->version[0], INTEL_VERSION_1000, + sizeof(INTEL_VERSION_1000)); + meta->config_size = INTEL_MAX_MD_SIZE(1); + meta->config_id = arc4random(); + meta->generation = 1; + meta->total_disks = 1; + meta->disk[0] = *d; + error = intel_meta_write(cp, meta); + free(meta, M_MD_INTEL); + return (error); +} + static struct g_raid_disk * g_raid_md_intel_get_disk(struct g_raid_softc *sc, int id) { @@ -508,10 +531,8 @@ g_raid_md_intel_start_disk(struct g_raid return (0); } /* If we are in the start process, that's all for now. */ - if (!mdi->mdio_started) { - g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); - return (0); - } + if (!mdi->mdio_started) + goto nofit; /* If we have already started - try to get use of the disk. */ TAILQ_FOREACH(olddisk, &sc->sc_disks, d_next) { if (olddisk->d_state != G_RAID_DISK_S_OFFLINE && @@ -520,15 +541,31 @@ g_raid_md_intel_start_disk(struct g_raid /* Make sure this disk is big enough. */ TAILQ_FOREACH(sd, &olddisk->d_subdisks, sd_next) { if (sd->sd_offset + sd->sd_size + 4096 > - pd->pd_disk_meta.sectors * 512) { - continue; + (uint64_t)pd->pd_disk_meta.sectors * 512) { + G_RAID_DEBUG(1, + "Disk too small (%llu < %llu)", + ((unsigned long long) + pd->pd_disk_meta.sectors) * 512, + (unsigned long long) + sd->sd_offset + sd->sd_size + 4096); + break; } } + if (sd != NULL) + continue; break; } if (olddisk == NULL) { - g_raid_change_disk_state(disk, G_RAID_DISK_S_STALE); - return (0); +nofit: + if (pd->pd_disk_meta.flags & INTEL_F_SPARE) { + g_raid_change_disk_state(disk, + G_RAID_DISK_S_SPARE); + return (1); + } else { + g_raid_change_disk_state(disk, + G_RAID_DISK_S_STALE); + return (0); + } } oldpd = (struct g_raid_md_intel_perdisk *)olddisk->d_md_data; disk_pos = oldpd->pd_disk_pos; @@ -574,6 +611,8 @@ g_raid_md_intel_start_disk(struct g_raid g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); else if (meta->disk[disk_pos].flags & INTEL_F_FAILED) g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED); + else if (meta->disk[disk_pos].flags & INTEL_F_SPARE) + g_raid_change_disk_state(disk, G_RAID_DISK_S_SPARE); else g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE); TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) { @@ -627,16 +666,34 @@ g_raid_md_intel_start_disk(struct g_raid g_raid_event_send(sd, G_RAID_SUBDISK_E_NEW, G_RAID_EVENT_SUBDISK); } + + /* Update status of our need for spare. */ + if (mdi->mdio_started) { + mdi->mdio_incomplete = + (g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) < + meta->total_disks); + } + return (resurrection); } static void +g_disk_md_intel_retaste(void *arg, int pending) +{ + + G_RAID_DEBUG(1, "Array is not complete, trying to retaste."); + g_retaste(&g_raid_class); + free(arg, M_MD_INTEL); +} + +static void g_raid_md_intel_refill(struct g_raid_softc *sc) { struct g_raid_md_object *md; struct g_raid_md_intel_object *mdi; struct intel_raid_conf *meta; struct g_raid_disk *disk; + struct task *task; int update; md = sc->sc_md; @@ -649,7 +706,7 @@ g_raid_md_intel_refill(struct g_raid_sof meta->total_disks) break; - G_RAID_DEBUG(1, "Array is not complete. trying to refill."); + G_RAID_DEBUG(1, "Array is not complete, trying to refill."); /* Try to get use some of STALE disks. */ TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { @@ -675,6 +732,18 @@ g_raid_md_intel_refill(struct g_raid_sof /* Write new metadata if we changed something. */ if (update) g_raid_md_write_intel(md, NULL, NULL, NULL); + + /* Update status of our need for spare. */ + mdi->mdio_incomplete = (g_raid_ndisks(sc, G_RAID_DISK_S_ACTIVE) < + meta->total_disks); + + /* Request retaste hoping to find spare. */ + if (mdi->mdio_incomplete) { + task = malloc(sizeof(struct task), + M_MD_INTEL, M_WAITOK | M_ZERO); + TASK_INIT(task, 0, g_disk_md_intel_retaste, task); + taskqueue_enqueue(taskqueue_swi, task); + } } static void @@ -889,9 +958,10 @@ g_raid_md_taste_intel(struct g_raid_md_o struct intel_raid_conf *meta; struct g_raid_md_intel_perdisk *pd; struct g_geom *geom; - int error, disk_pos, result; + int error, disk_pos, result, spare, len; char serial[INTEL_SERIAL_LEN]; char name[16]; + uint16_t vendor; G_RAID_DEBUG(1, "Tasting Intel on %s", cp->provider->name); mdi = (struct g_raid_md_intel_object *)md; @@ -899,6 +969,9 @@ g_raid_md_taste_intel(struct g_raid_md_o /* Read metadata from device. */ meta = NULL; + spare = 0; + vendor = 0xffff; + disk_pos = 0; if (g_access(cp, 1, 0, 0) != 0) return (G_RAID_MD_TASTE_FAIL); g_topology_unlock(); @@ -908,11 +981,27 @@ g_raid_md_taste_intel(struct g_raid_md_o pp->name, error); goto fail2; } + len = 2; + if (pp->geom->rank == 1) + g_io_getattr("GEOM::hba_vendor", cp, &len, &vendor); meta = intel_meta_read(cp); g_topology_lock(); g_access(cp, -1, 0, 0); - if (meta == NULL) + if (meta == NULL) { + if (g_raid_aggressive_spare) { + if (vendor == 0x8086) { + G_RAID_DEBUG(1, + "No Intel metadata, forcing spare."); + spare = 2; + goto search; + } else { + G_RAID_DEBUG(1, + "Intel vendor mismatch 0x%04x != 0x8086", + vendor); + } + } return (G_RAID_MD_TASTE_FAIL); + } /* Check this disk position in obtained metadata. */ disk_pos = intel_meta_find_disk(meta, serial); @@ -931,7 +1020,9 @@ g_raid_md_taste_intel(struct g_raid_md_o /* Metadata valid. Print it. */ g_raid_md_intel_print(meta); G_RAID_DEBUG(1, "Intel disk position %d", disk_pos); + spare = meta->disk[disk_pos].flags & INTEL_F_SPARE; +search: /* Search for matching node. */ sc = NULL; mdi1 = NULL; @@ -944,9 +1035,13 @@ g_raid_md_taste_intel(struct g_raid_md_o if (sc->sc_md->mdo_class != md->mdo_class) continue; mdi1 = (struct g_raid_md_intel_object *)sc->sc_md; - if (mdi1->mdio_config_id != meta->config_id) - continue; - break; + if (spare) { + if (mdi1->mdio_incomplete) + break; + } else { + if (mdi1->mdio_config_id == meta->config_id) + break; + } } /* Found matching node. */ @@ -954,7 +1049,11 @@ g_raid_md_taste_intel(struct g_raid_md_o G_RAID_DEBUG(1, "Found matching node %s", sc->sc_name); result = G_RAID_MD_TASTE_EXISTING; - } else { /* Not found matching node. */ + } else if (spare) { /* Not found needy node -- left for later. */ + G_RAID_DEBUG(1, "Spare is not needed at this time"); + goto fail1; + + } else { /* Not found matching node -- create one. */ result = G_RAID_MD_TASTE_NEW; mdi->mdio_config_id = meta->config_id; snprintf(name, sizeof(name), "Intel-%08x", meta->config_id); @@ -980,7 +1079,14 @@ g_raid_md_taste_intel(struct g_raid_md_o pd = malloc(sizeof(*pd), M_MD_INTEL, M_WAITOK | M_ZERO); pd->pd_meta = meta; pd->pd_disk_pos = -1; - pd->pd_disk_meta = meta->disk[disk_pos]; + if (spare == 2) { + memcpy(&pd->pd_disk_meta.serial[0], serial, INTEL_SERIAL_LEN); + pd->pd_disk_meta.sectors = pp->mediasize / pp->sectorsize; + pd->pd_disk_meta.id = 0; + pd->pd_disk_meta.flags = INTEL_F_SPARE; + } else { + pd->pd_disk_meta = meta->disk[disk_pos]; + } disk = g_raid_create_disk(sc); disk->d_md_data = (void *)pd; disk->d_consumer = rcp; @@ -1392,11 +1498,14 @@ g_raid_md_ctl_intel(struct g_raid_md_obj INTEL_SERIAL_LEN); pd->pd_disk_meta.sectors = pp->mediasize / pp->sectorsize; pd->pd_disk_meta.id = 0; - pd->pd_disk_meta.flags = INTEL_F_ASSIGNED | INTEL_F_ONLINE; + pd->pd_disk_meta.flags = INTEL_F_SPARE; /* Welcome the "new" disk. */ update += g_raid_md_intel_start_disk(disk); - if (disk->d_state != G_RAID_DISK_S_ACTIVE) { + if (disk->d_state == G_RAID_DISK_S_SPARE) { + intel_meta_write_spare(cp, &pd->pd_disk_meta); + g_raid_destroy_disk(disk); + } else if (disk->d_state != G_RAID_DISK_S_ACTIVE) { gctl_error(req, "Disk '%s' doesn't fit.", diskname); g_raid_destroy_disk(disk); @@ -1445,7 +1554,7 @@ g_raid_md_write_intel(struct g_raid_md_o numdisks++; if (disk->d_state == G_RAID_DISK_S_ACTIVE) { pd->pd_disk_meta.flags = - INTEL_F_ASSIGNED | INTEL_F_ONLINE; + INTEL_F_ONLINE | INTEL_F_ASSIGNED; } else if (disk->d_state == G_RAID_DISK_S_FAILED) { pd->pd_disk_meta.flags = INTEL_F_FAILED | INTEL_F_ASSIGNED; } else { From owner-svn-src-projects@FreeBSD.ORG Wed Jan 19 09:47:21 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 392A5106566B; Wed, 19 Jan 2011 09:47:21 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E40B28FC0A; Wed, 19 Jan 2011 09:47:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0J9lKWb070594; Wed, 19 Jan 2011 09:47:20 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0J9lKnl070570; Wed, 19 Jan 2011 09:47:20 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201101190947.p0J9lKnl070570@svn.freebsd.org> From: Peter Holm Date: Wed, 19 Jan 2011 09:47:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217575 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2011 09:47:21 -0000 Author: pho Date: Wed Jan 19 09:47:20 2011 New Revision: 217575 URL: http://svn.freebsd.org/changeset/base/217575 Log: Changed full path references to relative. Modified: projects/stress2/misc/lookup_shared.sh projects/stress2/misc/md2.sh projects/stress2/misc/md3.sh projects/stress2/misc/mountro.sh projects/stress2/misc/newfs.sh projects/stress2/misc/newfs2.sh projects/stress2/misc/newfs3.sh projects/stress2/misc/nfs.sh projects/stress2/misc/nfs2.sh projects/stress2/misc/nfs5.sh projects/stress2/misc/nfs6.sh projects/stress2/misc/nfsrename.sh projects/stress2/misc/pmc.sh projects/stress2/misc/quota1.sh projects/stress2/misc/quota2.sh projects/stress2/misc/quota3.sh projects/stress2/misc/quota5.sh projects/stress2/misc/tmpfs.sh projects/stress2/misc/tmpfs3.sh projects/stress2/misc/umount.sh projects/stress2/misc/umountf.sh projects/stress2/misc/unionfs.sh projects/stress2/misc/unionfs2.sh Modified: projects/stress2/misc/lookup_shared.sh ============================================================================== --- projects/stress2/misc/lookup_shared.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/lookup_shared.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ saved=`sysctl vfs.lookup_shared | awk '{ export runRUNTIME=10m # Run tests for 10 minutes for i in 1 0; do sysctl vfs.lookup_shared=$i - (cd /home/pho/stress2; ./run.sh disk.cfg) + (cd ..; ./run.sh disk.cfg) done sysctl vfs.lookup_shared=$saved Modified: projects/stress2/misc/md2.sh ============================================================================== --- projects/stress2/misc/md2.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/md2.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ for i in 1 2; do export RUNDIR=$mntpoint/stressX export runRUNTIME=10m - cd /home/pho/stress2; ./run.sh + cd ..; ./run.sh umount ${mntpoint} done Modified: projects/stress2/misc/md3.sh ============================================================================== --- projects/stress2/misc/md3.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/md3.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2009 Peter Holm +# Copyright (c) 2009-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ export INODES=$(($2 / 10 * 7)) export RUNDIR=$mntpoint/stressX export runRUNTIME=10m -(cd /home/pho/stress2; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) umount $mntpoint mount | grep -q "$mntpoint" && umount -f $mntpoint Modified: projects/stress2/misc/mountro.sh ============================================================================== --- projects/stress2/misc/mountro.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/mountro.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -50,7 +50,7 @@ chmod 777 ${mntpoint}/stressX export RUNDIR=${mntpoint}/stressX export runRUNTIME=4m -(cd /home/pho/stress2; ./run.sh disk.cfg) & +(cd ..; ./run.sh disk.cfg) & sleep 30 for i in `jot 10`; do Modified: projects/stress2/misc/newfs.sh ============================================================================== --- projects/stress2/misc/newfs.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/newfs.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -54,7 +54,7 @@ for opt in "-O1" "-O2" "-O2 -U"; do mount /dev/md${mdstart}${part} $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=4m - (cd /home/pho/stress2; ./run.sh disk.cfg) + (cd ..; ./run.sh disk.cfg) while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do umount $mntpoint > /dev/null 2>&1 done Modified: projects/stress2/misc/newfs2.sh ============================================================================== --- projects/stress2/misc/newfs2.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/newfs2.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ while [ $size -le $((900 * 1024 * 1024)) df -i $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes - (cd /home/pho/stress2; ./run.sh disk.cfg) + (cd ..; ./run.sh disk.cfg) while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do umount $mntpoint > /dev/null 2>&1 done Modified: projects/stress2/misc/newfs3.sh ============================================================================== --- projects/stress2/misc/newfs3.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/newfs3.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ while [ $size -le $((128 * 1024 * 1024)) mount /dev/md${mdstart}${part} $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=5m - (cd /home/pho/stress2; ./run.sh disk.cfg) + (cd ..; ./run.sh disk.cfg) while mount | grep "$mntpoint" | grep -q md${mdstart}${part}; do umount $mntpoint > /dev/null 2>&1 done Modified: projects/stress2/misc/nfs.sh ============================================================================== --- projects/stress2/misc/nfs.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/nfs.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ mount -t nfs -o tcp -o retrycnt=3 -o int export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) while mount | grep "$mntpoint" | grep -q nfs; do umount $mntpoint Modified: projects/stress2/misc/nfs2.sh ============================================================================== --- projects/stress2/misc/nfs2.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/nfs2.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ mount -t nfs -o tcp -o retrycnt=3 -o int export INODES=9999 # No inodes on a msdos fs export RUNDIR=${mntpoint}2/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) umount -f ${mntpoint}2 > /dev/null 2>&1 umount -f $mntpoint > /dev/null 2>&1 Modified: projects/stress2/misc/nfs5.sh ============================================================================== --- projects/stress2/misc/nfs5.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/nfs5.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -56,7 +56,7 @@ mount -t nfs -o tcp -o retrycnt=3 -o int export RUNDIR=${mntpoint}2/stressX export runRUNTIME=4m -(cd /home/pho/stress2; ./run.sh disk.cfg) & +(cd ..; ./run.sh disk.cfg) & sleep 60 umount -f $mntpoint > /dev/null 2>&1 Modified: projects/stress2/misc/nfs6.sh ============================================================================== --- projects/stress2/misc/nfs6.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/nfs6.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -57,7 +57,7 @@ mount -t nfs -o tcp -o retrycnt=3 -o int export RUNDIR=${mntpoint}2/stressX export runRUNTIME=4m -(cd /home/pho/stress2; ./run.sh disk.cfg) & +(cd ..; ./run.sh disk.cfg) & sleep 60 for i in `jot 10`; do Modified: projects/stress2/misc/nfsrename.sh ============================================================================== --- projects/stress2/misc/nfsrename.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/nfsrename.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: projects/stress2/misc/pmc.sh ============================================================================== --- projects/stress2/misc/pmc.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/pmc.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008-2009 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ for i in `jot 2`; do done export runRUNTIME=5m -(cd /home/pho/stress2; ./run.sh vfs.cfg) +(cd ..; ./run.sh vfs.cfg) for i in `jot 2`; do wait Modified: projects/stress2/misc/quota1.sh ============================================================================== --- projects/stress2/misc/quota1.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/quota1.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -48,7 +48,7 @@ newfs -U md${mdstart}${part} > /dev/nul mount /dev/md${mdstart}${part} ${mntpoint} export RUNDIR=${mntpoint}/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) false while mount | grep -q ${mntpoint}; do umount ${mntpoint} > /dev/null 2>&1 Modified: projects/stress2/misc/quota2.sh ============================================================================== --- projects/stress2/misc/quota2.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/quota2.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -52,7 +52,7 @@ df -i ${mntpoint} sed -i -e "/md${mdstart}${part}/d" /etc/fstab # clean up before any panics export RUNDIR=${mntpoint}/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) false while [ $? -ne 0 ]; do umount ${mntpoint} > /dev/null 2>&1 Modified: projects/stress2/misc/quota3.sh ============================================================================== --- projects/stress2/misc/quota3.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/quota3.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -53,7 +53,7 @@ sed -i -e "/md${mdstart}${part}/d" /etc/ mksnap_ffs ${mntpoint} ${mntpoint}/.snap/pho export RUNDIR=${mntpoint}/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) false while mount | grep -q ${mntpoint}; do umount ${mntpoint} > /dev/null 2>&1 Modified: projects/stress2/misc/quota5.sh ============================================================================== --- projects/stress2/misc/quota5.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/quota5.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -39,6 +39,6 @@ edquota -g -f /tmp -e /tmp:1500000:14000 quotaon /tmp #su pho -c "export runRUNTIME=60m; cd /home/pho/stress2; ./run.sh disk.cfg" -su pho -c "export runRUNTIME=60m; cd /home/pho/stress2/testcases/mkdir; ./mkdir -t 1h -i 200 -v -v" +su pho -c "export runRUNTIME=60m; cd ..; ./mkdir -t 1h -i 200 -v -v" quotaoff /tmp Modified: projects/stress2/misc/tmpfs.sh ============================================================================== --- projects/stress2/misc/tmpfs.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/tmpfs.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2009 Peter Holm +# Copyright (c) 2009-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ mount -t tmpfs tmpfs $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh marcus.cfg) +(cd ..; ./run.sh marcus.cfg) umount $mntpoint mount | grep "$mntpoint" | grep -q tmpfs && umount -f $mntpoint Modified: projects/stress2/misc/tmpfs3.sh ============================================================================== --- projects/stress2/misc/tmpfs3.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/tmpfs3.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2009 Peter Holm +# Copyright (c) 2009-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ mount -t tmpfs tmpfs $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh vfs.cfg) +(cd ..; ./run.sh vfs.cfg) umount $mntpoint mount | grep "$mntpoint" | grep -q tmpfs && umount -f $mntpoint Modified: projects/stress2/misc/umount.sh ============================================================================== --- projects/stress2/misc/umount.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/umount.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ newfs md${mdstart}${part} mount /dev/md${mdstart}${part} $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=3m # Run tests for three minutes -(cd /home/pho/stress2; ./run.sh vfs.cfg) +(cd ..; ./run.sh vfs.cfg) umount $mntpoint mdconfig -d -u ${mdstart} rm -f $D Modified: projects/stress2/misc/umountf.sh ============================================================================== --- projects/stress2/misc/umountf.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/umountf.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ mount /dev/md${mdstart}${part} $mntpoint export RUNDIR=$mntpoint/stressX export runRUNTIME=2m -cd /home/pho/stress2; ./run.sh vfs.cfg & +cd ..; ./run.sh vfs.cfg & pid=$! sleep 30 Modified: projects/stress2/misc/unionfs.sh ============================================================================== --- projects/stress2/misc/unionfs.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/unionfs.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ mount /dev/md0c /mnt mount -t unionfs -o noatime /mnt /tmp export RUNDIR=/tmp/stressX export runRUNTIME=10m # Run tests for 10 minutes -(cd /home/pho/stress2; ./run.sh disk.cfg) +(cd ..; ./run.sh disk.cfg) mount | grep "/mnt" | grep md0c > /dev/null && umount /mnt mount | grep "/mnt" | grep md0c > /dev/null && umount -f /mnt mdconfig -d -u 0 Modified: projects/stress2/misc/unionfs2.sh ============================================================================== --- projects/stress2/misc/unionfs2.sh Wed Jan 19 07:44:47 2011 (r217574) +++ projects/stress2/misc/unionfs2.sh Wed Jan 19 09:47:20 2011 (r217575) @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2008 Peter Holm +# Copyright (c) 2008-2011 Peter Holm # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ for i in 1 0; do export RUNDIR=/var/tmp/unionfs/stressX export runRUNTIME=10m # Run tests for 10 minutes - (cd /home/pho/stress2; ./run.sh disk.cfg) + (cd ..; ./run.sh disk.cfg) false while mount | grep -q /unionfs; do umount /tmp/stressX > /dev/null 2>&1 From owner-svn-src-projects@FreeBSD.ORG Wed Jan 19 21:57:30 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EEB9106564A; Wed, 19 Jan 2011 21:57:30 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 544C98FC21; Wed, 19 Jan 2011 21:57:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0JLvU43090773; Wed, 19 Jan 2011 21:57:30 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0JLvUWQ090770; Wed, 19 Jan 2011 21:57:30 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201101192157.p0JLvUWQ090770@svn.freebsd.org> From: Dimitry Andric Date: Wed, 19 Jan 2011 21:57:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217610 - projects/binutils-2.17/gnu/usr.bin/binutils/ld X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2011 21:57:30 -0000 Author: dim Date: Wed Jan 19 21:57:30 2011 New Revision: 217610 URL: http://svn.freebsd.org/changeset/base/217610 Log: While building ld for powerpc or powerpc64, make the generated files eelf32ppc.c and eelf64ppc.c dependent on ldemul-list.h, since some of the scripts called from genscripts.sh (ppc32elf.em and ppc64elf.em, respectively) grep ldemul-list.h to determine whether spu emulation is available. This avoids a needless error message during 'make depend' in gnu/usr.bin/binutils/ld. Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc64 Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc Wed Jan 19 21:49:42 2011 (r217609) +++ projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc Wed Jan 19 21:57:30 2011 (r217610) @@ -5,7 +5,7 @@ NATIVE_EMULATION= elf32ppc SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc genscripts.sh stringify.sed + scripttempl/elf.sc genscripts.sh stringify.sed ldemul-list.h sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ Modified: projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc64 ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc64 Wed Jan 19 21:49:42 2011 (r217609) +++ projects/binutils-2.17/gnu/usr.bin/binutils/ld/Makefile.powerpc64 Wed Jan 19 21:57:30 2011 (r217610) @@ -5,7 +5,7 @@ NATIVE_EMULATION= elf64ppc SRCS+= e${NATIVE_EMULATION}.c CLEANFILES+= e${NATIVE_EMULATION}.c e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc genscripts.sh stringify.sed + scripttempl/elf.sc genscripts.sh stringify.sed ldemul-list.h sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ @@ -21,7 +21,7 @@ LDSCRIPTS+= ${PPC32_EMULATION}.${ext} SRCS+= e${PPC32_EMULATION}.c CLEANFILES+= e${PPC32_EMULATION}.c e${PPC32_EMULATION}.c: emulparams/${PPC32_EMULATION}.sh emultempl/elf32.em \ - scripttempl/elf.sc genscripts.sh stringify.sed + scripttempl/elf.sc genscripts.sh stringify.sed ldemul-list.h sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ppc32_path} \ ${TOOLS_PREFIX}/usr \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ From owner-svn-src-projects@FreeBSD.ORG Thu Jan 20 19:20:11 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE17210656B7; Thu, 20 Jan 2011 19:20:11 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 98B798FC08; Thu, 20 Jan 2011 19:20:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0KJKBx1025186; Thu, 20 Jan 2011 19:20:11 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0KJKBpk025161; Thu, 20 Jan 2011 19:20:11 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201101201920.p0KJKBpk025161@svn.freebsd.org> From: Dimitry Andric Date: Thu, 20 Jan 2011 19:20:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217654 - in projects/binutils-2.17: bin/sh contrib/groff/tmac contrib/top etc/mtree gnu/usr.bin/dialog gnu/usr.bin/groff/tmac lib/libc/sys lib/libfetch lib/libjail sbin/sysctl share/ex... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2011 19:20:11 -0000 Author: dim Date: Thu Jan 20 19:20:10 2011 New Revision: 217654 URL: http://svn.freebsd.org/changeset/base/217654 Log: Sync: merge r217434 through r217651 from ^/head. Added: projects/binutils-2.17/share/man/man4/rgephy.4 - copied unchanged from r217651, head/share/man/man4/rgephy.4 projects/binutils-2.17/sys/conf/ldscript.mips.octeon1 - copied unchanged from r217651, head/sys/conf/ldscript.mips.octeon1 projects/binutils-2.17/sys/dev/ath/ath_hal/ah_diagcodes.h - copied unchanged from r217651, head/sys/dev/ath/ath_hal/ah_diagcodes.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar9001/ - copied from r217651, head/sys/dev/ath/ath_hal/ar9001/ projects/binutils-2.17/sys/dev/ath/ath_hal/ar9002/ - copied from r217651, head/sys/dev/ath/ath_hal/ar9002/ projects/binutils-2.17/sys/dev/ath/ath_hal/ar9003/ - copied from r217651, head/sys/dev/ath/ath_hal/ar9003/ projects/binutils-2.17/tools/regression/bin/sh/builtins/trap5.0 - copied unchanged from r217651, head/tools/regression/bin/sh/builtins/trap5.0 projects/binutils-2.17/tools/regression/bin/sh/builtins/trap6.0 - copied unchanged from r217651, head/tools/regression/bin/sh/builtins/trap6.0 projects/binutils-2.17/tools/regression/bin/sh/execution/killed1.0 - copied unchanged from r217651, head/tools/regression/bin/sh/execution/killed1.0 Deleted: projects/binutils-2.17/sys/conf/ldscript.mips.64 projects/binutils-2.17/sys/conf/ldscript.mips.n32 projects/binutils-2.17/sys/conf/ldscript.mips.octeon1.32 projects/binutils-2.17/sys/conf/ldscript.mips.octeon1.64 projects/binutils-2.17/sys/conf/ldscript.mips.octeon1.n32 projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9160.ini projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285.ini projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini projects/binutils-2.17/sys/netinet/sctp_cc_functions.h Modified: projects/binutils-2.17/bin/sh/jobs.c projects/binutils-2.17/bin/sh/sh.1 projects/binutils-2.17/bin/sh/trap.c projects/binutils-2.17/contrib/groff/tmac/doc-common projects/binutils-2.17/contrib/groff/tmac/doc-syms projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man projects/binutils-2.17/etc/mtree/README projects/binutils-2.17/gnu/usr.bin/dialog/Makefile projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local projects/binutils-2.17/lib/libc/sys/mknod.2 projects/binutils-2.17/lib/libfetch/ftp.c projects/binutils-2.17/lib/libjail/jail.c projects/binutils-2.17/sbin/sysctl/sysctl.8 projects/binutils-2.17/sbin/sysctl/sysctl.c projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c projects/binutils-2.17/share/man/man4/Makefile projects/binutils-2.17/share/man/man4/axe.4 projects/binutils-2.17/share/man/man4/miibus.4 projects/binutils-2.17/share/man/man4/nfe.4 projects/binutils-2.17/share/man/man4/nve.4 projects/binutils-2.17/share/man/man4/re.4 projects/binutils-2.17/share/man/man4/sge.4 projects/binutils-2.17/share/man/man5/xfs.5 projects/binutils-2.17/share/man/man9/Makefile projects/binutils-2.17/share/man/man9/sleep.9 projects/binutils-2.17/share/man/man9/sysctl.9 projects/binutils-2.17/share/misc/bsd-family-tree projects/binutils-2.17/share/misc/committers-doc.dot projects/binutils-2.17/sys/amd64/amd64/amd64_mem.c projects/binutils-2.17/sys/amd64/amd64/machdep.c projects/binutils-2.17/sys/amd64/amd64/mem.c projects/binutils-2.17/sys/amd64/amd64/sys_machdep.c projects/binutils-2.17/sys/amd64/include/memdev.h projects/binutils-2.17/sys/arm/arm/mem.c projects/binutils-2.17/sys/arm/arm/vm_machdep.c projects/binutils-2.17/sys/arm/include/memdev.h projects/binutils-2.17/sys/boot/forth/beastie.4th projects/binutils-2.17/sys/cam/ata/ata_xpt.c projects/binutils-2.17/sys/cam/scsi/scsi_da.c projects/binutils-2.17/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c projects/binutils-2.17/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/binutils-2.17/sys/compat/linux/linux_file.c projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c projects/binutils-2.17/sys/conf/files projects/binutils-2.17/sys/conf/files.amd64 projects/binutils-2.17/sys/conf/files.i386 projects/binutils-2.17/sys/conf/files.pc98 projects/binutils-2.17/sys/conf/files.powerpc projects/binutils-2.17/sys/conf/ldscript.mips.mips64 (contents, props changed) projects/binutils-2.17/sys/conf/options projects/binutils-2.17/sys/dev/acpi_support/acpi_ibm.c projects/binutils-2.17/sys/dev/acpi_support/atk0110.c projects/binutils-2.17/sys/dev/acpica/acpi_pci.c projects/binutils-2.17/sys/dev/acpica/acpi_video.c projects/binutils-2.17/sys/dev/alc/if_alc.c projects/binutils-2.17/sys/dev/alc/if_alcreg.h projects/binutils-2.17/sys/dev/ale/if_ale.c projects/binutils-2.17/sys/dev/ale/if_alevar.h projects/binutils-2.17/sys/dev/ath/ath_hal/ah.c projects/binutils-2.17/sys/dev/ath/ath_hal/ah.h projects/binutils-2.17/sys/dev/ath/ath_hal/ah_devid.h projects/binutils-2.17/sys/dev/ath/ath_hal/ah_eeprom.h projects/binutils-2.17/sys/dev/ath/ath_hal/ah_eeprom_v14.c projects/binutils-2.17/sys/dev/ath/ath_hal/ah_eeprom_v14.h projects/binutils-2.17/sys/dev/ath/ath_hal/ah_internal.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5210/ar5210.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5211/ar5211.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/binutils-2.17/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/binutils-2.17/sys/dev/ath/ath_rate/sample/sample.c projects/binutils-2.17/sys/dev/ath/ath_rate/sample/sample.h projects/binutils-2.17/sys/dev/ath/if_ath.c projects/binutils-2.17/sys/dev/ath/if_athvar.h projects/binutils-2.17/sys/dev/buslogic/bt.c projects/binutils-2.17/sys/dev/bwi/if_bwi.c projects/binutils-2.17/sys/dev/bwn/if_bwn.c projects/binutils-2.17/sys/dev/cs/if_cs.c projects/binutils-2.17/sys/dev/cxgb/cxgb_sge.c projects/binutils-2.17/sys/dev/e1000/if_em.c projects/binutils-2.17/sys/dev/e1000/if_igb.c projects/binutils-2.17/sys/dev/e1000/if_lem.c projects/binutils-2.17/sys/dev/en/midway.c projects/binutils-2.17/sys/dev/fatm/if_fatm.c projects/binutils-2.17/sys/dev/iicbus/ds1775.c projects/binutils-2.17/sys/dev/iicbus/max6690.c projects/binutils-2.17/sys/dev/iscsi/initiator/isc_sm.c projects/binutils-2.17/sys/dev/iwn/if_iwn.c projects/binutils-2.17/sys/dev/ixgbe/ixgbe.c projects/binutils-2.17/sys/dev/ixgbe/ixgbe.h projects/binutils-2.17/sys/dev/ixgbe/ixgbe_82599.c projects/binutils-2.17/sys/dev/ixgbe/ixgbe_api.h projects/binutils-2.17/sys/dev/ixgbe/ixgbe_common.c projects/binutils-2.17/sys/dev/ixgbe/ixgbe_common.h projects/binutils-2.17/sys/dev/ixgbe/ixgbe_mbx.c projects/binutils-2.17/sys/dev/ixgbe/ixgbe_type.h projects/binutils-2.17/sys/dev/md/md.c projects/binutils-2.17/sys/dev/mem/memdev.c projects/binutils-2.17/sys/dev/mem/memutil.c projects/binutils-2.17/sys/dev/mmc/mmc.c projects/binutils-2.17/sys/dev/msk/if_msk.c projects/binutils-2.17/sys/dev/patm/if_patm_attach.c projects/binutils-2.17/sys/dev/ral/rt2560.c projects/binutils-2.17/sys/dev/ral/rt2661.c projects/binutils-2.17/sys/dev/re/if_re.c projects/binutils-2.17/sys/dev/sis/if_sis.c projects/binutils-2.17/sys/dev/uart/uart_bus_fdt.c projects/binutils-2.17/sys/dev/usb/controller/usb_controller.c projects/binutils-2.17/sys/dev/usb/net/usb_ethernet.c projects/binutils-2.17/sys/dev/usb/serial/u3g.c projects/binutils-2.17/sys/dev/usb/usb_freebsd.h projects/binutils-2.17/sys/dev/usb/usb_transfer.c projects/binutils-2.17/sys/dev/usb/usbdevs projects/binutils-2.17/sys/dev/usb/wlan/if_rum.c projects/binutils-2.17/sys/dev/usb/wlan/if_run.c projects/binutils-2.17/sys/dev/usb/wlan/if_ural.c projects/binutils-2.17/sys/dev/wi/if_wi.c projects/binutils-2.17/sys/dev/wpi/if_wpi.c projects/binutils-2.17/sys/dev/xen/netback/netback.c projects/binutils-2.17/sys/fs/ext2fs/ext2_alloc.c projects/binutils-2.17/sys/fs/ext2fs/ext2_dinode.h projects/binutils-2.17/sys/fs/ext2fs/ext2_lookup.c projects/binutils-2.17/sys/fs/ext2fs/ext2_subr.c projects/binutils-2.17/sys/fs/ext2fs/ext2_vfsops.c projects/binutils-2.17/sys/fs/ext2fs/ext2fs.h projects/binutils-2.17/sys/fs/ext2fs/inode.h projects/binutils-2.17/sys/fs/nfs/nfs_commonsubs.c projects/binutils-2.17/sys/fs/tmpfs/tmpfs_subr.c projects/binutils-2.17/sys/fs/tmpfs/tmpfs_vnops.c projects/binutils-2.17/sys/geom/part/g_part_gpt.c projects/binutils-2.17/sys/i386/i386/i686_mem.c projects/binutils-2.17/sys/i386/i386/machdep.c projects/binutils-2.17/sys/i386/i386/mem.c projects/binutils-2.17/sys/i386/i386/sys_machdep.c projects/binutils-2.17/sys/i386/i386/vm86bios.s projects/binutils-2.17/sys/i386/i386/vm_machdep.c projects/binutils-2.17/sys/i386/include/memdev.h projects/binutils-2.17/sys/ia64/ia64/mem.c projects/binutils-2.17/sys/ia64/include/memdev.h projects/binutils-2.17/sys/kern/kern_linker.c projects/binutils-2.17/sys/kern/kern_sysctl.c projects/binutils-2.17/sys/kern/kern_tc.c projects/binutils-2.17/sys/kern/subr_bus.c projects/binutils-2.17/sys/kern/sysv_msg.c projects/binutils-2.17/sys/kern/sysv_sem.c projects/binutils-2.17/sys/kern/sysv_shm.c projects/binutils-2.17/sys/kern/uipc_usrreq.c projects/binutils-2.17/sys/kern/vfs_subr.c projects/binutils-2.17/sys/mips/cavium/cryptocteon/cavium_crypto.c projects/binutils-2.17/sys/mips/cavium/octeon_machdep.c projects/binutils-2.17/sys/mips/cavium/uart_bus_octeonusart.c projects/binutils-2.17/sys/mips/conf/MALTA64 projects/binutils-2.17/sys/mips/conf/OCTEON1 projects/binutils-2.17/sys/mips/conf/XLR projects/binutils-2.17/sys/mips/conf/XLR64 projects/binutils-2.17/sys/mips/conf/XLRN32 projects/binutils-2.17/sys/mips/include/memdev.h projects/binutils-2.17/sys/mips/mips/machdep.c projects/binutils-2.17/sys/mips/mips/mem.c projects/binutils-2.17/sys/mips/mips/tick.c projects/binutils-2.17/sys/mips/mips/vm_machdep.c projects/binutils-2.17/sys/mips/rmi/pic.h projects/binutils-2.17/sys/mips/rmi/std.xlr projects/binutils-2.17/sys/mips/rmi/tick.c projects/binutils-2.17/sys/mips/rmi/xlr_machdep.c projects/binutils-2.17/sys/mips/rmi/xlr_pci.c projects/binutils-2.17/sys/modules/ath/Makefile projects/binutils-2.17/sys/modules/mem/Makefile projects/binutils-2.17/sys/net/if_enc.c projects/binutils-2.17/sys/net/vnet.h projects/binutils-2.17/sys/net80211/ieee80211_freebsd.c projects/binutils-2.17/sys/net80211/ieee80211_mesh.c projects/binutils-2.17/sys/net80211/ieee80211_node.c projects/binutils-2.17/sys/netinet/ip_divert.c projects/binutils-2.17/sys/netinet/raw_ip.c projects/binutils-2.17/sys/netinet/sctp_cc_functions.c projects/binutils-2.17/sys/netinet/sctp_constants.h projects/binutils-2.17/sys/netinet/sctp_pcb.c projects/binutils-2.17/sys/netinet/sctp_sysctl.c projects/binutils-2.17/sys/netinet/sctp_uio.h projects/binutils-2.17/sys/netinet/sctp_usrreq.c projects/binutils-2.17/sys/netinet/sctputil.c projects/binutils-2.17/sys/netinet/tcp_reass.c projects/binutils-2.17/sys/netinet/tcp_subr.c projects/binutils-2.17/sys/netinet/udp_usrreq.c projects/binutils-2.17/sys/pc98/pc98/machdep.c projects/binutils-2.17/sys/pci/if_rlreg.h projects/binutils-2.17/sys/powerpc/aim/slb.c projects/binutils-2.17/sys/powerpc/aim/vm_machdep.c projects/binutils-2.17/sys/powerpc/booke/machdep.c projects/binutils-2.17/sys/powerpc/booke/platform_bare.c projects/binutils-2.17/sys/powerpc/booke/vm_machdep.c projects/binutils-2.17/sys/powerpc/include/memdev.h projects/binutils-2.17/sys/powerpc/include/metadata.h projects/binutils-2.17/sys/powerpc/powermac/cpcht.c projects/binutils-2.17/sys/powerpc/powerpc/mem.c projects/binutils-2.17/sys/sparc64/include/memdev.h projects/binutils-2.17/sys/sparc64/sparc64/exception.S projects/binutils-2.17/sys/sparc64/sparc64/mem.c projects/binutils-2.17/sys/sparc64/sparc64/pmap.c projects/binutils-2.17/sys/sparc64/sparc64/vm_machdep.c projects/binutils-2.17/sys/sun4v/include/memdev.h projects/binutils-2.17/sys/sys/memrange.h projects/binutils-2.17/sys/sys/sysctl.h projects/binutils-2.17/sys/vm/device_pager.c projects/binutils-2.17/sys/vm/pmap.h projects/binutils-2.17/sys/vm/sg_pager.c projects/binutils-2.17/sys/vm/swap_pager.c projects/binutils-2.17/sys/vm/vm_fault.c projects/binutils-2.17/sys/vm/vm_object.c projects/binutils-2.17/sys/vm/vm_page.c projects/binutils-2.17/sys/vm/vm_page.h projects/binutils-2.17/sys/vm/vm_pageout.c projects/binutils-2.17/sys/vm/vm_pager.c projects/binutils-2.17/sys/vm/vm_pager.h projects/binutils-2.17/sys/vm/vm_phys.c projects/binutils-2.17/sys/x86/x86/tsc.c projects/binutils-2.17/sys/xen/xenbus/xenbusb.c projects/binutils-2.17/tools/tools/sysbuild/sysbuild.sh projects/binutils-2.17/usr.bin/netstat/if.c projects/binutils-2.17/usr.bin/netstat/netstat.h projects/binutils-2.17/usr.bin/netstat/route.c projects/binutils-2.17/usr.bin/unifdef/unifdef.c projects/binutils-2.17/usr.sbin/sysinstall/install.c projects/binutils-2.17/usr.sbin/sysinstall/menus.c projects/binutils-2.17/usr.sbin/syslogd/syslogd.c Directory Properties: projects/binutils-2.17/ (props changed) projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/contrib/bind9/ (props changed) projects/binutils-2.17/contrib/binutils/ (props changed) projects/binutils-2.17/contrib/bzip2/ (props changed) projects/binutils-2.17/contrib/dialog/ (props changed) projects/binutils-2.17/contrib/ee/ (props changed) projects/binutils-2.17/contrib/expat/ (props changed) projects/binutils-2.17/contrib/file/ (props changed) projects/binutils-2.17/contrib/gdb/ (props changed) projects/binutils-2.17/contrib/gdtoa/ (props changed) projects/binutils-2.17/contrib/gnu-sort/ (props changed) projects/binutils-2.17/contrib/groff/ (props changed) projects/binutils-2.17/contrib/less/ (props changed) projects/binutils-2.17/contrib/libpcap/ (props changed) projects/binutils-2.17/contrib/llvm/ (props changed) projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed) projects/binutils-2.17/contrib/ncurses/ (props changed) projects/binutils-2.17/contrib/netcat/ (props changed) projects/binutils-2.17/contrib/ntp/ (props changed) projects/binutils-2.17/contrib/one-true-awk/ (props changed) projects/binutils-2.17/contrib/openbsm/ (props changed) projects/binutils-2.17/contrib/openpam/ (props changed) projects/binutils-2.17/contrib/pf/ (props changed) projects/binutils-2.17/contrib/sendmail/ (props changed) projects/binutils-2.17/contrib/tcpdump/ (props changed) projects/binutils-2.17/contrib/tcsh/ (props changed) projects/binutils-2.17/contrib/top/ (props changed) projects/binutils-2.17/contrib/top/install-sh (props changed) projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed) projects/binutils-2.17/contrib/tzcode/zic/ (props changed) projects/binutils-2.17/contrib/tzdata/ (props changed) projects/binutils-2.17/contrib/wpa/ (props changed) projects/binutils-2.17/contrib/xz/ (props changed) projects/binutils-2.17/crypto/openssh/ (props changed) projects/binutils-2.17/crypto/openssl/ (props changed) projects/binutils-2.17/lib/libc/ (props changed) projects/binutils-2.17/lib/libc/stdtime/ (props changed) projects/binutils-2.17/lib/libutil/ (props changed) projects/binutils-2.17/lib/libz/ (props changed) projects/binutils-2.17/sbin/ (props changed) projects/binutils-2.17/sbin/ipfw/ (props changed) projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed) projects/binutils-2.17/share/zoneinfo/ (props changed) projects/binutils-2.17/sys/ (props changed) projects/binutils-2.17/sys/amd64/include/xen/ (props changed) projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed) projects/binutils-2.17/sys/contrib/octeon-sdk/ (props changed) projects/binutils-2.17/sys/contrib/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/usr.bin/calendar/ (props changed) projects/binutils-2.17/usr.bin/csup/ (props changed) projects/binutils-2.17/usr.bin/procstat/ (props changed) projects/binutils-2.17/usr.sbin/zic/ (props changed) Modified: projects/binutils-2.17/bin/sh/jobs.c ============================================================================== --- projects/binutils-2.17/bin/sh/jobs.c Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/bin/sh/jobs.c Thu Jan 20 19:20:10 2011 (r217654) @@ -1062,6 +1062,7 @@ dowait(int block, struct job *job) if (coredump) out1str(" (core dumped)"); out1c('\n'); + flushout(out1); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); Modified: projects/binutils-2.17/bin/sh/sh.1 ============================================================================== --- projects/binutils-2.17/bin/sh/sh.1 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/bin/sh/sh.1 Thu Jan 20 19:20:10 2011 (r217654) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd December 21, 2010 +.Dd January 16, 2011 .Dt SH 1 .Os .Sh NAME @@ -1848,7 +1848,12 @@ If .Ar exitstatus is given it is used as the exit status of the shell; -otherwise the exit status of the preceding command is used. +otherwise, if the shell is executing an +.Cm EXIT +trap, the exit status of the last command before the trap is used; +if the shell is executing a trap for a signal, +the shell exits by resending the signal to itself; +otherwise, the exit status of the preceding command is used. The exit status should be an integer between 0 and 255. .It Ic export Ar name ... .It Ic export Op Fl p Modified: projects/binutils-2.17/bin/sh/trap.c ============================================================================== --- projects/binutils-2.17/bin/sh/trap.c Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/bin/sh/trap.c Thu Jan 20 19:20:10 2011 (r217654) @@ -79,6 +79,7 @@ static volatile sig_atomic_t gotsig[NSIG /* indicates specified signal received */ static int ignore_sigchld; /* Used while handling SIGCHLD traps. */ volatile sig_atomic_t gotwinch; +static int last_trapsig; static int exiting; /* exitshell() has been called */ static int exiting_exitstatus; /* value passed to exitshell() */ @@ -153,8 +154,18 @@ trapcmd(int argc, char **argv) char *action; int signo; int errors = 0; + int i; + + while ((i = nextopt("l")) != '\0') { + switch (i) { + case 'l': + printsignals(); + return (0); + } + } + argv = argptr; - if (argc <= 1) { + if (*argv == NULL) { for (signo = 0 ; signo < sys_nsig ; signo++) { if (signo < NSIG && trap[signo] != NULL) { out1str("trap -- "); @@ -171,19 +182,12 @@ trapcmd(int argc, char **argv) return 0; } action = NULL; - if (*++argv && strcmp(*argv, "--") == 0) - argv++; if (*argv && sigstring_to_signum(*argv) == -1) { - if ((*argv)[0] != '-') { - action = *argv; + if (strcmp(*argv, "-") == 0) argv++; - } else if ((*argv)[1] == '\0') { + else { + action = *argv; argv++; - } else if ((*argv)[1] == 'l' && (*argv)[2] == '\0') { - printsignals(); - return 0; - } else { - error("bad option %s", *argv); } } while (*argv) { @@ -438,6 +442,7 @@ dotrap(void) */ if (i == SIGCHLD) ignore_sigchld++; + last_trapsig = i; savestatus = exitstatus; evalstring(trap[i], 0); exitstatus = savestatus; @@ -492,9 +497,16 @@ exitshell_savedstatus(void) { struct jmploc loc1, loc2; char *p; + int sig = 0; + sigset_t sigs; - if (!exiting) - exiting_exitstatus = oexitstatus; + if (!exiting) { + if (in_dotrap && last_trapsig) { + sig = last_trapsig; + exiting_exitstatus = sig + 128; + } else + exiting_exitstatus = oexitstatus; + } exitstatus = oexitstatus = exiting_exitstatus; if (setjmp(loc1.loc)) { goto l1; @@ -512,5 +524,15 @@ l1: handler = &loc2; /* probably unn #if JOBS setjobctl(0); #endif -l2: _exit(exiting_exitstatus); +l2: + if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN && + sig != SIGTTOU) { + signal(sig, SIG_DFL); + sigemptyset(&sigs); + sigaddset(&sigs, sig); + sigprocmask(SIG_UNBLOCK, &sigs, NULL); + kill(getpid(), sig); + /* If the default action is to ignore, fall back to _exit(). */ + } + _exit(exiting_exitstatus); } Modified: projects/binutils-2.17/contrib/groff/tmac/doc-common ============================================================================== --- projects/binutils-2.17/contrib/groff/tmac/doc-common Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/contrib/groff/tmac/doc-common Thu Jan 20 19:20:10 2011 (r217654) @@ -454,6 +454,39 @@ .ds doc-operating-system-NetBSD-3.1 3.1 .ds doc-operating-system-NetBSD-4.0 4.0 .ds doc-operating-system-NetBSD-4.0.1 4.0.1 +.ds doc-operating-system-NetBSD-5.0 5.0 +.ds doc-operating-system-NetBSD-5.0.1 5.0.1 +.ds doc-operating-system-NetBSD-5.0.2 5.0.2 +. +.ds doc-operating-system-OpenBSD-2.0 2.0 +.ds doc-operating-system-OpenBSD-2.1 2.1 +.ds doc-operating-system-OpenBSD-2.2 2.2 +.ds doc-operating-system-OpenBSD-2.3 2.3 +.ds doc-operating-system-OpenBSD-2.4 2.4 +.ds doc-operating-system-OpenBSD-2.5 2.5 +.ds doc-operating-system-OpenBSD-2.6 2.6 +.ds doc-operating-system-OpenBSD-2.7 2.7 +.ds doc-operating-system-OpenBSD-2.8 2.8 +.ds doc-operating-system-OpenBSD-2.9 2.9 +.ds doc-operating-system-OpenBSD-3.0 3.0 +.ds doc-operating-system-OpenBSD-3.1 3.1 +.ds doc-operating-system-OpenBSD-3.2 3.2 +.ds doc-operating-system-OpenBSD-3.3 3.3 +.ds doc-operating-system-OpenBSD-3.4 3.4 +.ds doc-operating-system-OpenBSD-3.5 3.5 +.ds doc-operating-system-OpenBSD-3.6 3.6 +.ds doc-operating-system-OpenBSD-3.7 3.7 +.ds doc-operating-system-OpenBSD-3.8 3.8 +.ds doc-operating-system-OpenBSD-3.9 3.9 +.ds doc-operating-system-OpenBSD-4.0 4.0 +.ds doc-operating-system-OpenBSD-4.1 4.1 +.ds doc-operating-system-OpenBSD-4.2 4.2 +.ds doc-operating-system-OpenBSD-4.3 4.3 +.ds doc-operating-system-OpenBSD-4.4 4.4 +.ds doc-operating-system-OpenBSD-4.5 4.5 +.ds doc-operating-system-OpenBSD-4.6 4.6 +.ds doc-operating-system-OpenBSD-4.7 4.7 +.ds doc-operating-system-OpenBSD-4.8 4.8 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -506,6 +539,10 @@ .ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.0 7.0 .ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 +.ds doc-operating-system-FreeBSD-7.3 7.3 +.ds doc-operating-system-FreeBSD-8.0 8.0 +.ds doc-operating-system-FreeBSD-8.1 8.1 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 .ds doc-operating-system-Darwin-8.1.0 8.1.0 @@ -540,6 +577,10 @@ .ds doc-operating-system-DragonFly-1.12 1.12 .ds doc-operating-system-DragonFly-1.12.2 1.12.2 .ds doc-operating-system-DragonFly-2.0 2.0 +.ds doc-operating-system-DragonFly-2.2 2.2 +.ds doc-operating-system-DragonFly-2.4 2.4 +.ds doc-operating-system-DragonFly-2.6 2.6 +.ds doc-operating-system-DragonFly-2.8 2.8 . .de Os . ds doc-command-name @@ -569,6 +610,14 @@ . el \ . tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c]) . \}\} +. el \{ .ie "\$1"DragonFly" \{\ +. ds doc-operating-system DragonFly +. if \A\$2 \{\ +. ie d doc-operating-system-DragonFly-\$2 \ +. as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2] +. el \ +. tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c]) +. \}\} . el \{ .ie "\$1"NetBSD" \{\ . ds doc-operating-system NetBSD . if \A\$2 \{\ @@ -577,6 +626,14 @@ . el \ . tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c]) . \}\} +. el \{ .ie "\$1"OpenBSD" \{\ +. ds doc-operating-system OpenBSD +. if \A\$2 \{\ +. ie d doc-operating-system-OpenBSD-\$2 \ +. as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2] +. el \ +. tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c]) +. \}\} . el \{ .ie "\$1"Darwin" \{\ . ds doc-operating-system Darwin . if \A\$2 \{\ @@ -589,7 +646,7 @@ . ds doc-operating-system \$1 . if !"\$2"" \ . as doc-operating-system " \$2 -. \}\}\}\}\}\} +. \}\}\}\}\}\}\}\} .. . . Modified: projects/binutils-2.17/contrib/groff/tmac/doc-syms ============================================================================== --- projects/binutils-2.17/contrib/groff/tmac/doc-syms Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/contrib/groff/tmac/doc-syms Thu Jan 20 19:20:10 2011 (r217654) @@ -637,6 +637,8 @@ .as doc-str-St--p1003.1-2001 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) .ds doc-str-St--p1003.1-2004 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004 .as doc-str-St--p1003.1-2004 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 +.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) . .\" POSIX Part 2: Shell and Utilities .ds doc-str-St--p1003.2 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2 Modified: projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man ============================================================================== --- projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/contrib/groff/tmac/groff_mdoc.man Thu Jan 20 19:20:10 2011 (r217654) @@ -44,9 +44,9 @@ .\" for an already extremely slow package. .\" . -.Dd January 5, 2006 -.Os +.Dd November 2, 2010 .Dt GROFF_MDOC 7 +.Os . . .Sh NAME @@ -563,8 +563,8 @@ The body of a man page is easily constru .Bd -literal -offset indent \&.\e" The following commands are required for all man pages. \&.Dd Month day, year -\&.Os [OPERATING_SYSTEM] [version/release] \&.Dt DOCUMENT_TITLE [section number] [architecture/volume] +\&.Os [OPERATING_SYSTEM] [version/release] \&.Sh NAME \&.Nm name \&.Nd one line description of name @@ -600,9 +600,9 @@ The body of a man page is easily constru . The first items in the template are the commands .Ql .Dd , -.Ql .Os , +.Ql .Dt , and -.Ql .Dt ; +.Ql .Os ; the document date, the operating system the man page or subject source is developed or modified for, and the man page title (in .Em upper case ) @@ -856,7 +856,7 @@ is the acronym for the operating system the release ID. . .Bd -ragged -compact -.Bl -tag -width ".No FreeBSD" -offset indent +.Bl -tag -width ".No DragonFly" -offset indent .It ATT 7th, 7, III, 3, V, V.2, V.3, V.4 .It BSD @@ -865,14 +865,19 @@ the release ID. 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e, 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1, 1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0, -4.0.1 +4.0.1, 5.0, 5.0.1, 5.0.2 .It FreeBSD 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, -5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1 +5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0, +8.1 +.It OpenBSD +2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, +3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8 .It DragonFly -1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0 +1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2, +2.4, 2.6, 2.8 .It Darwin 8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0, 8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0 @@ -1588,7 +1593,7 @@ For example, .Ql ".Rv \-std atexit" produces: . -.Bd -ragged -offset -indent +.Bd -ragged -offset indent \# a small hack to suppress a warning message .ds section-old "\*[section] .ds section 3 @@ -1618,7 +1623,7 @@ For example, .Ql ".Ex \-std cat" produces: . -.Bd -ragged -offset -indent +.Bd -ragged -offset indent \# a small hack to suppress a warning message .ds section-old "\*[section] .ds section 1 @@ -1786,6 +1791,11 @@ When called without arguments, .Ql .Nm regurgitates this initial name for the sole purpose of making less work for the author. +.Ql .Nm +causes a line break within the +.Sx SYNOPSIS +section. +.Pp Note: A section two or three document function name is addressed with the .Ql .Nm in the @@ -1974,6 +1984,8 @@ Part 1: System API .St -p1003.1-2001 .It Li \-p1003.1\-2004 .St -p1003.1-2004 +.It Li \-p1003.1\-2008 +.St -p1003.1-2008 .El .Pp . @@ -1993,8 +2005,8 @@ Part 2: Shell and Utilities .Pp . X/Open -.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .Pp +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .It Li \-susv2 .St -susv2 .It Li \-susv3 Modified: projects/binutils-2.17/etc/mtree/README ============================================================================== --- projects/binutils-2.17/etc/mtree/README Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/etc/mtree/README Thu Jan 20 19:20:10 2011 (r217654) @@ -36,10 +36,10 @@ and keep them in good working order. mechanism for making better selections for these as it traverses the hierarchy. - The BSD.X.new file should NOT be commited, will be missing the - correct header, and important keywords like ``nochange''. Simply - use the diff for a sanity check to make sure things are in the - correct order and correctly indented. + The BSD.X.new file should NOT be committed, as it will be missing + the correct header, and important keywords like ``nochange''. + Simply use the diff for a sanity check to make sure things are in + the correct order and correctly indented. e) Further sanity checking of the system builds with DESTDIR=/someplace are more complicated, but can often catch missing entries in these Modified: projects/binutils-2.17/gnu/usr.bin/dialog/Makefile ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/dialog/Makefile Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/gnu/usr.bin/dialog/Makefile Thu Jan 20 19:20:10 2011 (r217654) @@ -3,7 +3,7 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= $(LIBDIALOG) $(LIBNCURSES) +DPADD= $(LIBDIALOG) $(LIBNCURSES) $(LIBM) LDADD= -ldialog -lncursesw -lm CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} Modified: projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/gnu/usr.bin/groff/tmac/mdoc.local Thu Jan 20 19:20:10 2011 (r217654) @@ -74,17 +74,10 @@ .ds doc-default-operating-system FreeBSD\~9.0 . .\" FreeBSD releases not found in doc-common -.ds doc-operating-system-FreeBSD-7.2 7.2 -.ds doc-operating-system-FreeBSD-7.3 7.3 -.ds doc-operating-system-FreeBSD-7.4 7.4 -.ds doc-operating-system-FreeBSD-8.0 8.0 -.ds doc-operating-system-FreeBSD-8.1 8.1 .ds doc-operating-system-FreeBSD-8.2 8.2 .ds doc-operating-system-FreeBSD-9.0 9.0 . .\" Definitions not (yet) in doc-syms -.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 -.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) . .ec . Modified: projects/binutils-2.17/lib/libc/sys/mknod.2 ============================================================================== --- projects/binutils-2.17/lib/libc/sys/mknod.2 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/lib/libc/sys/mknod.2 Thu Jan 20 19:20:10 2011 (r217654) @@ -28,7 +28,7 @@ .\" @(#)mknod.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd April 10, 2008 +.Dd January 16, 2011 .Dt MKNOD 2 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In unistd.h +.In sys/stat.h .Ft int .Fn mknod "const char *path" "mode_t mode" "dev_t dev" .Ft int Modified: projects/binutils-2.17/lib/libfetch/ftp.c ============================================================================== --- projects/binutils-2.17/lib/libfetch/ftp.c Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/lib/libfetch/ftp.c Thu Jan 20 19:20:10 2011 (r217654) @@ -1132,6 +1132,7 @@ ftp_request(struct url *url, const char /* just a stat */ if (strcmp(op, "STAT") == 0) { + --conn->ref; ftp_disconnect(conn); return (FILE *)1; /* bogus return value */ } Modified: projects/binutils-2.17/lib/libjail/jail.c ============================================================================== --- projects/binutils-2.17/lib/libjail/jail.c Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/lib/libjail/jail.c Thu Jan 20 19:20:10 2011 (r217654) @@ -381,10 +381,14 @@ jailparam_import(struct jailparam *jp, c ((unsigned long *)jp->jp_value)[i] = strtoul(avalue, &ep, 10); goto integer_test; - case CTLTYPE_QUAD: + case CTLTYPE_S64: ((int64_t *)jp->jp_value)[i] = strtoimax(avalue, &ep, 10); goto integer_test; + case CTLTYPE_U64: + ((uint64_t *)jp->jp_value)[i] = + strtoumax(avalue, &ep, 10); + goto integer_test; case CTLTYPE_STRUCT: tvalue = alloca(fw + 1); strlcpy(tvalue, avalue, fw + 1); @@ -768,10 +772,14 @@ jailparam_export(struct jailparam *jp) snprintf(valbuf, sizeof(valbuf), "%lu", ((unsigned long *)jp->jp_value)[i]); break; - case CTLTYPE_QUAD: + case CTLTYPE_S64: snprintf(valbuf, sizeof(valbuf), "%jd", (intmax_t)((int64_t *)jp->jp_value)[i]); break; + case CTLTYPE_U64: + snprintf(valbuf, sizeof(valbuf), "%ju", + (uintmax_t)((uint64_t *)jp->jp_value)[i]); + break; case CTLTYPE_STRUCT: switch (jp->jp_structtype) { case JPS_IN_ADDR: @@ -941,7 +949,8 @@ jailparam_type(struct jailparam *jp) case CTLTYPE_ULONG: jp->jp_valuelen = sizeof(long); break; - case CTLTYPE_QUAD: + case CTLTYPE_S64: + case CTLTYPE_U64: jp->jp_valuelen = sizeof(int64_t); break; case CTLTYPE_STRING: Modified: projects/binutils-2.17/sbin/sysctl/sysctl.8 ============================================================================== --- projects/binutils-2.17/sbin/sysctl/sysctl.8 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/sbin/sysctl/sysctl.8 Thu Jan 20 19:20:10 2011 (r217654) @@ -28,7 +28,7 @@ .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd February 6, 2010 +.Dd January 17, 2011 .Dt SYSCTL 8 .Os .Sh NAME @@ -134,9 +134,7 @@ few bytes. .Pp The information available from .Nm -consists of integers, strings, devices -.Pq Vt dev_t , -and opaque types. +consists of integers, strings, and opaque types. The .Nm utility @@ -165,17 +163,8 @@ For a detailed description of these vari .Pp The changeable column indicates whether a process with appropriate privilege can change the value. -String, integer, and devices values can be set using +String and integer values can be set using .Nm . -For device values, -.Ar value -can be specified as a character device special file name. -Special values -.Cm off -and -.Cm none -denote -.Dq no device . .Bl -column security.bsd.unprivileged_read_msgbuf integerxxx .It Sy "Name Type Changeable .It "kern.ostype string no @@ -220,7 +209,6 @@ denote .It "hw.floatingpoint integer no .It "hw.machine_arch string no .It "hw.realmem integer no -.It "machdep.console_device dev_t no .It "machdep.adjkerntz integer yes .It "machdep.disable_rtc_set integer yes .It "machdep.guessed_bootdev string no Modified: projects/binutils-2.17/sbin/sysctl/sysctl.c ============================================================================== --- projects/binutils-2.17/sbin/sysctl/sysctl.c Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/sbin/sysctl/sysctl.c Thu Jan 20 19:20:10 2011 (r217654) @@ -67,7 +67,6 @@ static int show_var(int *, int); static int sysctl_all(int *oid, int len); static int name2oid(char *, int *); -static void set_T_dev_t(char *, void **, size_t *); static int set_IK(const char *, int *); static void @@ -171,7 +170,8 @@ parse(char *string) long longval; unsigned long ulongval; size_t newsize = 0; - quad_t quadval; + int64_t i64val; + uint64_t u64val; int mib[CTL_MAXNAME]; char *cp, *bufp, buf[BUFSIZ], *endptr, fmt[BUFSIZ]; u_int kind; @@ -231,7 +231,8 @@ parse(char *string) (kind & CTLTYPE) == CTLTYPE_UINT || (kind & CTLTYPE) == CTLTYPE_LONG || (kind & CTLTYPE) == CTLTYPE_ULONG || - (kind & CTLTYPE) == CTLTYPE_QUAD) { + (kind & CTLTYPE) == CTLTYPE_S64 || + (kind & CTLTYPE) == CTLTYPE_U64) { if (strlen(newval) == 0) errx(1, "empty numeric value"); } @@ -278,19 +279,23 @@ parse(char *string) break; case CTLTYPE_STRING: break; - case CTLTYPE_QUAD: - quadval = strtoq(newval, &endptr, 0); + case CTLTYPE_S64: + i64val = strtoimax(newval, &endptr, 0); if (endptr == newval || *endptr != '\0') - errx(1, "invalid quad integer" - " '%s'", (char *)newval); - newval = &quadval; - newsize = sizeof(quadval); + errx(1, "invalid int64_t '%s'", + (char *)newval); + newval = &i64val; + newsize = sizeof(i64val); + break; + case CTLTYPE_U64: + u64val = strtoumax(newval, &endptr, 0); + if (endptr == newval || *endptr != '\0') + errx(1, "invalid uint64_t '%s'", + (char *)newval); + newval = &u64val; + newsize = sizeof(u64val); break; case CTLTYPE_OPAQUE: - if (strcmp(fmt, "T,dev_t") == 0) { - set_T_dev_t (newval, &newval, &newsize); - break; - } /* FALLTHROUGH */ default: errx(1, "oid '%s' is type %d," @@ -420,40 +425,6 @@ S_vmtotal(int l2, void *p) } static int -T_dev_t(int l2, void *p) -{ - dev_t *d = (dev_t *)p; - - if (l2 != sizeof(*d)) { - warnx("T_dev_T %d != %zu", l2, sizeof(*d)); - return (1); - } - printf("%s", devname(*d, S_IFCHR)); - return (0); -} - -static void -set_T_dev_t(char *path, void **val, size_t *size) -{ - static struct stat statb; - - if (strcmp(path, "none") && strcmp(path, "off")) { - int rc = stat (path, &statb); - if (rc) { - err(1, "cannot stat %s", path); - } - - if (!S_ISCHR(statb.st_mode)) { - errx(1, "must specify a device special file."); - } - } else { - statb.st_rdev = NODEV; - } - *val = (void *) &statb.st_rdev; - *size = sizeof(statb.st_rdev); -} - -static int set_IK(const char *str, int *val) { float temp; @@ -532,6 +503,21 @@ oidfmt(int *oid, int len, char *fmt, u_i return (0); } +static int ctl_sign[CTLTYPE+1] = { + [CTLTYPE_INT] = 1, + [CTLTYPE_LONG] = 1, + [CTLTYPE_S64] = 1, +}; + +static int ctl_size[CTLTYPE+1] = { + [CTLTYPE_INT] = sizeof(int), + [CTLTYPE_UINT] = sizeof(u_int), + [CTLTYPE_LONG] = sizeof(long), + [CTLTYPE_ULONG] = sizeof(u_long), + [CTLTYPE_S64] = sizeof(int64_t), + [CTLTYPE_U64] = sizeof(int64_t), +}; + /* * This formats and outputs the value of one variable * @@ -539,7 +525,6 @@ oidfmt(int *oid, int len, char *fmt, u_i * Returns one if didn't know what to do with this. * Return minus one if we had errors. */ - static int show_var(int *oid, int nlen) { @@ -549,7 +534,7 @@ show_var(int *oid, int nlen) int qoid[CTL_MAXNAME+2]; uintmax_t umv; intmax_t mv; - int i, hexlen; + int i, hexlen, sign, ctltype; size_t intlen; size_t j, len; u_int kind; @@ -614,46 +599,51 @@ show_var(int *oid, int nlen) fmt = buf; oidfmt(oid, nlen, fmt, &kind); p = val; - switch (*fmt) { - case 'A': + ctltype = (kind & CTLTYPE); + sign = ctl_sign[ctltype]; + intlen = ctl_size[ctltype]; + + switch (ctltype) { + case CTLTYPE_STRING: if (!nflag) printf("%s%s", name, sep); printf("%.*s", (int)len, p); free(oval); return (0); - case 'I': - case 'L': - case 'Q': + case CTLTYPE_INT: + case CTLTYPE_UINT: + case CTLTYPE_LONG: + case CTLTYPE_ULONG: + case CTLTYPE_S64: + case CTLTYPE_U64: if (!nflag) printf("%s%s", name, sep); - switch (*fmt) { - case 'I': intlen = sizeof(int); break; - case 'L': intlen = sizeof(long); break; - case 'Q': intlen = sizeof(quad_t); break; - } hexlen = 2 + (intlen * CHAR_BIT + 3) / 4; sep1 = ""; while (len >= intlen) { - switch (*fmt) { - case 'I': + switch (kind & CTLTYPE) { + case CTLTYPE_INT: + case CTLTYPE_UINT: umv = *(u_int *)p; mv = *(int *)p; break; - case 'L': + case CTLTYPE_LONG: + case CTLTYPE_ULONG: umv = *(u_long *)p; mv = *(long *)p; break; - case 'Q': - umv = *(u_quad_t *)p; - mv = *(quad_t *)p; + case CTLTYPE_S64: + case CTLTYPE_U64: + umv = *(uint64_t *)p; + mv = *(int64_t *)p; break; } fputs(sep1, stdout); - if (fmt[1] == 'U') - printf(hflag ? "%'ju" : "%ju", umv); - else if (fmt[1] == 'X') + if (xflag) printf("%#0*jx", hexlen, umv); + else if (!sign) + printf(hflag ? "%'ju" : "%ju", umv); else if (fmt[1] == 'K') { if (mv < 0) printf("%jd", mv); @@ -668,15 +658,7 @@ show_var(int *oid, int nlen) free(oval); return (0); - case 'P': - if (!nflag) - printf("%s%s", name, sep); - printf("%p", *(void **)p); - free(oval); - return (0); - - case 'T': - case 'S': + case CTLTYPE_OPAQUE: i = 0; if (strcmp(fmt, "S,clockinfo") == 0) func = S_clockinfo; @@ -686,8 +668,6 @@ show_var(int *oid, int nlen) func = S_loadavg; else if (strcmp(fmt, "S,vmtotal") == 0) func = S_vmtotal; - else if (strcmp(fmt, "T,dev_t") == 0) - func = T_dev_t; else func = NULL; if (func) { Modified: projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c ============================================================================== --- projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/examples/kld/dyn_sysctl/dyn_sysctl.c Thu Jan 20 19:20:10 2011 (r217654) @@ -100,8 +100,9 @@ load(module_t mod, int cmd, void *arg) return (EINVAL); } SYSCTL_ADD_PROC(&clist, SYSCTL_CHILDREN(a_root1), - OID_AUTO, "procedure", CTLFLAG_RD, 0, 0, - sysctl_dyn_sysctl_test, "A", "I can be here, too"); + OID_AUTO, "procedure", CTLTYPE_STRING | CTLFLAG_RD, + NULL, 0, sysctl_dyn_sysctl_test, "A", + "I can be here, too"); printf(" (%p) /kern dyn_sysctl\n", &clist); /* Overlap second tree with the first. */ Modified: projects/binutils-2.17/share/man/man4/Makefile ============================================================================== --- projects/binutils-2.17/share/man/man4/Makefile Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/Makefile Thu Jan 20 19:20:10 2011 (r217654) @@ -337,6 +337,7 @@ MAN= aac.4 \ random.4 \ rc.4 \ re.4 \ + rgephy.4 \ rl.4 \ rndtest.4 \ route.4 \ Modified: projects/binutils-2.17/share/man/man4/axe.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/axe.4 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/axe.4 Thu Jan 20 19:20:10 2011 (r217654) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 20, 2008 +.Dd January 16, 2011 .Dt AXE 4 .Os .Sh NAME @@ -206,6 +206,7 @@ The driver failed to allocate an mbuf fo .Xr miibus 4 , .Xr netintro 4 , .Xr ng_ether 4 , +.Xr rgephy 4 , .Xr ifconfig 8 .Rs .%T "ASIX AX88172 AX88178 and AX88772 data sheets" Modified: projects/binutils-2.17/share/man/man4/miibus.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/miibus.4 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/miibus.4 Thu Jan 20 19:20:10 2011 (r217654) @@ -8,7 +8,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 30, 2010 +.Dd January 15, 2011 .Dt MIIBUS 4 .Os .Sh NAME @@ -162,6 +162,7 @@ but as a result are not well behaved new .Xr nve 4 , .Xr pcn 4 , .Xr re 4 , +.Xr rgephy 4 , .Xr rl 4 , .Xr rue 4 , .Xr sf 4 , Modified: projects/binutils-2.17/share/man/man4/nfe.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/nfe.4 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/nfe.4 Thu Jan 20 19:20:10 2011 (r217654) @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 2, 2008 +.Dd January, 2011 .Dt NFE 4 .Os .Sh NAME @@ -174,6 +174,7 @@ before a change takes effect. .Xr netintro 4 , .Xr pci 4 , .Xr polling 4 , +.Xr rgephy 4 , .Xr sysctl 8 , .Xr ifconfig 8 .Sh HISTORY Modified: projects/binutils-2.17/share/man/man4/nve.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/nve.4 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/nve.4 Thu Jan 20 19:20:10 2011 (r217654) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 8, 2007 +.Dd January 16, 2011 .Dt NVE 4 .Os .Sh NAME @@ -120,6 +120,7 @@ the network connection (cable). .Xr miibus 4 , .Xr netintro 4 , .Xr ng_ether 4 , +.Xr rgephy 4 , .Xr ifconfig 8 .Sh HISTORY The Modified: projects/binutils-2.17/share/man/man4/re.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/re.4 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/re.4 Thu Jan 20 19:20:10 2011 (r217654) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 2, 2010 +.Dd January, 2011 .Dt RE 4 .Os .Sh NAME @@ -213,6 +213,7 @@ the network connection (cable). .Xr netintro 4 , .Xr ng_ether 4 , .Xr polling 4 , +.Xr rgephy 4 , .Xr vlan 4 , .Xr ifconfig 8 .Rs Copied: projects/binutils-2.17/share/man/man4/rgephy.4 (from r217651, head/share/man/man4/rgephy.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/binutils-2.17/share/man/man4/rgephy.4 Thu Jan 20 19:20:10 2011 (r217654, copy of r217651, head/share/man/man4/rgephy.4) @@ -0,0 +1,96 @@ +.\" +.\" Copyright (c) 2011 Marius Strobl +.\" 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$ +.\" +.Dd January 15 2011 $ +.Dt RGEPHY 4 +.Os +.Sh NAME +.Nm rgephy +.Nd RealTek RTL8168/8169/8110/8211 series 10/100/1000 Gigabit Ethernet PHY driver +.Sh SYNOPSIS +To compile all available PHY drivers into the kernel, +place the following line in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "device miibus" +.Ed +.Pp +Alternatively, to selectively compile this driver into the kernel, +place the following lines in your kernel configuration file instead: +.Bd -ragged -offset indent +.Cd "device mii" +.Cd "device rgephy" +.Ed +.Sh DESCRIPTION +The +.Nm +driver supports the RealTek RTL8168, RTL8169, RTL8110 and RTL8211 series +integrated 10/100/1000 Gigabit Ethernet PHYs. +.Pp +In order to get a list of media types and options supported by a specific +instance of the +.Nm +driver, run +.Li ifconfig -m +on the instance of its parent MAC driver. +.Pp +Additionally, +the +.Nm +driver supports the following special media option: +.Bl -tag -width ".Cm flag0" +.It Cm flag0 +When manually setting media type and options via +.Xr ifconfig 8 , +the +.Nm +driver by default also triggers an autonegotiation advertising the selected +media. +This is done in order to work around hardware issues in certain scenarios. +It is believed that this behavior does not cause harm in general but in fact +can have an adverse effect in edge cases. +In order to manually set the media type and options without also triggering +an autonegotiation, +the +.Nm +driver allows to turn this behavior off via the +.Cm flag0 +media option. +.El +.Pp +Note that this special media option will not show up in the output of +.Xr ifconfig 8 , +even when set. +.Sh EXAMPLES +Manually set 100BASE-TX full-duplex without also triggering an +autonegotiation: +.Pp +.Dl "ifconfig re0 media 100baseTX mediaopt full-duplex,flag0" +.Sh SEE ALSO +.\".Xr ifmedia 4 , +.Xr intro 4 , +.Xr miibus 4 , +.Xr ifconfig 8 Modified: projects/binutils-2.17/share/man/man4/sge.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/sge.4 Thu Jan 20 19:17:05 2011 (r217653) +++ projects/binutils-2.17/share/man/man4/sge.4 Thu Jan 20 19:20:10 2011 (r217654) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 10, 2010 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Jan 20 21:11:45 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E564C1065670; Thu, 20 Jan 2011 21:11:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D4E358FC0C; Thu, 20 Jan 2011 21:11:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0KLBjnP028126; Thu, 20 Jan 2011 21:11:45 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0KLBjA8028124; Thu, 20 Jan 2011 21:11:45 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201101202111.p0KLBjA8028124@svn.freebsd.org> From: Dimitry Andric Date: Thu, 20 Jan 2011 21:11:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217660 - projects/binutils-2.17/contrib/binutils/bfd X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2011 21:11:46 -0000 Author: dim Date: Thu Jan 20 21:11:45 2011 New Revision: 217660 URL: http://svn.freebsd.org/changeset/base/217660 Log: In contrib/binutils/bfd/config.bfd, add proper targ_defvec and targ_selvecs for ia64. This is needed to let BFD select the correct default vector from our target triple "ia64-unknown-freebsd". Modified: projects/binutils-2.17/contrib/binutils/bfd/config.bfd Modified: projects/binutils-2.17/contrib/binutils/bfd/config.bfd ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/config.bfd Thu Jan 20 20:23:03 2011 (r217659) +++ projects/binutils-2.17/contrib/binutils/bfd/config.bfd Thu Jan 20 21:11:45 2011 (r217660) @@ -176,7 +176,12 @@ case "${targ}" in targ_defvec=ecoffalpha_little_vec want64=true ;; - ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu) + ia64*-*-freebsd* | ia64*-*-kfreebsd*-gnu) + targ_defvec=bfd_elf64_ia64_freebsd_vec + targ_selvecs="bfd_elf64_ia64_little_vec bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec" + want64=true + ;; + ia64*-*-netbsd* | ia64*-*-linux-* | ia64*-*-elf*) targ_defvec=bfd_elf64_ia64_little_vec targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec" want64=true From owner-svn-src-projects@FreeBSD.ORG Thu Jan 20 22:54:10 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C12C9106566C; Thu, 20 Jan 2011 22:54:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B10588FC0C; Thu, 20 Jan 2011 22:54:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0KMsAPh030599; Thu, 20 Jan 2011 22:54:10 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0KMsAOB030597; Thu, 20 Jan 2011 22:54:10 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201101202254.p0KMsAOB030597@svn.freebsd.org> From: Warner Losh Date: Thu, 20 Jan 2011 22:54:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217662 - projects/graid/head/sys/geom/raid X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jan 2011 22:54:10 -0000 Author: imp Date: Thu Jan 20 22:54:10 2011 New Revision: 217662 URL: http://svn.freebsd.org/changeset/base/217662 Log: RAID1 is overloaded. Document how here. Modified: projects/graid/head/sys/geom/raid/md_intel.c Modified: projects/graid/head/sys/geom/raid/md_intel.c ============================================================================== --- projects/graid/head/sys/geom/raid/md_intel.c Thu Jan 20 21:25:16 2011 (r217661) +++ projects/graid/head/sys/geom/raid/md_intel.c Thu Jan 20 22:54:10 2011 (r217662) @@ -773,9 +773,9 @@ g_raid_md_intel_start(struct g_raid_soft if (mmap->type == INTEL_T_RAID0) vol->v_raid_level = G_RAID_VOLUME_RL_RAID0; else if (mmap->type == INTEL_T_RAID1 && - mmap->total_disks < 4) + mmap->total_disks < 4) /* >= 4 disks -> RAID10 */ vol->v_raid_level = G_RAID_VOLUME_RL_RAID1; - else if (mmap->type == INTEL_T_RAID1) + else if (mmap->type == INTEL_T_RAID1) /* SIC */ vol->v_raid_level = G_RAID_VOLUME_RL_RAID10; else if (mmap->type == INTEL_T_RAID5) vol->v_raid_level = G_RAID_VOLUME_RL_RAID5; From owner-svn-src-projects@FreeBSD.ORG Sat Jan 22 22:18:49 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B1EB106564A; Sat, 22 Jan 2011 22:18:49 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 356C58FC15; Sat, 22 Jan 2011 22:18:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0MMInXP006213; Sat, 22 Jan 2011 22:18:49 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0MMImYK006179; Sat, 22 Jan 2011 22:18:48 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201101222218.p0MMImYK006179@svn.freebsd.org> From: Attilio Rao Date: Sat, 22 Jan 2011 22:18:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217728 - in projects/sv: . bin/ps bin/sh cddl/contrib/opensolaris/lib/libzpool/common/sys contrib/binutils/ld contrib/binutils/ld/emultempl contrib/gcc/config/rs6000 contrib/groff/tmac... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Jan 2011 22:18:49 -0000 Author: attilio Date: Sat Jan 22 22:18:47 2011 New Revision: 217728 URL: http://svn.freebsd.org/changeset/base/217728 Log: MFC Added: - copied from r217727, head/contrib/dialog/ projects/sv/gnu/lib/libodialog/ - copied from r217727, head/gnu/lib/libodialog/ projects/sv/sys/contrib/dev/acpica/compiler/asluuid.c - copied unchanged from r217727, head/sys/contrib/dev/acpica/compiler/asluuid.c projects/sv/sys/dev/ath/ath_hal/ah_diagcodes.h - copied unchanged from r217727, head/sys/dev/ath/ath_hal/ah_diagcodes.h projects/sv/sys/dev/ath/ath_hal/ar9001/ - copied from r217727, head/sys/dev/ath/ath_hal/ar9001/ projects/sv/sys/dev/ath/ath_hal/ar9002/ - copied from r217727, head/sys/dev/ath/ath_hal/ar9002/ projects/sv/sys/dev/ath/ath_hal/ar9003/ - copied from r217727, head/sys/dev/ath/ath_hal/ar9003/ projects/sv/sys/x86/include/_inttypes.h - copied unchanged from r217727, head/sys/x86/include/_inttypes.h projects/sv/tools/tools/ath/ath_ee_v14_print/ - copied from r217727, head/tools/tools/ath/ath_ee_v14_print/ Directory Properties: projects/sv/contrib/dialog/ (props changed) Deleted: projects/sv/gnu/lib/libdialog/CHANGES projects/sv/gnu/lib/libdialog/COPYING projects/sv/gnu/lib/libdialog/README projects/sv/gnu/lib/libdialog/TESTS/ projects/sv/gnu/lib/libdialog/TODO projects/sv/gnu/lib/libdialog/checklist.c projects/sv/gnu/lib/libdialog/colors.h projects/sv/gnu/lib/libdialog/dialog.3 projects/sv/gnu/lib/libdialog/dialog.h projects/sv/gnu/lib/libdialog/dialog.priv.h projects/sv/gnu/lib/libdialog/dir.c projects/sv/gnu/lib/libdialog/dir.h projects/sv/gnu/lib/libdialog/fselect.c projects/sv/gnu/lib/libdialog/gauge.c projects/sv/gnu/lib/libdialog/help.c projects/sv/gnu/lib/libdialog/inputbox.c projects/sv/gnu/lib/libdialog/kernel.c projects/sv/gnu/lib/libdialog/lineedit.c projects/sv/gnu/lib/libdialog/menubox.c projects/sv/gnu/lib/libdialog/msgbox.c projects/sv/gnu/lib/libdialog/notify.c projects/sv/gnu/lib/libdialog/prgbox.c projects/sv/gnu/lib/libdialog/radiolist.c projects/sv/gnu/lib/libdialog/raw_popen.c projects/sv/gnu/lib/libdialog/rc.c projects/sv/gnu/lib/libdialog/rc.h projects/sv/gnu/lib/libdialog/textbox.c projects/sv/gnu/lib/libdialog/tree.c projects/sv/gnu/lib/libdialog/ui_objects.c projects/sv/gnu/lib/libdialog/ui_objects.h projects/sv/gnu/lib/libdialog/yesno.c projects/sv/gnu/usr.bin/dialog/COPYING projects/sv/gnu/usr.bin/dialog/README projects/sv/gnu/usr.bin/dialog/README.lib projects/sv/gnu/usr.bin/dialog/TESTS/ projects/sv/gnu/usr.bin/dialog/dialog.1 projects/sv/gnu/usr.bin/dialog/dialog.c projects/sv/sys/conf/ldscript.mips.64 projects/sv/sys/conf/ldscript.mips.64.cfe projects/sv/sys/conf/ldscript.mips.n32 projects/sv/sys/conf/ldscript.mips.octeon1.32 projects/sv/sys/conf/ldscript.mips.octeon1.64 projects/sv/sys/conf/ldscript.mips.octeon1.n32 projects/sv/sys/dev/ath/ath_hal/ar5416/ar9160.ini projects/sv/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar9280.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar9280.h projects/sv/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini projects/sv/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini projects/sv/sys/dev/ath/ath_hal/ar5416/ar9285.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar9285.h projects/sv/sys/dev/ath/ath_hal/ar5416/ar9285.ini projects/sv/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini projects/sv/sys/netinet/sctp_cc_functions.h Modified: projects/sv/Makefile projects/sv/ObsoleteFiles.inc projects/sv/UPDATING projects/sv/bin/ps/print.c projects/sv/bin/sh/exec.c projects/sv/bin/sh/jobs.c projects/sv/bin/sh/main.c projects/sv/bin/sh/memalloc.c projects/sv/bin/sh/memalloc.h projects/sv/bin/sh/sh.1 projects/sv/bin/sh/trap.c projects/sv/bin/sh/trap.h projects/sv/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/sv/contrib/binutils/ld/emultempl/ppc64elf.em projects/sv/contrib/binutils/ld/ldemul.h projects/sv/contrib/gcc/config/rs6000/crtsavres.asm projects/sv/contrib/gcc/config/rs6000/freebsd.h projects/sv/contrib/gcc/config/rs6000/rs6000.c projects/sv/contrib/gcc/config/rs6000/tramp.asm projects/sv/contrib/groff/tmac/doc-common projects/sv/contrib/groff/tmac/doc-syms projects/sv/contrib/groff/tmac/groff_mdoc.man projects/sv/etc/defaults/rc.conf projects/sv/etc/mtree/BSD.usr.dist projects/sv/etc/mtree/README projects/sv/gnu/lib/Makefile projects/sv/gnu/lib/libdialog/Makefile projects/sv/gnu/usr.bin/dialog/Makefile projects/sv/gnu/usr.bin/groff/tmac/mdoc.local projects/sv/include/assert.h projects/sv/lib/bind/config.mk projects/sv/lib/csu/amd64/Makefile projects/sv/lib/csu/arm/Makefile projects/sv/lib/csu/common/crtbrand.c projects/sv/lib/csu/i386-elf/Makefile projects/sv/lib/csu/i386-elf/crt1_s.S projects/sv/lib/csu/ia64/Makefile projects/sv/lib/csu/mips/Makefile projects/sv/lib/csu/powerpc/Makefile projects/sv/lib/csu/powerpc/crti.S projects/sv/lib/csu/powerpc/crtn.S projects/sv/lib/csu/powerpc64/Makefile projects/sv/lib/csu/powerpc64/crti.S projects/sv/lib/csu/powerpc64/crtn.S projects/sv/lib/libc/gen/Symbol.map projects/sv/lib/libc/gen/dlfcn.c projects/sv/lib/libc/net/hesiod.c projects/sv/lib/libc/powerpc/gen/_ctx_start.S projects/sv/lib/libc/powerpc/gen/_setjmp.S projects/sv/lib/libc/powerpc/gen/fabs.S projects/sv/lib/libc/powerpc/gen/setjmp.S projects/sv/lib/libc/powerpc/gen/sigsetjmp.S projects/sv/lib/libc/powerpc/sys/brk.S projects/sv/lib/libc/powerpc/sys/cerror.S projects/sv/lib/libc/powerpc/sys/exect.S projects/sv/lib/libc/powerpc/sys/pipe.S projects/sv/lib/libc/powerpc/sys/ptrace.S projects/sv/lib/libc/powerpc/sys/sbrk.S projects/sv/lib/libc/powerpc/sys/setlogin.S projects/sv/lib/libc/powerpc64/gen/_ctx_start.S projects/sv/lib/libc/powerpc64/gen/_setjmp.S projects/sv/lib/libc/powerpc64/gen/fabs.S projects/sv/lib/libc/powerpc64/gen/setjmp.S projects/sv/lib/libc/powerpc64/gen/sigsetjmp.S projects/sv/lib/libc/powerpc64/sys/brk.S projects/sv/lib/libc/powerpc64/sys/cerror.S projects/sv/lib/libc/powerpc64/sys/exect.S projects/sv/lib/libc/powerpc64/sys/pipe.S projects/sv/lib/libc/powerpc64/sys/ptrace.S projects/sv/lib/libc/powerpc64/sys/sbrk.S projects/sv/lib/libc/powerpc64/sys/setlogin.S projects/sv/lib/libc/stdlib/realpath.c projects/sv/lib/libc/sys/getgroups.2 projects/sv/lib/libc/sys/mknod.2 projects/sv/lib/libcompiler_rt/Makefile projects/sv/lib/libfetch/ftp.c projects/sv/lib/libjail/jail.c projects/sv/lib/libthr/pthread.map projects/sv/lib/libthr/thread/thr_create.c projects/sv/lib/libthr/thread/thr_private.h projects/sv/lib/libthr/thread/thr_rtld.c projects/sv/lib/libthr/thread/thr_sig.c projects/sv/lib/libthr/thread/thr_stack.c projects/sv/libexec/rtld-elf/Symbol.map projects/sv/libexec/rtld-elf/map_object.c projects/sv/libexec/rtld-elf/powerpc/rtld_start.S projects/sv/libexec/rtld-elf/powerpc64/rtld_start.S projects/sv/libexec/rtld-elf/rtld.c projects/sv/libexec/rtld-elf/rtld.h projects/sv/release/amd64/boot_crunch.conf projects/sv/release/i386/boot_crunch.conf projects/sv/release/ia64/boot_crunch.conf projects/sv/release/pc98/boot_crunch.conf projects/sv/release/powerpc/boot_crunch.conf projects/sv/release/sparc64/boot_crunch.conf projects/sv/release/sun4v/boot_crunch.conf projects/sv/sbin/fdisk/fdisk.c projects/sv/sbin/geom/class/part/gpart.8 projects/sv/sbin/geom/class/raid3/geom_raid3.c projects/sv/sbin/geom/class/raid3/graid3.8 projects/sv/sbin/growfs/growfs.c projects/sv/sbin/hastd/hastd.c projects/sv/sbin/hastd/hooks.c projects/sv/sbin/sysctl/sysctl.8 projects/sv/sbin/sysctl/sysctl.c projects/sv/share/examples/kld/dyn_sysctl/dyn_sysctl.c projects/sv/share/man/man3/queue.3 projects/sv/share/man/man4/Makefile projects/sv/share/man/man4/axe.4 projects/sv/share/man/man4/miibus.4 projects/sv/share/man/man4/nfe.4 projects/sv/share/man/man4/nve.4 projects/sv/share/man/man4/re.4 projects/sv/share/man/man4/run.4 projects/sv/share/man/man4/sge.4 projects/sv/share/man/man4/uplcom.4 projects/sv/share/man/man5/devfs.5 projects/sv/share/man/man5/rc.conf.5 projects/sv/share/man/man5/xfs.5 projects/sv/share/man/man9/Makefile projects/sv/share/man/man9/make_dev.9 projects/sv/share/man/man9/sleep.9 projects/sv/share/man/man9/sysctl.9 projects/sv/share/misc/bsd-family-tree projects/sv/share/misc/committers-doc.dot projects/sv/share/mk/bsd.libnames.mk projects/sv/sys/amd64/acpica/acpi_machdep.c projects/sv/sys/amd64/amd64/amd64_mem.c projects/sv/sys/amd64/amd64/apic_vector.S projects/sv/sys/amd64/amd64/elf_machdep.c projects/sv/sys/amd64/amd64/machdep.c projects/sv/sys/amd64/amd64/mem.c projects/sv/sys/amd64/amd64/mp_machdep.c projects/sv/sys/amd64/amd64/sys_machdep.c projects/sv/sys/amd64/ia32/ia32_signal.c projects/sv/sys/amd64/include/_inttypes.h projects/sv/sys/amd64/include/_limits.h projects/sv/sys/amd64/include/_stdint.h projects/sv/sys/amd64/include/memdev.h projects/sv/sys/amd64/include/vmparam.h projects/sv/sys/amd64/linux32/linux32_sysvec.c projects/sv/sys/arm/arm/mem.c projects/sv/sys/arm/arm/vm_machdep.c projects/sv/sys/arm/at91/at91_machdep.c projects/sv/sys/arm/econa/econa_machdep.c projects/sv/sys/arm/econa/ehci_ebus.c projects/sv/sys/arm/econa/ohci_ec.c projects/sv/sys/arm/include/_limits.h projects/sv/sys/arm/include/_stdint.h projects/sv/sys/arm/include/_types.h projects/sv/sys/arm/include/memdev.h projects/sv/sys/arm/include/metadata.h projects/sv/sys/arm/include/vmparam.h projects/sv/sys/arm/mv/mv_machdep.c projects/sv/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/sv/sys/arm/xscale/i80321/ep80219_machdep.c projects/sv/sys/arm/xscale/i80321/iq31244_machdep.c projects/sv/sys/arm/xscale/i8134x/crb_machdep.c projects/sv/sys/arm/xscale/ixp425/avila_machdep.c projects/sv/sys/arm/xscale/pxa/pxa_machdep.c projects/sv/sys/boot/arm/at91/boot0/linker.cfg projects/sv/sys/boot/arm/at91/linker.cfg projects/sv/sys/boot/common/loader.8 projects/sv/sys/boot/forth/beastie.4th projects/sv/sys/boot/forth/loader.conf projects/sv/sys/boot/powerpc/ofw/ldscript.powerpc projects/sv/sys/boot/powerpc/ps3/ldscript.powerpc projects/sv/sys/cam/ata/ata_xpt.c projects/sv/sys/cam/cam_periph.c projects/sv/sys/cam/cam_xpt.c projects/sv/sys/cam/scsi/scsi_da.c projects/sv/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c projects/sv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/sv/sys/compat/freebsd32/freebsd32_misc.c projects/sv/sys/compat/ia32/ia32_sysvec.c projects/sv/sys/compat/ia32/ia32_util.h projects/sv/sys/compat/linux/linux_file.c projects/sv/sys/compat/ndis/subr_ntoskrnl.c projects/sv/sys/conf/Makefile.mips projects/sv/sys/conf/files projects/sv/sys/conf/files.amd64 projects/sv/sys/conf/files.i386 projects/sv/sys/conf/files.pc98 projects/sv/sys/conf/files.powerpc projects/sv/sys/conf/ldscript.mips.cfe projects/sv/sys/conf/ldscript.mips.mips64 (contents, props changed) projects/sv/sys/conf/ldscript.powerpc projects/sv/sys/conf/ldscript.powerpc64 projects/sv/sys/conf/ldscript.sparc64 projects/sv/sys/conf/options projects/sv/sys/contrib/dev/acpica/acpica_prep.sh projects/sv/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/adfile.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/adisasm.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/adwalk.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/dmextern.c projects/sv/sys/contrib/dev/acpica/common/dmrestag.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/dmtable.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/dmtbdump.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/dmtbinfo.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/common/getopt.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslanalyze.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslcodegen.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslcompile.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslcompiler.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslcompiler.l (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslcompiler.y (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asldefine.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslerror.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslfiles.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslfold.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslglobal.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asllength.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asllisting.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslload.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asllookup.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslmain.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslmap.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslmessages.h projects/sv/sys/contrib/dev/acpica/compiler/aslopcodes.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asloperands.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslopt.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslpredef.c projects/sv/sys/contrib/dev/acpica/compiler/aslresource.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslrestype1.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslrestype1i.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2d.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2e.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2q.c projects/sv/sys/contrib/dev/acpica/compiler/aslrestype2w.c projects/sv/sys/contrib/dev/acpica/compiler/aslstartup.c projects/sv/sys/contrib/dev/acpica/compiler/aslstubs.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asltransform.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asltree.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/asltypes.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/aslutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/compiler/dtcompile.c projects/sv/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/sv/sys/contrib/dev/acpica/compiler/dtfield.c projects/sv/sys/contrib/dev/acpica/compiler/dtio.c projects/sv/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/sv/sys/contrib/dev/acpica/compiler/dttable.c projects/sv/sys/contrib/dev/acpica/compiler/dttemplate.c projects/sv/sys/contrib/dev/acpica/compiler/dttemplate.h projects/sv/sys/contrib/dev/acpica/compiler/dtutils.c projects/sv/sys/contrib/dev/acpica/debugger/dbcmds.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbdisply.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbexec.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbfileio.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbhistry.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbinput.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbstats.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/debugger/dbxface.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmbuffer.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmnames.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmobject.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmopcode.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmresrc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmresrcl.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmresrcs.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/disassembler/dmwalk.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsfield.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsinit.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsmethod.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsmthdat.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsobject.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsopcode.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dsutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dswexec.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dswload.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dswscope.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/dispatcher/dswstate.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evevent.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evgpe.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evgpeblk.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evgpeinit.c projects/sv/sys/contrib/dev/acpica/events/evgpeutil.c projects/sv/sys/contrib/dev/acpica/events/evmisc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evregion.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evrgnini.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evsci.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evxface.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evxfevnt.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/events/evxfgpe.c projects/sv/sys/contrib/dev/acpica/events/evxfregn.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exconfig.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exconvrt.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/excreate.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exdebug.c projects/sv/sys/contrib/dev/acpica/executer/exdump.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exfield.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exfldio.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exmisc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exmutex.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exnames.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exoparg1.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exoparg2.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exoparg3.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exoparg6.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exprep.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exregion.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exresnte.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exresolv.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exresop.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exstore.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exstoren.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exstorob.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exsystem.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/executer/exutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/hardware/hwacpi.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/hardware/hwgpe.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/hardware/hwpci.c projects/sv/sys/contrib/dev/acpica/hardware/hwregs.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/hardware/hwsleep.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/hardware/hwtimer.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/hardware/hwvalid.c projects/sv/sys/contrib/dev/acpica/hardware/hwxface.c projects/sv/sys/contrib/dev/acpica/include/acapps.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/accommon.h projects/sv/sys/contrib/dev/acpica/include/acconfig.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acdebug.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acdisasm.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acdispat.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acevents.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acexcep.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acglobal.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/achware.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acinterp.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/aclocal.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acmacros.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acnames.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acnamesp.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acobject.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acopcode.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acoutput.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acparser.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acpi.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acpiosxf.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acpixf.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acpredef.h projects/sv/sys/contrib/dev/acpica/include/acresrc.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acrestyp.h projects/sv/sys/contrib/dev/acpica/include/acstruct.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/actables.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/actbl.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/actbl1.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/actbl2.h projects/sv/sys/contrib/dev/acpica/include/actypes.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/acutils.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/amlcode.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/amlresrc.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/platform/acenv.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/platform/acfreebsd.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/include/platform/acgcc.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsaccess.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsalloc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsdump.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsdumpdv.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nseval.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsinit.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsload.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsnames.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsobject.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsparse.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nspredef.c projects/sv/sys/contrib/dev/acpica/namespace/nsrepair.c projects/sv/sys/contrib/dev/acpica/namespace/nsrepair2.c projects/sv/sys/contrib/dev/acpica/namespace/nssearch.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nswalk.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsxfeval.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsxfname.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/namespace/nsxfobj.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/osunixxf.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psargs.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psloop.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psopcode.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psparse.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psscope.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/pstree.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/pswalk.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/parser/psxface.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsaddr.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rscalc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rscreate.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsdump.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsinfo.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsio.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsirq.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rslist.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsmemory.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsmisc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/resources/rsxface.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tables/tbfadt.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tables/tbfind.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tables/tbinstal.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tables/tbutils.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tables/tbxface.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tables/tbxfroot.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utalloc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utcache.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utcopy.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utdebug.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utdelete.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/uteval.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utglobal.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utids.c projects/sv/sys/contrib/dev/acpica/utilities/utinit.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utlock.c projects/sv/sys/contrib/dev/acpica/utilities/utmath.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utmisc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utmutex.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utobject.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utresrc.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utstate.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/uttrack.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utxface.c (contents, props changed) projects/sv/sys/contrib/dev/acpica/utilities/utxferror.c projects/sv/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/sv/sys/contrib/octeon-sdk/cvmx-mgmt-port.c projects/sv/sys/contrib/octeon-sdk/cvmx-mgmt-port.h projects/sv/sys/contrib/pf/net/pf_osfp.c projects/sv/sys/ddb/db_capture.c projects/sv/sys/dev/acpi_support/acpi_ibm.c projects/sv/sys/dev/acpi_support/atk0110.c projects/sv/sys/dev/acpica/Osd/OsdInterrupt.c projects/sv/sys/dev/acpica/Osd/OsdSchedule.c projects/sv/sys/dev/acpica/acpi.c projects/sv/sys/dev/acpica/acpi_pci.c projects/sv/sys/dev/acpica/acpi_video.c projects/sv/sys/dev/acpica/acpivar.h projects/sv/sys/dev/ae/if_ae.c projects/sv/sys/dev/age/if_age.c projects/sv/sys/dev/ahci/ahci.c projects/sv/sys/dev/alc/if_alc.c projects/sv/sys/dev/alc/if_alcreg.h projects/sv/sys/dev/alc/if_alcvar.h projects/sv/sys/dev/ale/if_ale.c projects/sv/sys/dev/ale/if_alevar.h projects/sv/sys/dev/ath/ath_hal/ah.c projects/sv/sys/dev/ath/ath_hal/ah.h projects/sv/sys/dev/ath/ath_hal/ah_devid.h projects/sv/sys/dev/ath/ath_hal/ah_eeprom.h projects/sv/sys/dev/ath/ath_hal/ah_eeprom_v14.c projects/sv/sys/dev/ath/ath_hal/ah_eeprom_v14.h projects/sv/sys/dev/ath/ath_hal/ah_eeprom_v4k.c projects/sv/sys/dev/ath/ath_hal/ah_internal.h projects/sv/sys/dev/ath/ath_hal/ar5210/ar5210.h projects/sv/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/sv/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c projects/sv/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c projects/sv/sys/dev/ath/ath_hal/ar5211/ar5211.h projects/sv/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/sv/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c projects/sv/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c projects/sv/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/sv/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/sv/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/sv/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/sv/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/sv/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c projects/sv/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/sv/sys/dev/ath/ath_rate/sample/sample.c projects/sv/sys/dev/ath/ath_rate/sample/sample.h projects/sv/sys/dev/ath/if_ath.c projects/sv/sys/dev/ath/if_athioctl.h projects/sv/sys/dev/ath/if_athvar.h projects/sv/sys/dev/bce/if_bce.c projects/sv/sys/dev/bge/if_bge.c projects/sv/sys/dev/buslogic/bt.c projects/sv/sys/dev/bwi/if_bwi.c projects/sv/sys/dev/bwn/if_bwn.c projects/sv/sys/dev/cs/if_cs.c projects/sv/sys/dev/cxgb/cxgb_main.c projects/sv/sys/dev/cxgb/cxgb_sge.c projects/sv/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/sv/sys/dev/dc/dcphy.c projects/sv/sys/dev/dc/pnphy.c projects/sv/sys/dev/e1000/if_em.c projects/sv/sys/dev/e1000/if_igb.c projects/sv/sys/dev/e1000/if_lem.c projects/sv/sys/dev/ed/if_ed.c projects/sv/sys/dev/en/midway.c projects/sv/sys/dev/fatm/if_fatm.c projects/sv/sys/dev/if_ndis/if_ndis_usb.c projects/sv/sys/dev/iicbus/ds1775.c projects/sv/sys/dev/iicbus/max6690.c projects/sv/sys/dev/iscsi/initiator/isc_sm.c projects/sv/sys/dev/iscsi/initiator/iscsi.c projects/sv/sys/dev/iwi/if_iwi.c projects/sv/sys/dev/iwn/if_iwn.c projects/sv/sys/dev/ixgbe/ixgbe.c projects/sv/sys/dev/ixgbe/ixgbe.h projects/sv/sys/dev/ixgbe/ixgbe_82599.c projects/sv/sys/dev/ixgbe/ixgbe_api.h projects/sv/sys/dev/ixgbe/ixgbe_common.c projects/sv/sys/dev/ixgbe/ixgbe_common.h projects/sv/sys/dev/ixgbe/ixgbe_type.h projects/sv/sys/dev/jme/if_jme.c projects/sv/sys/dev/jme/if_jmevar.h projects/sv/sys/dev/md/md.c projects/sv/sys/dev/mem/memdev.c projects/sv/sys/dev/mem/memutil.c projects/sv/sys/dev/mii/atphy.c projects/sv/sys/dev/mii/brgphy.c projects/sv/sys/dev/mii/ciphy.c projects/sv/sys/dev/mii/e1000phy.c projects/sv/sys/dev/mii/ip1000phy.c projects/sv/sys/dev/mii/jmphy.c projects/sv/sys/dev/mii/mii_physubr.c projects/sv/sys/dev/mii/rgephy.c projects/sv/sys/dev/mii/xmphy.c projects/sv/sys/dev/mmc/mmc.c projects/sv/sys/dev/mps/mps.c projects/sv/sys/dev/mpt/mpt.c projects/sv/sys/dev/mpt/mpt_raid.c projects/sv/sys/dev/msk/if_msk.c projects/sv/sys/dev/nfe/if_nfe.c projects/sv/sys/dev/patm/if_patm_attach.c projects/sv/sys/dev/pccbb/pccbb.c projects/sv/sys/dev/ral/rt2560.c projects/sv/sys/dev/ral/rt2661.c projects/sv/sys/dev/re/if_re.c projects/sv/sys/dev/sis/if_sis.c projects/sv/sys/dev/sound/pcm/buffer.c projects/sv/sys/dev/sound/pcm/sound.c projects/sv/sys/dev/sound/usb/uaudio.c projects/sv/sys/dev/ste/if_ste.c projects/sv/sys/dev/txp/if_txp.c projects/sv/sys/dev/uart/uart_bus_fdt.c projects/sv/sys/dev/usb/controller/at91dci.c projects/sv/sys/dev/usb/controller/at91dci_atmelarm.c projects/sv/sys/dev/usb/controller/atmegadci.c projects/sv/sys/dev/usb/controller/atmegadci_atmelarm.c projects/sv/sys/dev/usb/controller/avr32dci.c projects/sv/sys/dev/usb/controller/ehci.c projects/sv/sys/dev/usb/controller/ehci_ixp4xx.c projects/sv/sys/dev/usb/controller/ehci_mv.c projects/sv/sys/dev/usb/controller/ehci_pci.c projects/sv/sys/dev/usb/controller/musb_otg.c projects/sv/sys/dev/usb/controller/musb_otg_atmelarm.c projects/sv/sys/dev/usb/controller/ohci.c projects/sv/sys/dev/usb/controller/ohci_atmelarm.c projects/sv/sys/dev/usb/controller/ohci_pci.c projects/sv/sys/dev/usb/controller/ohci_s3c24x0.c projects/sv/sys/dev/usb/controller/uhci.c projects/sv/sys/dev/usb/controller/uhci_pci.c projects/sv/sys/dev/usb/controller/usb_controller.c projects/sv/sys/dev/usb/controller/uss820dci.c projects/sv/sys/dev/usb/controller/uss820dci_atmelarm.c projects/sv/sys/dev/usb/controller/xhci.c projects/sv/sys/dev/usb/controller/xhci.h projects/sv/sys/dev/usb/controller/xhci_pci.c projects/sv/sys/dev/usb/input/atp.c projects/sv/sys/dev/usb/input/uhid.c projects/sv/sys/dev/usb/input/ukbd.c projects/sv/sys/dev/usb/input/ums.c projects/sv/sys/dev/usb/misc/udbp.c projects/sv/sys/dev/usb/misc/ufm.c projects/sv/sys/dev/usb/net/if_aue.c projects/sv/sys/dev/usb/net/if_axe.c projects/sv/sys/dev/usb/net/if_cdce.c projects/sv/sys/dev/usb/net/if_cue.c projects/sv/sys/dev/usb/net/if_ipheth.c projects/sv/sys/dev/usb/net/if_kue.c projects/sv/sys/dev/usb/net/if_rue.c projects/sv/sys/dev/usb/net/if_udav.c projects/sv/sys/dev/usb/net/usb_ethernet.c projects/sv/sys/dev/usb/quirk/usb_quirk.c projects/sv/sys/dev/usb/serial/u3g.c projects/sv/sys/dev/usb/serial/uark.c projects/sv/sys/dev/usb/serial/ubsa.c projects/sv/sys/dev/usb/serial/ubser.c projects/sv/sys/dev/usb/serial/uchcom.c projects/sv/sys/dev/usb/serial/ucycom.c projects/sv/sys/dev/usb/serial/ufoma.c projects/sv/sys/dev/usb/serial/uftdi.c projects/sv/sys/dev/usb/serial/ugensa.c projects/sv/sys/dev/usb/serial/uipaq.c projects/sv/sys/dev/usb/serial/ulpt.c projects/sv/sys/dev/usb/serial/umct.c projects/sv/sys/dev/usb/serial/umodem.c projects/sv/sys/dev/usb/serial/umoscom.c projects/sv/sys/dev/usb/serial/uplcom.c projects/sv/sys/dev/usb/serial/usb_serial.c projects/sv/sys/dev/usb/serial/uslcom.c projects/sv/sys/dev/usb/serial/uvisor.c projects/sv/sys/dev/usb/serial/uvscom.c projects/sv/sys/dev/usb/storage/umass.c projects/sv/sys/dev/usb/storage/urio.c projects/sv/sys/dev/usb/storage/ustorage_fs.c projects/sv/sys/dev/usb/template/usb_template.c projects/sv/sys/dev/usb/template/usb_template_cdce.c projects/sv/sys/dev/usb/template/usb_template_msc.c projects/sv/sys/dev/usb/template/usb_template_mtp.c projects/sv/sys/dev/usb/usb_busdma.c projects/sv/sys/dev/usb/usb_compat_linux.c projects/sv/sys/dev/usb/usb_core.c projects/sv/sys/dev/usb/usb_debug.c projects/sv/sys/dev/usb/usb_dev.c projects/sv/sys/dev/usb/usb_device.c projects/sv/sys/dev/usb/usb_dynamic.c projects/sv/sys/dev/usb/usb_error.c projects/sv/sys/dev/usb/usb_freebsd.h projects/sv/sys/dev/usb/usb_generic.c projects/sv/sys/dev/usb/usb_handle_request.c projects/sv/sys/dev/usb/usb_hid.c projects/sv/sys/dev/usb/usb_hub.c projects/sv/sys/dev/usb/usb_lookup.c projects/sv/sys/dev/usb/usb_mbuf.c projects/sv/sys/dev/usb/usb_msctest.c projects/sv/sys/dev/usb/usb_parse.c projects/sv/sys/dev/usb/usb_process.c projects/sv/sys/dev/usb/usb_process.h projects/sv/sys/dev/usb/usb_request.c projects/sv/sys/dev/usb/usb_transfer.c projects/sv/sys/dev/usb/usb_util.c projects/sv/sys/dev/usb/usbdevs projects/sv/sys/dev/usb/wlan/if_rum.c projects/sv/sys/dev/usb/wlan/if_run.c projects/sv/sys/dev/usb/wlan/if_ural.c projects/sv/sys/dev/wi/if_wi.c projects/sv/sys/dev/wpi/if_wpi.c projects/sv/sys/dev/xen/netback/netback.c projects/sv/sys/fs/ext2fs/ext2_alloc.c projects/sv/sys/fs/ext2fs/ext2_dinode.h projects/sv/sys/fs/ext2fs/ext2_lookup.c projects/sv/sys/fs/ext2fs/ext2_subr.c projects/sv/sys/fs/ext2fs/ext2_vfsops.c projects/sv/sys/fs/ext2fs/ext2fs.h projects/sv/sys/fs/ext2fs/inode.h projects/sv/sys/fs/nfs/nfs_commonsubs.c projects/sv/sys/fs/nfs/nfs_var.h projects/sv/sys/fs/nfsserver/nfs_nfsdcache.c projects/sv/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/sv/sys/fs/nfsserver/nfs_nfsdport.c projects/sv/sys/fs/nfsserver/nfs_nfsdstate.c projects/sv/sys/fs/tmpfs/tmpfs_subr.c projects/sv/sys/fs/tmpfs/tmpfs_vnops.c projects/sv/sys/geom/nop/g_nop.c projects/sv/sys/geom/part/g_part_gpt.c projects/sv/sys/geom/raid3/g_raid3.c projects/sv/sys/geom/sched/g_sched.c projects/sv/sys/geom/sched/gs_rr.c projects/sv/sys/i386/i386/apic_vector.s projects/sv/sys/i386/i386/i686_mem.c projects/sv/sys/i386/i386/machdep.c projects/sv/sys/i386/i386/mem.c projects/sv/sys/i386/i386/pmap.c projects/sv/sys/i386/i386/sys_machdep.c projects/sv/sys/i386/i386/vm86bios.s projects/sv/sys/i386/i386/vm_machdep.c projects/sv/sys/i386/include/_inttypes.h projects/sv/sys/i386/include/_limits.h projects/sv/sys/i386/include/_stdint.h projects/sv/sys/i386/include/_types.h projects/sv/sys/i386/include/memdev.h projects/sv/sys/i386/include/vmparam.h projects/sv/sys/i386/xen/pmap.c projects/sv/sys/ia64/acpica/OsdEnvironment.c projects/sv/sys/ia64/ia64/machdep.c projects/sv/sys/ia64/ia64/mem.c projects/sv/sys/ia64/include/_limits.h projects/sv/sys/ia64/include/_stdint.h projects/sv/sys/ia64/include/float.h projects/sv/sys/ia64/include/memdev.h projects/sv/sys/ia64/include/vmparam.h projects/sv/sys/kern/imgact_elf.c projects/sv/sys/kern/kern_clocksource.c projects/sv/sys/kern/kern_et.c projects/sv/sys/kern/kern_exec.c projects/sv/sys/kern/kern_hhook.c projects/sv/sys/kern/kern_intr.c projects/sv/sys/kern/kern_linker.c projects/sv/sys/kern/kern_lock.c projects/sv/sys/kern/kern_mib.c projects/sv/sys/kern/kern_ntptime.c projects/sv/sys/kern/kern_sx.c projects/sv/sys/kern/kern_sysctl.c projects/sv/sys/kern/kern_tc.c projects/sv/sys/kern/kern_timeout.c projects/sv/sys/kern/sched_4bsd.c projects/sv/sys/kern/sched_ule.c projects/sv/sys/kern/subr_bus.c projects/sv/sys/kern/subr_clock.c projects/sv/sys/kern/subr_kobj.c projects/sv/sys/kern/subr_lock.c projects/sv/sys/kern/subr_param.c projects/sv/sys/kern/subr_pcpu.c projects/sv/sys/kern/subr_sleepqueue.c projects/sv/sys/kern/subr_smp.c projects/sv/sys/kern/sysv_msg.c projects/sv/sys/kern/sysv_sem.c projects/sv/sys/kern/sysv_shm.c projects/sv/sys/kern/uipc_usrreq.c projects/sv/sys/kern/vfs_mountroot.c projects/sv/sys/kern/vfs_subr.c projects/sv/sys/mips/cavium/ciu.c projects/sv/sys/mips/cavium/cryptocteon/cavium_crypto.c projects/sv/sys/mips/cavium/cvmx_config.h projects/sv/sys/mips/cavium/files.octeon1 projects/sv/sys/mips/cavium/octe/ethernet-defines.h projects/sv/sys/mips/cavium/octe/ethernet-rx.c projects/sv/sys/mips/cavium/octe/ethernet-tx.c projects/sv/sys/mips/cavium/octe/ethernet.c projects/sv/sys/mips/cavium/octeon_machdep.c projects/sv/sys/mips/cavium/octopci.c projects/sv/sys/mips/cavium/uart_bus_octeonusart.c projects/sv/sys/mips/cavium/usb/octusb.c projects/sv/sys/mips/cavium/usb/octusb_octeon.c projects/sv/sys/mips/conf/MALTA64 projects/sv/sys/mips/conf/OCTEON1 projects/sv/sys/mips/conf/SWARM64 projects/sv/sys/mips/conf/SWARM64_SMP projects/sv/sys/mips/conf/XLR projects/sv/sys/mips/conf/XLR64 projects/sv/sys/mips/conf/XLRN32 projects/sv/sys/mips/include/_inttypes.h projects/sv/sys/mips/include/_limits.h projects/sv/sys/mips/include/_stdint.h projects/sv/sys/mips/include/_types.h projects/sv/sys/mips/include/cpufunc.h projects/sv/sys/mips/include/md_var.h projects/sv/sys/mips/include/memdev.h projects/sv/sys/mips/include/param.h projects/sv/sys/mips/include/pmap.h projects/sv/sys/mips/include/proc.h projects/sv/sys/mips/include/pte.h projects/sv/sys/mips/include/vmparam.h projects/sv/sys/mips/mips/dump_machdep.c projects/sv/sys/mips/mips/exception.S projects/sv/sys/mips/mips/machdep.c projects/sv/sys/mips/mips/mem.c projects/sv/sys/mips/mips/pmap.c projects/sv/sys/mips/mips/swtch.S projects/sv/sys/mips/mips/tick.c projects/sv/sys/mips/mips/trap.c projects/sv/sys/mips/mips/vm_machdep.c projects/sv/sys/mips/rmi/pic.h projects/sv/sys/mips/rmi/std.xlr projects/sv/sys/mips/rmi/tick.c projects/sv/sys/mips/rmi/xlr_machdep.c projects/sv/sys/mips/rmi/xlr_pci.c projects/sv/sys/mips/rmi/xls_ehci.c projects/sv/sys/modules/ath/Makefile projects/sv/sys/modules/mem/Makefile projects/sv/sys/net/if.c projects/sv/sys/net/if_enc.c projects/sv/sys/net/netisr.c projects/sv/sys/net/route.c projects/sv/sys/net/vnet.c projects/sv/sys/net/vnet.h projects/sv/sys/net80211/ieee80211_amrr.c projects/sv/sys/net80211/ieee80211_freebsd.c projects/sv/sys/net80211/ieee80211_mesh.c projects/sv/sys/net80211/ieee80211_node.c projects/sv/sys/netgraph/bluetooth/common/ng_bluetooth.c projects/sv/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c projects/sv/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c projects/sv/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c projects/sv/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/sv/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/sv/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/sv/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c projects/sv/sys/netgraph/ng_socket.c projects/sv/sys/netinet/if_ether.c projects/sv/sys/netinet/in_pcb.c projects/sv/sys/netinet/ip_divert.c projects/sv/sys/netinet/ipfw/ip_dn_io.c projects/sv/sys/netinet/ipfw/ip_dummynet.c projects/sv/sys/netinet/ipfw/ip_fw_dynamic.c projects/sv/sys/netinet/raw_ip.c projects/sv/sys/netinet/sctp_cc_functions.c projects/sv/sys/netinet/sctp_constants.h projects/sv/sys/netinet/sctp_pcb.c projects/sv/sys/netinet/sctp_sysctl.c projects/sv/sys/netinet/sctp_uio.h projects/sv/sys/netinet/sctp_usrreq.c projects/sv/sys/netinet/sctputil.c projects/sv/sys/netinet/tcp_hostcache.c projects/sv/sys/netinet/tcp_input.c projects/sv/sys/netinet/tcp_reass.c projects/sv/sys/netinet/tcp_subr.c projects/sv/sys/netinet/tcp_syncache.c projects/sv/sys/netinet/tcp_var.h projects/sv/sys/netinet/udp_usrreq.c projects/sv/sys/netsmb/smb_dev.h projects/sv/sys/netsmb/smb_subr.c projects/sv/sys/netsmb/smb_subr.h projects/sv/sys/nfs/nfs_nfssvc.c projects/sv/sys/nfs/nfssvc.h projects/sv/sys/nlm/nlm_prot_impl.c projects/sv/sys/pc98/include/_inttypes.h projects/sv/sys/pc98/pc98/machdep.c projects/sv/sys/pci/if_rlreg.h projects/sv/sys/powerpc/aim/machdep.c projects/sv/sys/powerpc/aim/mmu_oea.c projects/sv/sys/powerpc/aim/mmu_oea64.c projects/sv/sys/powerpc/aim/slb.c projects/sv/sys/powerpc/aim/trap.c projects/sv/sys/powerpc/aim/vm_machdep.c projects/sv/sys/powerpc/booke/machdep.c projects/sv/sys/powerpc/booke/platform_bare.c projects/sv/sys/powerpc/booke/pmap.c projects/sv/sys/powerpc/booke/vm_machdep.c projects/sv/sys/powerpc/include/_inttypes.h projects/sv/sys/powerpc/include/_limits.h projects/sv/sys/powerpc/include/_stdint.h projects/sv/sys/powerpc/include/_types.h projects/sv/sys/powerpc/include/float.h projects/sv/sys/powerpc/include/memdev.h projects/sv/sys/powerpc/include/metadata.h projects/sv/sys/powerpc/include/spr.h projects/sv/sys/powerpc/include/vmparam.h projects/sv/sys/powerpc/powermac/cpcht.c projects/sv/sys/powerpc/powermac/fcu.c projects/sv/sys/powerpc/powermac/grackle.c projects/sv/sys/powerpc/powermac/gracklevar.h projects/sv/sys/powerpc/powermac/uninorthpci.c projects/sv/sys/powerpc/powermac/uninorthvar.h projects/sv/sys/powerpc/powerpc/elf32_machdep.c projects/sv/sys/powerpc/powerpc/elf64_machdep.c projects/sv/sys/powerpc/powerpc/exec_machdep.c projects/sv/sys/powerpc/powerpc/mem.c projects/sv/sys/powerpc/ps3/ehci_ps3.c projects/sv/sys/rpc/clnt_dg.c projects/sv/sys/rpc/clnt_vc.c projects/sv/sys/rpc/svc.c projects/sv/sys/rpc/svc_vc.c projects/sv/sys/security/mac/mac_framework.c projects/sv/sys/security/mac_seeotheruids/mac_seeotheruids.c projects/sv/sys/sparc64/include/_limits.h projects/sv/sys/sparc64/include/_stdint.h projects/sv/sys/sparc64/include/float.h projects/sv/sys/sparc64/include/memdev.h projects/sv/sys/sparc64/include/vmparam.h projects/sv/sys/sparc64/sparc64/db_trace.c projects/sv/sys/sparc64/sparc64/exception.S projects/sv/sys/sparc64/sparc64/machdep.c projects/sv/sys/sparc64/sparc64/mem.c projects/sv/sys/sparc64/sparc64/pmap.c projects/sv/sys/sparc64/sparc64/tlb.c projects/sv/sys/sparc64/sparc64/tsb.c projects/sv/sys/sparc64/sparc64/vm_machdep.c projects/sv/sys/sun4v/include/_limits.h projects/sv/sys/sun4v/include/_stdint.h projects/sv/sys/sun4v/include/float.h projects/sv/sys/sun4v/include/memdev.h projects/sv/sys/sun4v/include/vmparam.h projects/sv/sys/sun4v/sun4v/db_interface.c projects/sv/sys/sun4v/sun4v/db_trace.c projects/sv/sys/sun4v/sun4v/machdep.c projects/sv/sys/sun4v/sun4v/pmap.c projects/sv/sys/sun4v/sun4v/vm_machdep.c projects/sv/sys/sys/cdefs.h projects/sv/sys/sys/imgact.h projects/sv/sys/sys/link_elf.h projects/sv/sys/sys/memrange.h projects/sv/sys/sys/msgbuf.h projects/sv/sys/sys/param.h projects/sv/sys/sys/priority.h projects/sv/sys/sys/sysctl.h projects/sv/sys/sys/sysent.h projects/sv/sys/sys/vmmeter.h projects/sv/sys/ufs/ffs/ffs_softdep.c projects/sv/sys/ufs/ufs/ufs_quota.c projects/sv/sys/vm/device_pager.c projects/sv/sys/vm/phys_pager.c projects/sv/sys/vm/pmap.h projects/sv/sys/vm/sg_pager.c projects/sv/sys/vm/swap_pager.c projects/sv/sys/vm/vm_contig.c projects/sv/sys/vm/vm_fault.c projects/sv/sys/vm/vm_glue.c projects/sv/sys/vm/vm_meter.c projects/sv/sys/vm/vm_object.c projects/sv/sys/vm/vm_page.c projects/sv/sys/vm/vm_page.h projects/sv/sys/vm/vm_pageout.c projects/sv/sys/vm/vm_pager.c projects/sv/sys/vm/vm_pager.h projects/sv/sys/vm/vm_phys.c projects/sv/sys/x86/acpica/OsdEnvironment.c projects/sv/sys/x86/x86/busdma_machdep.c projects/sv/sys/x86/x86/local_apic.c projects/sv/sys/x86/x86/tsc.c projects/sv/sys/xen/xenbus/xenbusb.c projects/sv/tools/regression/bin/date/regress.sh projects/sv/tools/tools/ath/Makefile projects/sv/tools/tools/ath/Makefile.inc projects/sv/tools/tools/ath/athdebug/athdebug.c projects/sv/tools/tools/ath/athdecode/main.c projects/sv/tools/tools/ath/athprom/athprom.c projects/sv/tools/tools/ath/athrd/athrd.c projects/sv/tools/tools/ath/athregs/dumpregs.c projects/sv/tools/tools/ath/athstats/athstats.c projects/sv/tools/tools/ath/athstats/main.c projects/sv/tools/tools/sysbuild/sysbuild.sh projects/sv/usr.bin/cpuset/cpuset.1 projects/sv/usr.bin/cpuset/cpuset.c projects/sv/usr.bin/netstat/if.c projects/sv/usr.bin/netstat/netstat.h projects/sv/usr.bin/netstat/route.c projects/sv/usr.bin/unifdef/unifdef.c projects/sv/usr.sbin/acpi/iasl/Makefile projects/sv/usr.sbin/kbdmap/kbdmap.c projects/sv/usr.sbin/ndp/ndp.c projects/sv/usr.sbin/pc-sysinstall/backend-query/disk-part.sh projects/sv/usr.sbin/pc-sysinstall/backend-query/send-logs.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-disk.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-networking.sh projects/sv/usr.sbin/pc-sysinstall/backend/functions-users.sh projects/sv/usr.sbin/pc-sysinstall/examples/README projects/sv/usr.sbin/sade/Makefile projects/sv/usr.sbin/spkrtest/spkrtest.sh projects/sv/usr.sbin/sysinstall/Makefile projects/sv/usr.sbin/sysinstall/install.c projects/sv/usr.sbin/sysinstall/menus.c projects/sv/usr.sbin/syslogd/syslogd.c projects/sv/usr.sbin/tzsetup/Makefile Directory Properties: projects/sv/ (props changed) projects/sv/cddl/contrib/opensolaris/ (props changed) projects/sv/contrib/bind9/ (props changed) projects/sv/contrib/binutils/ (props changed) projects/sv/contrib/bzip2/ (props changed) projects/sv/contrib/ee/ (props changed) projects/sv/contrib/expat/ (props changed) projects/sv/contrib/file/ (props changed) projects/sv/contrib/gdb/ (props changed) projects/sv/contrib/gdtoa/ (props changed) projects/sv/contrib/gnu-sort/ (props changed) projects/sv/contrib/groff/ (props changed) projects/sv/contrib/less/ (props changed) projects/sv/contrib/libpcap/ (props changed) projects/sv/contrib/llvm/ (props changed) projects/sv/contrib/llvm/tools/clang/ (props changed) projects/sv/contrib/ncurses/ (props changed) projects/sv/contrib/netcat/ (props changed) projects/sv/contrib/ntp/ (props changed) projects/sv/contrib/one-true-awk/ (props changed) projects/sv/contrib/openbsm/ (props changed) projects/sv/contrib/openpam/ (props changed) projects/sv/contrib/pf/ (props changed) projects/sv/contrib/sendmail/ (props changed) projects/sv/contrib/tcpdump/ (props changed) projects/sv/contrib/tcsh/ (props changed) projects/sv/contrib/top/ (props changed) projects/sv/contrib/top/install-sh (props changed) projects/sv/contrib/tzcode/stdtime/ (props changed) projects/sv/contrib/tzcode/zic/ (props changed) projects/sv/contrib/tzdata/ (props changed) projects/sv/contrib/wpa/ (props changed) projects/sv/contrib/xz/ (props changed) projects/sv/crypto/openssh/ (props changed) projects/sv/crypto/openssl/ (props changed) projects/sv/lib/libc/ (props changed) projects/sv/lib/libc/stdtime/ (props changed) projects/sv/lib/libutil/ (props changed) projects/sv/lib/libz/ (props changed) projects/sv/sbin/ (props changed) projects/sv/sbin/ipfw/ (props changed) projects/sv/share/mk/bsd.arch.inc.mk (props changed) projects/sv/share/zoneinfo/ (props changed) projects/sv/sys/ (props changed) projects/sv/sys/amd64/include/xen/ (props changed) projects/sv/sys/cddl/contrib/opensolaris/ (props changed) projects/sv/sys/contrib/dev/acpica/ (props changed) projects/sv/sys/contrib/octeon-sdk/ (props changed) projects/sv/sys/contrib/pf/ (props changed) projects/sv/sys/contrib/x86emu/ (props changed) projects/sv/usr.bin/calendar/ (props changed) projects/sv/usr.bin/csup/ (props changed) projects/sv/usr.bin/procstat/ (props changed) projects/sv/usr.sbin/zic/ (props changed) Modified: projects/sv/Makefile ============================================================================== --- projects/sv/Makefile Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/Makefile Sat Jan 22 22:18:47 2011 (r217728) @@ -5,6 +5,7 @@ # # universe - *Really* build *everything* (buildworld and # all kernels on all architectures). +# tinderbox - Same as universe, but stop on first failure. # buildworld - Rebuild *everything*, including glue to help do # upgrades. # installworld - Install everything built by "buildworld". @@ -35,10 +36,12 @@ # tree. This makefile executes a child make process, forcing it to use # the mk files from the source tree which are supposed to DTRT. # -# The user-driven targets (as listed above) are implemented in Makefile.inc1. +# Most of the user-driven targets (as listed above) are implemented in +# Makefile.inc1. The exceptions are universe, tinderbox and targets. # # If you want to build your system from source be sure that /usr/obj has -# at least 800MB of diskspace available. +# at least 1GB of diskspace available. A complete 'universe' build requires +# about 15GB of space. # # For individuals wanting to build from the sources currently on their # system, the simple instructions are: Modified: projects/sv/ObsoleteFiles.inc ============================================================================== --- projects/sv/ObsoleteFiles.inc Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/ObsoleteFiles.inc Sat Jan 22 22:18:47 2011 (r217728) @@ -38,6 +38,51 @@ # xargs -n1 | sort | uniq -d; # done +# 20110112: Update dialog to new version, rename old libdialog to libodialog, +# removing associated man pages and header files. +OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \ + usr/share/man/man3/draw_box.3.gz usr/share/man/man3/line_edit.3.gz \ + usr/share/man/man3/strheight.3.gz usr/share/man/man3/strwidth.3.gz \ + usr/share/man/man3/dialog_create_rc.3.gz \ + usr/share/man/man3/dialog_yesno.3.gz usr/share/man/man3/dialog_noyes.3.gz \ + usr/share/man/man3/dialog_prgbox.3.gz \ + usr/share/man/man3/dialog_textbox.3.gz usr/share/man/man3/dialog_menu.3.gz \ + usr/share/man/man3/dialog_checklist.3.gz \ + usr/share/man/man3/dialog_radiolist.3.gz \ + usr/share/man/man3/dialog_inputbox.3.gz \ + usr/share/man/man3/dialog_clear_norefresh.3.gz \ + usr/share/man/man3/dialog_clear.3.gz usr/share/man/man3/dialog_update.3.gz \ + usr/share/man/man3/dialog_fselect.3.gz \ + usr/share/man/man3/dialog_notify.3.gz \ + usr/share/man/man3/dialog_mesgbox.3.gz \ + usr/share/man/man3/dialog_gauge.3.gz usr/share/man/man3/init_dialog.3.gz \ + usr/share/man/man3/end_dialog.3.gz usr/share/man/man3/use_helpfile.3.gz \ + usr/share/man/man3/use_helpline.3.gz usr/share/man/man3/get_helpline.3.gz \ + usr/share/man/man3/restore_helpline.3.gz \ + usr/share/man/man3/dialog_msgbox.3.gz \ + usr/share/man/man3/dialog_ftree.3.gz usr/share/man/man3/dialog_tree.3.gz \ + usr/share/examples/dialog/README usr/share/examples/dialog/checklist \ + usr/share/examples/dialog/ftreebox usr/share/examples/dialog/infobox \ + usr/share/examples/dialog/inputbox usr/share/examples/dialog/menubox \ + usr/share/examples/dialog/msgbox usr/share/examples/dialog/prgbox \ + usr/share/examples/dialog/radiolist usr/share/examples/dialog/textbox \ + usr/share/examples/dialog/treebox usr/share/examples/dialog/yesno \ + usr/share/examples/libdialog/Makefile usr/share/examples/libdialog/check1.c\ + usr/share/examples/libdialog/check2.c usr/share/examples/libdialog/check3.c\ + usr/share/examples/libdialog/dselect.c \ + usr/share/examples/libdialog/fselect.c \ + usr/share/examples/libdialog/ftree1.c \ + usr/share/examples/libdialog/ftree1.test \ + usr/share/examples/libdialog/ftree2.c \ + usr/share/examples/libdialog/ftree2.test \ + usr/share/examples/libdialog/gauge.c usr/share/examples/libdialog/input1.c \ + usr/share/examples/libdialog/input2.c usr/share/examples/libdialog/menu1.c \ + usr/share/examples/libdialog/menu2.c usr/share/examples/libdialog/menu3.c \ + usr/share/examples/libdialog/msg.c usr/share/examples/libdialog/prgbox.c \ + usr/share/examples/libdialog/radio1.c usr/share/examples/libdialog/radio2.c\ + usr/share/examples/libdialog/radio3.c usr/share/examples/libdialog/text.c \ + usr/share/examples/libdialog/tree.c usr/share/examples/libdialog/yesno.c +OLD_DIRS+=usr/share/examples/libdialog usr/share/examples/dialog # 20101114: Remove long-obsolete MAKEDEV.8 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago Modified: projects/sv/UPDATING ============================================================================== --- projects/sv/UPDATING Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/UPDATING Sat Jan 22 22:18:47 2011 (r217728) @@ -22,10 +22,26 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110112: + A SYSCTL_[ADD_]UQUAD was added for unsigned uint64_t pointers, + symmetric with the existing SYSCTL_[ADD_]QUAD. Type checking + for scalar sysctls is defined but disabled. Code that needs + UQUAD to pass the type checking that must compile on older + systems where the define is not present can check against + __FreeBSD_version >= 900030. + + The system dialog(1) has been replaced with a new version previously + in ports as devel/cdialog. dialog(1) is mostly command-line compatible + with the previous version, but the libdialog associated with it has + a largely incompatible API. As such, the original version of libdialog + will be kept temporarily as libodialog, until its base system consumers + are replaced or updated. Bump __FreeBSD_version to 900030. + 20110103: If you are trying to run make universe on a -stable system, and you get the following warning: -"Makefile", line 356: "Target architecture for i386/conf/GENERIC unknown. config(8) likely too old." + "Makefile", line 356: "Target architecture for i386/conf/GENERIC + unknown. config(8) likely too old." or something similar to it, then you must upgrade your -stable system to 8.2-Release or newer (really, any time after r210146 7/15/2010 in stable/8) or build the config from the latest stable/8 branch and @@ -33,8 +49,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. Prior to this date, building a current universe on 8-stable system from between 7/15/2010 and 1/2/2011 would result in a weird shell parsing - error in the first kernel build phase. A new config on those old systems - will fix that problem for older versions of -current. + error in the first kernel build phase. A new config on those old + systems will fix that problem for older versions of -current. 20101228: The TCP stack has been modified to allow Khelp modules to interact with Modified: projects/sv/bin/ps/print.c ============================================================================== --- projects/sv/bin/ps/print.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/ps/print.c Sat Jan 22 22:18:47 2011 (r217728) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include Modified: projects/sv/bin/sh/exec.c ============================================================================== --- projects/sv/bin/sh/exec.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/exec.c Sat Jan 22 22:18:47 2011 (r217728) @@ -92,7 +92,6 @@ struct tblentry { static struct tblentry *cmdtable[CMDTABLESIZE]; -static int builtinloc = -1; /* index in path of %builtin, or -1 */ int exerrno = 0; /* Last exec error */ @@ -244,8 +243,7 @@ hashcmd(int argc __unused, char **argv _ } while ((name = *argptr) != NULL) { if ((cmdp = cmdlookup(name, 0)) != NULL - && (cmdp->cmdtype == CMDNORMAL - || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))) + && cmdp->cmdtype == CMDNORMAL) delete_cmd_entry(); find_command(name, &entry, DO_ERR, pathval()); if (verbose) { @@ -336,8 +334,8 @@ find_command(const char *name, struct cm goto success; } - /* If %builtin not in path, check for builtin next */ - if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) { + /* Check for builtin next */ + if ((i = find_builtin(name, &spec)) >= 0) { INTOFF; cmdp = cmdlookup(name, 1); if (cmdp->cmdtype == CMDFUNCTION) @@ -353,7 +351,7 @@ find_command(const char *name, struct cm prev = -1; /* where to start */ if (cmdp) { /* doing a rehash */ if (cmdp->cmdtype == CMDBUILTIN) - prev = builtinloc; + prev = -1; else prev = cmdp->param.index; } @@ -365,19 +363,7 @@ loop: stunalloc(fullname); idx++; if (pathopt) { - if (prefix("builtin", pathopt)) { - if ((i = find_builtin(name, &spec)) < 0) - goto loop; - INTOFF; - cmdp = cmdlookup(name, 1); - if (cmdp->cmdtype == CMDFUNCTION) - cmdp = &loc_cmd; - cmdp->cmdtype = CMDBUILTIN; - cmdp->param.index = i; - cmdp->special = spec; - INTON; - goto success; - } else if (prefix("func", pathopt)) { + if (prefix("func", pathopt)) { /* handled below */ } else { goto loop; /* ignore unimplemented options */ @@ -484,8 +470,7 @@ hashcd(void) for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) { for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) { - if (cmdp->cmdtype == CMDNORMAL - || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)) + if (cmdp->cmdtype == CMDNORMAL) cmdp->rehash = 1; } } @@ -505,13 +490,11 @@ changepath(const char *newval) const char *old, *new; int idx; int firstchange; - int bltin; old = pathval(); new = newval; firstchange = 9999; /* assume no change */ idx = 0; - bltin = -1; for (;;) { if (*old != *new) { firstchange = idx; @@ -522,19 +505,12 @@ changepath(const char *newval) } if (*new == '\0') break; - if (*new == '%' && bltin < 0 && prefix("builtin", new + 1)) - bltin = idx; if (*new == ':') { idx++; } new++, old++; } - if (builtinloc < 0 && bltin >= 0) - builtinloc = bltin; /* zap builtins */ - if (builtinloc >= 0 && bltin < 0) - firstchange = 0; clearcmdentry(firstchange); - builtinloc = bltin; } @@ -555,9 +531,7 @@ clearcmdentry(int firstchange) pp = tblp; while ((cmdp = *pp) != NULL) { if ((cmdp->cmdtype == CMDNORMAL && - cmdp->param.index >= firstchange) - || (cmdp->cmdtype == CMDBUILTIN && - builtinloc >= firstchange)) { + cmdp->param.index >= firstchange)) { *pp = cmdp->next; ckfree(cmdp); } else { Modified: projects/sv/bin/sh/jobs.c ============================================================================== --- projects/sv/bin/sh/jobs.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/jobs.c Sat Jan 22 22:18:47 2011 (r217728) @@ -1062,6 +1062,7 @@ dowait(int block, struct job *job) if (coredump) out1str(" (core dumped)"); out1c('\n'); + flushout(out1); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); Modified: projects/sv/bin/sh/main.c ============================================================================== --- projects/sv/bin/sh/main.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/main.c Sat Jan 22 22:18:47 2011 (r217728) @@ -341,10 +341,7 @@ exitcmd(int argc, char **argv) if (stoppedjobs()) return 0; if (argc > 1) - exitstatus = number(argv[1]); + exitshell(number(argv[1])); else - exitstatus = oexitstatus; - exitshell(exitstatus); - /*NOTREACHED*/ - return 0; + exitshell_savedstatus(); } Modified: projects/sv/bin/sh/memalloc.c ============================================================================== --- projects/sv/bin/sh/memalloc.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/memalloc.c Sat Jan 22 22:18:47 2011 (r217728) @@ -277,16 +277,6 @@ growstackblock(int min) -void -grabstackblock(int len) -{ - len = ALIGN(len); - stacknxt += len; - stacknleft -= len; -} - - - /* * The following routines are somewhat easier to use that the above. * The user declares a variable of type STACKSTR, which may be declared Modified: projects/sv/bin/sh/memalloc.h ============================================================================== --- projects/sv/bin/sh/memalloc.h Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/memalloc.h Sat Jan 22 22:18:47 2011 (r217728) @@ -55,7 +55,6 @@ pointer stalloc(int); void stunalloc(pointer); void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); -void grabstackblock(int); char *growstackstr(void); char *makestrspace(int, char *); char *stputbin(const char *data, int len, char *p); @@ -65,6 +64,7 @@ char *stputs(const char *data, char *p); #define stackblock() stacknxt #define stackblocksize() stacknleft +#define grabstackblock(n) stalloc(n) #define STARTSTACKSTR(p) p = stackblock() #define STPUTC(c, p) do { if (p == sstrend) p = growstackstr(); *p++ = (c); } while(0) #define CHECKSTRSPACE(n, p) { if (sstrend - p < n) p = makestrspace(n, p); } Modified: projects/sv/bin/sh/sh.1 ============================================================================== --- projects/sv/bin/sh/sh.1 Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/sh.1 Sat Jan 22 22:18:47 2011 (r217728) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd December 21, 2010 +.Dd January 16, 2011 .Dt SH 1 .Os .Sh NAME @@ -1848,7 +1848,12 @@ If .Ar exitstatus is given it is used as the exit status of the shell; -otherwise the exit status of the preceding command is used. +otherwise, if the shell is executing an +.Cm EXIT +trap, the exit status of the last command before the trap is used; +if the shell is executing a trap for a signal, +the shell exits by resending the signal to itself; +otherwise, the exit status of the preceding command is used. The exit status should be an integer between 0 and 255. .It Ic export Ar name ... .It Ic export Op Fl p Modified: projects/sv/bin/sh/trap.c ============================================================================== --- projects/sv/bin/sh/trap.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/trap.c Sat Jan 22 22:18:47 2011 (r217728) @@ -79,6 +79,10 @@ static volatile sig_atomic_t gotsig[NSIG /* indicates specified signal received */ static int ignore_sigchld; /* Used while handling SIGCHLD traps. */ volatile sig_atomic_t gotwinch; +static int last_trapsig; + +static int exiting; /* exitshell() has been called */ +static int exiting_exitstatus; /* value passed to exitshell() */ static int getsigaction(int, sig_t *); @@ -131,7 +135,7 @@ printsignals(void) outlen += 3; /* good enough */ } ++outlen; - if (outlen > 70 || n == sys_nsig - 1) { + if (outlen > 71 || n == sys_nsig - 1) { out1str("\n"); outlen = 0; } else { @@ -150,8 +154,18 @@ trapcmd(int argc, char **argv) char *action; int signo; int errors = 0; + int i; + + while ((i = nextopt("l")) != '\0') { + switch (i) { + case 'l': + printsignals(); + return (0); + } + } + argv = argptr; - if (argc <= 1) { + if (*argv == NULL) { for (signo = 0 ; signo < sys_nsig ; signo++) { if (signo < NSIG && trap[signo] != NULL) { out1str("trap -- "); @@ -168,19 +182,12 @@ trapcmd(int argc, char **argv) return 0; } action = NULL; - if (*++argv && strcmp(*argv, "--") == 0) - argv++; if (*argv && sigstring_to_signum(*argv) == -1) { - if ((*argv)[0] != '-') { - action = *argv; + if (strcmp(*argv, "-") == 0) argv++; - } else if ((*argv)[1] == '\0') { + else { + action = *argv; argv++; - } else if ((*argv)[1] == 'l' && (*argv)[2] == '\0') { - printsignals(); - return 0; - } else { - error("bad option %s", *argv); } } while (*argv) { @@ -435,6 +442,7 @@ dotrap(void) */ if (i == SIGCHLD) ignore_sigchld++; + last_trapsig = i; savestatus = exitstatus; evalstring(trap[i], 0); exitstatus = savestatus; @@ -478,10 +486,28 @@ setinteractive(int on) void exitshell(int status) { + TRACE(("exitshell(%d) pid=%d\n", status, getpid())); + exiting = 1; + exiting_exitstatus = status; + exitshell_savedstatus(); +} + +void +exitshell_savedstatus(void) +{ struct jmploc loc1, loc2; char *p; + int sig = 0; + sigset_t sigs; - TRACE(("exitshell(%d) pid=%d\n", status, getpid())); + if (!exiting) { + if (in_dotrap && last_trapsig) { + sig = last_trapsig; + exiting_exitstatus = sig + 128; + } else + exiting_exitstatus = oexitstatus; + } + exitstatus = oexitstatus = exiting_exitstatus; if (setjmp(loc1.loc)) { goto l1; } @@ -498,5 +524,15 @@ l1: handler = &loc2; /* probably unn #if JOBS setjobctl(0); #endif -l2: _exit(status); +l2: + if (sig != 0 && sig != SIGSTOP && sig != SIGTSTP && sig != SIGTTIN && + sig != SIGTTOU) { + signal(sig, SIG_DFL); + sigemptyset(&sigs); + sigaddset(&sigs, sig); + sigprocmask(SIG_UNBLOCK, &sigs, NULL); + kill(getpid(), sig); + /* If the default action is to ignore, fall back to _exit(). */ + } + _exit(exiting_exitstatus); } Modified: projects/sv/bin/sh/trap.h ============================================================================== --- projects/sv/bin/sh/trap.h Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/bin/sh/trap.h Sat Jan 22 22:18:47 2011 (r217728) @@ -46,3 +46,4 @@ void onsig(int); void dotrap(void); void setinteractive(int); void exitshell(int) __dead2; +void exitshell_savedstatus(void) __dead2; Modified: projects/sv/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/sv/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Sat Jan 22 22:18:47 2011 (r217728) @@ -601,6 +601,7 @@ typedef uint32_t idmap_rid_t; #define SYSCTL_UINT(...) #define SYSCTL_ULONG(...) #define SYSCTL_QUAD(...) +#define SYSCTL_UQUAD(...) #ifdef TUNABLE_INT #undef TUNABLE_INT #undef TUNABLE_ULONG Modified: projects/sv/contrib/binutils/ld/emultempl/ppc64elf.em ============================================================================== --- projects/sv/contrib/binutils/ld/emultempl/ppc64elf.em Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/binutils/ld/emultempl/ppc64elf.em Sat Jan 22 22:18:47 2011 (r217728) @@ -60,6 +60,7 @@ ppc_create_output_section_statements (vo { extern const bfd_target bfd_elf64_powerpc_vec; extern const bfd_target bfd_elf64_powerpcle_vec; + asection *sect; if (link_info.hash->creator != &bfd_elf64_powerpc_vec && link_info.hash->creator != &bfd_elf64_powerpcle_vec) @@ -80,6 +81,8 @@ ppc_create_output_section_statements (vo return; } + if (bfd_get_section_by_name (stub_file->the_bfd, ".note.GNU-stack") == NULL) + sect = bfd_make_section (stub_file->the_bfd, ".note.GNU-stack"); ldlang_add_file (stub_file); ppc64_elf_init_stub_bfd (stub_file->the_bfd, &link_info); } Modified: projects/sv/contrib/binutils/ld/ldemul.h ============================================================================== --- projects/sv/contrib/binutils/ld/ldemul.h Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/binutils/ld/ldemul.h Sat Jan 22 22:18:47 2011 (r217728) @@ -17,6 +17,9 @@ #ifndef LDEMUL_H #define LDEMUL_H +/* Forward declaration for ldemul_add_options() and others. */ +struct option; + extern void ldemul_hll (char *); extern void ldemul_syslib Modified: projects/sv/contrib/gcc/config/rs6000/crtsavres.asm ============================================================================== --- projects/sv/contrib/gcc/config/rs6000/crtsavres.asm Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/gcc/config/rs6000/crtsavres.asm Sat Jan 22 22:18:47 2011 (r217728) @@ -305,3 +305,5 @@ FUNC_END(_restgpr_15_x) FUNC_END(_restgpr_14_x) #endif + + .section .note.GNU-stack,"",%progbits Modified: projects/sv/contrib/gcc/config/rs6000/freebsd.h ============================================================================== --- projects/sv/contrib/gcc/config/rs6000/freebsd.h Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/gcc/config/rs6000/freebsd.h Sat Jan 22 22:18:47 2011 (r217728) @@ -230,6 +230,8 @@ } #endif +#define TARGET_ASM_FILE_END rs6000_elf_end_indicate_exec_stack + /* FreeBSD doesn't support saving and restoring 64-bit regs with a 32-bit kernel. This is supported when running on a 64-bit kernel with COMPAT_FREEBSD32, but tell GCC it isn't so that our 32-bit binaries @@ -242,3 +244,5 @@ #define PROFILE_HOOK(LABEL) \ do { if (TARGET_64BIT) output_profile_hook (LABEL); } while (0) +#undef NEED_INDICATE_EXEC_STACK +#define NEED_INDICATE_EXEC_STACK 1 Modified: projects/sv/contrib/gcc/config/rs6000/rs6000.c ============================================================================== --- projects/sv/contrib/gcc/config/rs6000/rs6000.c Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/gcc/config/rs6000/rs6000.c Sat Jan 22 22:18:47 2011 (r217728) @@ -18426,7 +18426,7 @@ rs6000_elf_declare_function_name (FILE * static void rs6000_elf_end_indicate_exec_stack (void) { - if (TARGET_32BIT) + if (NEED_INDICATE_EXEC_STACK) file_end_indicate_exec_stack (); } #endif Modified: projects/sv/contrib/gcc/config/rs6000/tramp.asm ============================================================================== --- projects/sv/contrib/gcc/config/rs6000/tramp.asm Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/gcc/config/rs6000/tramp.asm Sat Jan 22 22:18:47 2011 (r217728) @@ -115,3 +115,5 @@ FUNC_START(__trampoline_setup) FUNC_END(__trampoline_setup) #endif + + .section .note.GNU-stack,"",%progbits Modified: projects/sv/contrib/groff/tmac/doc-common ============================================================================== --- projects/sv/contrib/groff/tmac/doc-common Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/groff/tmac/doc-common Sat Jan 22 22:18:47 2011 (r217728) @@ -454,6 +454,39 @@ .ds doc-operating-system-NetBSD-3.1 3.1 .ds doc-operating-system-NetBSD-4.0 4.0 .ds doc-operating-system-NetBSD-4.0.1 4.0.1 +.ds doc-operating-system-NetBSD-5.0 5.0 +.ds doc-operating-system-NetBSD-5.0.1 5.0.1 +.ds doc-operating-system-NetBSD-5.0.2 5.0.2 +. +.ds doc-operating-system-OpenBSD-2.0 2.0 +.ds doc-operating-system-OpenBSD-2.1 2.1 +.ds doc-operating-system-OpenBSD-2.2 2.2 +.ds doc-operating-system-OpenBSD-2.3 2.3 +.ds doc-operating-system-OpenBSD-2.4 2.4 +.ds doc-operating-system-OpenBSD-2.5 2.5 +.ds doc-operating-system-OpenBSD-2.6 2.6 +.ds doc-operating-system-OpenBSD-2.7 2.7 +.ds doc-operating-system-OpenBSD-2.8 2.8 +.ds doc-operating-system-OpenBSD-2.9 2.9 +.ds doc-operating-system-OpenBSD-3.0 3.0 +.ds doc-operating-system-OpenBSD-3.1 3.1 +.ds doc-operating-system-OpenBSD-3.2 3.2 +.ds doc-operating-system-OpenBSD-3.3 3.3 +.ds doc-operating-system-OpenBSD-3.4 3.4 +.ds doc-operating-system-OpenBSD-3.5 3.5 +.ds doc-operating-system-OpenBSD-3.6 3.6 +.ds doc-operating-system-OpenBSD-3.7 3.7 +.ds doc-operating-system-OpenBSD-3.8 3.8 +.ds doc-operating-system-OpenBSD-3.9 3.9 +.ds doc-operating-system-OpenBSD-4.0 4.0 +.ds doc-operating-system-OpenBSD-4.1 4.1 +.ds doc-operating-system-OpenBSD-4.2 4.2 +.ds doc-operating-system-OpenBSD-4.3 4.3 +.ds doc-operating-system-OpenBSD-4.4 4.4 +.ds doc-operating-system-OpenBSD-4.5 4.5 +.ds doc-operating-system-OpenBSD-4.6 4.6 +.ds doc-operating-system-OpenBSD-4.7 4.7 +.ds doc-operating-system-OpenBSD-4.8 4.8 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -506,6 +539,10 @@ .ds doc-operating-system-FreeBSD-6.4 6.4 .ds doc-operating-system-FreeBSD-7.0 7.0 .ds doc-operating-system-FreeBSD-7.1 7.1 +.ds doc-operating-system-FreeBSD-7.2 7.2 +.ds doc-operating-system-FreeBSD-7.3 7.3 +.ds doc-operating-system-FreeBSD-8.0 8.0 +.ds doc-operating-system-FreeBSD-8.1 8.1 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 .ds doc-operating-system-Darwin-8.1.0 8.1.0 @@ -540,6 +577,10 @@ .ds doc-operating-system-DragonFly-1.12 1.12 .ds doc-operating-system-DragonFly-1.12.2 1.12.2 .ds doc-operating-system-DragonFly-2.0 2.0 +.ds doc-operating-system-DragonFly-2.2 2.2 +.ds doc-operating-system-DragonFly-2.4 2.4 +.ds doc-operating-system-DragonFly-2.6 2.6 +.ds doc-operating-system-DragonFly-2.8 2.8 . .de Os . ds doc-command-name @@ -569,6 +610,14 @@ . el \ . tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c]) . \}\} +. el \{ .ie "\$1"DragonFly" \{\ +. ds doc-operating-system DragonFly +. if \A\$2 \{\ +. ie d doc-operating-system-DragonFly-\$2 \ +. as doc-operating-system \~\*[doc-operating-system-DragonFly-\$2] +. el \ +. tm mdoc warning: .Os: Unknown DragonFly version `\$2' (#\n[.c]) +. \}\} . el \{ .ie "\$1"NetBSD" \{\ . ds doc-operating-system NetBSD . if \A\$2 \{\ @@ -577,6 +626,14 @@ . el \ . tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c]) . \}\} +. el \{ .ie "\$1"OpenBSD" \{\ +. ds doc-operating-system OpenBSD +. if \A\$2 \{\ +. ie d doc-operating-system-OpenBSD-\$2 \ +. as doc-operating-system \~\*[doc-operating-system-OpenBSD-\$2] +. el \ +. tm mdoc warning: .Os: Unknown OpenBSD version `\$2' (#\n[.c]) +. \}\} . el \{ .ie "\$1"Darwin" \{\ . ds doc-operating-system Darwin . if \A\$2 \{\ @@ -589,7 +646,7 @@ . ds doc-operating-system \$1 . if !"\$2"" \ . as doc-operating-system " \$2 -. \}\}\}\}\}\} +. \}\}\}\}\}\}\}\} .. . . Modified: projects/sv/contrib/groff/tmac/doc-syms ============================================================================== --- projects/sv/contrib/groff/tmac/doc-syms Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/groff/tmac/doc-syms Sat Jan 22 22:18:47 2011 (r217728) @@ -637,6 +637,8 @@ .as doc-str-St--p1003.1-2001 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) .ds doc-str-St--p1003.1-2004 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2004 .as doc-str-St--p1003.1-2004 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 +.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) . .\" POSIX Part 2: Shell and Utilities .ds doc-str-St--p1003.2 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2 Modified: projects/sv/contrib/groff/tmac/groff_mdoc.man ============================================================================== --- projects/sv/contrib/groff/tmac/groff_mdoc.man Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/contrib/groff/tmac/groff_mdoc.man Sat Jan 22 22:18:47 2011 (r217728) @@ -44,9 +44,9 @@ .\" for an already extremely slow package. .\" . -.Dd January 5, 2006 -.Os +.Dd November 2, 2010 .Dt GROFF_MDOC 7 +.Os . . .Sh NAME @@ -563,8 +563,8 @@ The body of a man page is easily constru .Bd -literal -offset indent \&.\e" The following commands are required for all man pages. \&.Dd Month day, year -\&.Os [OPERATING_SYSTEM] [version/release] \&.Dt DOCUMENT_TITLE [section number] [architecture/volume] +\&.Os [OPERATING_SYSTEM] [version/release] \&.Sh NAME \&.Nm name \&.Nd one line description of name @@ -600,9 +600,9 @@ The body of a man page is easily constru . The first items in the template are the commands .Ql .Dd , -.Ql .Os , +.Ql .Dt , and -.Ql .Dt ; +.Ql .Os ; the document date, the operating system the man page or subject source is developed or modified for, and the man page title (in .Em upper case ) @@ -856,7 +856,7 @@ is the acronym for the operating system the release ID. . .Bd -ragged -compact -.Bl -tag -width ".No FreeBSD" -offset indent +.Bl -tag -width ".No DragonFly" -offset indent .It ATT 7th, 7, III, 3, V, V.2, V.3, V.4 .It BSD @@ -865,14 +865,19 @@ the release ID. 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e, 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1, 1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0, -4.0.1 +4.0.1, 5.0, 5.0.1, 5.0.2 .It FreeBSD 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, -5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1 +5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0, +8.1 +.It OpenBSD +2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, +3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8 .It DragonFly -1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0 +1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2, +2.4, 2.6, 2.8 .It Darwin 8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0, 8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0 @@ -1588,7 +1593,7 @@ For example, .Ql ".Rv \-std atexit" produces: . -.Bd -ragged -offset -indent +.Bd -ragged -offset indent \# a small hack to suppress a warning message .ds section-old "\*[section] .ds section 3 @@ -1618,7 +1623,7 @@ For example, .Ql ".Ex \-std cat" produces: . -.Bd -ragged -offset -indent +.Bd -ragged -offset indent \# a small hack to suppress a warning message .ds section-old "\*[section] .ds section 1 @@ -1786,6 +1791,11 @@ When called without arguments, .Ql .Nm regurgitates this initial name for the sole purpose of making less work for the author. +.Ql .Nm +causes a line break within the +.Sx SYNOPSIS +section. +.Pp Note: A section two or three document function name is addressed with the .Ql .Nm in the @@ -1974,6 +1984,8 @@ Part 1: System API .St -p1003.1-2001 .It Li \-p1003.1\-2004 .St -p1003.1-2004 +.It Li \-p1003.1\-2008 +.St -p1003.1-2008 .El .Pp . @@ -1993,8 +2005,8 @@ Part 2: Shell and Utilities .Pp . X/Open -.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .Pp +.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent .It Li \-susv2 .St -susv2 .It Li \-susv3 Modified: projects/sv/etc/defaults/rc.conf ============================================================================== --- projects/sv/etc/defaults/rc.conf Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/etc/defaults/rc.conf Sat Jan 22 22:18:47 2011 (r217728) @@ -89,7 +89,7 @@ fsck_y_enable="NO" # Set to YES to do fs fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS newnfs:NEWNFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). Modified: projects/sv/etc/mtree/BSD.usr.dist ============================================================================== --- projects/sv/etc/mtree/BSD.usr.dist Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/etc/mtree/BSD.usr.dist Sat Jan 22 22:18:47 2011 (r217728) @@ -201,8 +201,6 @@ .. cvsup .. - dialog - .. diskless .. drivers @@ -251,8 +249,6 @@ .. .. .. - libdialog - .. libvgl .. mdoc Modified: projects/sv/etc/mtree/README ============================================================================== --- projects/sv/etc/mtree/README Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/etc/mtree/README Sat Jan 22 22:18:47 2011 (r217728) @@ -36,10 +36,10 @@ and keep them in good working order. mechanism for making better selections for these as it traverses the hierarchy. - The BSD.X.new file should NOT be commited, will be missing the - correct header, and important keywords like ``nochange''. Simply - use the diff for a sanity check to make sure things are in the - correct order and correctly indented. + The BSD.X.new file should NOT be committed, as it will be missing + the correct header, and important keywords like ``nochange''. + Simply use the diff for a sanity check to make sure things are in + the correct order and correctly indented. e) Further sanity checking of the system builds with DESTDIR=/someplace are more complicated, but can often catch missing entries in these Modified: projects/sv/gnu/lib/Makefile ============================================================================== --- projects/sv/gnu/lib/Makefile Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/gnu/lib/Makefile Sat Jan 22 22:18:47 2011 (r217728) @@ -2,7 +2,8 @@ .include -SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp +SUBDIR= csu libgcc libgcov libdialog libgomp libodialog libregex libreadline \ + libssp # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. Modified: projects/sv/gnu/lib/libdialog/Makefile ============================================================================== --- projects/sv/gnu/lib/libdialog/Makefile Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/gnu/lib/libdialog/Makefile Sat Jan 22 22:18:47 2011 (r217728) @@ -1,47 +1,19 @@ -# Makefile for libdialog # $FreeBSD$ -.include +DIALOG= ${.CURDIR}/../../../contrib/dialog -LIB= dialog -INCS= dialog.h -MAN= dialog.3 - -SHLIB_MAJOR= 7 -SRCS= kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \ - lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \ - fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c - -EXAMPLES= Makefile check1.c check2.c check3.c dselect.c fselect.c \ - ftree1.c ftree1.test ftree2.c ftree2.test gauge.c input1.c \ - input2.c menu1.c menu2.c menu3.c msg.c prgbox.c radio1.c \ - radio2.c radio3.c text.c tree.c yesno.c - -CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE - -DPADD= ${LIBNCURSES} -LDADD= -lncurses - -.if ${MK_HTML} != "no" -FILES= ${EXAMPLES:C;^;${.CURDIR}/TESTS/;} -FILESDIR= ${SHAREDIR}/examples/libdialog -.endif - -MLINKS+=dialog.3 draw_shadow.3 dialog.3 draw_box.3 \ - dialog.3 line_edit.3 dialog.3 strheight.3 \ - dialog.3 strwidth.3 dialog.3 dialog_create_rc.3 \ - dialog.3 dialog_yesno.3 dialog.3 dialog_noyes.3 \ - dialog.3 dialog_prgbox.3 \ - dialog.3 dialog_textbox.3 dialog.3 dialog_menu.3 \ - dialog.3 dialog_checklist.3 dialog.3 dialog_radiolist.3 \ - dialog.3 dialog_inputbox.3 dialog.3 dialog_clear_norefresh.3 \ - dialog.3 dialog_clear.3 dialog.3 dialog_update.3 \ - dialog.3 dialog_fselect.3 dialog.3 dialog_notify.3 \ - dialog.3 dialog_mesgbox.3 dialog.3 dialog_gauge.3 \ - dialog.3 init_dialog.3 dialog.3 end_dialog.3 \ - dialog.3 use_helpfile.3 dialog.3 use_helpline.3 \ - dialog.3 get_helpline.3 dialog.3 restore_helpline.3 \ - dialog.3 dialog_msgbox.3 dialog.3 dialog_ftree.3 \ - dialog.3 dialog_tree.3 +LIB= dialog +SHLIB_MAJOR= 7 +SRCS= arrows.c buttons.c calendar.c checklist.c columns.c dlg_keys.c \ + editbox.c fselect.c formbox.c guage.c inputbox.c inputstr.c \ + menubox.c mixedform.c mixedgauge.c mouse.c mousewget.c \ + msgbox.c pause.c progressbox.c rc.c tailbox.c textbox.c \ + timebox.c trace.c ui_getc.c util.c version.c yesno.c +INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h +MAN= dialog.3 + +CFLAGS+= -I${.CURDIR} -I${DIALOG} +.PATH: ${DIALOG} +WARNS?= 3 .include Modified: projects/sv/gnu/usr.bin/dialog/Makefile ============================================================================== --- projects/sv/gnu/usr.bin/dialog/Makefile Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/gnu/usr.bin/dialog/Makefile Sat Jan 22 22:18:47 2011 (r217728) @@ -1,17 +1,13 @@ -# Makefile for dialog # $FreeBSD$ -.include - -.if ${MK_EXAMPLES} != "no" -SUBDIR= TESTS -.endif - +DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -CFLAGS+= -Wall -Wstrict-prototypes +DPADD= $(LIBDIALOG) $(LIBNCURSES) $(LIBM) +LDADD= -ldialog -lncursesw -lm +CFLAGS+= -I${.CURDIR} -I${DIALOG} +.PATH: ${DIALOG} -DPADD= $(LIBDIALOG) $(LIBNCURSES) -LDADD= -ldialog -lncurses +WARNS?= 3 .include Modified: projects/sv/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- projects/sv/gnu/usr.bin/groff/tmac/mdoc.local Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/gnu/usr.bin/groff/tmac/mdoc.local Sat Jan 22 22:18:47 2011 (r217728) @@ -74,17 +74,10 @@ .ds doc-default-operating-system FreeBSD\~9.0 . .\" FreeBSD releases not found in doc-common -.ds doc-operating-system-FreeBSD-7.2 7.2 -.ds doc-operating-system-FreeBSD-7.3 7.3 -.ds doc-operating-system-FreeBSD-7.4 7.4 -.ds doc-operating-system-FreeBSD-8.0 8.0 -.ds doc-operating-system-FreeBSD-8.1 8.1 .ds doc-operating-system-FreeBSD-8.2 8.2 .ds doc-operating-system-FreeBSD-9.0 9.0 . .\" Definitions not (yet) in doc-syms -.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 -.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) . .ec . Modified: projects/sv/include/assert.h ============================================================================== --- projects/sv/include/assert.h Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/include/assert.h Sat Jan 22 22:18:47 2011 (r217728) @@ -58,6 +58,6 @@ #ifndef _ASSERT_H_ #define _ASSERT_H_ __BEGIN_DECLS -void __assert(const char *, const char *, int, const char *); +void __assert(const char *, const char *, int, const char *) __dead2; __END_DECLS #endif /* !_ASSERT_H_ */ Modified: projects/sv/lib/bind/config.mk ============================================================================== --- projects/sv/lib/bind/config.mk Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/lib/bind/config.mk Sat Jan 22 22:18:47 2011 (r217728) @@ -65,7 +65,11 @@ CFLAGS+= -I${LIB_BIND_DIR} .endif # Use the right version of the atomic.h file from lib/isc -ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/} +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ISC_ATOMIC_ARCH= x86_32 +.else +ISC_ATOMIC_ARCH= ${MACHINE_CPUARCH} +.endif # Optional features .if ${MK_BIND_LARGE_FILE} == "yes" Modified: projects/sv/lib/csu/amd64/Makefile ============================================================================== --- projects/sv/lib/csu/amd64/Makefile Sat Jan 22 21:33:18 2011 (r217727) +++ projects/sv/lib/csu/amd64/Makefile Sat Jan 22 22:18:47 2011 (r217728) @@ -12,12 +12,31 @@ CFLAGS+= -fno-omit-frame-pointer all: ${OBJS} CLEANFILES= ${OBJS} +CLEANFILES+= crt1.s gcrt1.s Scrt1.s -gcrt1.o: crt1.c - ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c +# See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not +# directly compiled to .o files. -Scrt1.o: crt1.c - ${CC} ${CFLAGS} -fPIC -DPIC -c -o Scrt1.o ${.CURDIR}/crt1.c +crt1.s: crt1.c + ${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1.c + sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + +crt1.o: crt1.s + ${CC} ${CFLAGS} -c -o ${.TARGET} crt1.s + +gcrt1.s: crt1.c + ${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.CURDIR}/crt1.c + sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET} + +gcrt1.o: gcrt1.s + ${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***