From owner-svn-src-all@FreeBSD.ORG Mon Jun 23 22:35:42 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF15A772; Mon, 23 Jun 2014 22:35:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8137D2CC6; Mon, 23 Jun 2014 22:35:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NMZgqi095468; Mon, 23 Jun 2014 22:35:42 GMT (envelope-from rodrigc@svn.freebsd.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5NMZgjP095465; Mon, 23 Jun 2014 22:35:42 GMT (envelope-from rodrigc@svn.freebsd.org) Message-Id: <201406232235.s5NMZgjP095465@svn.freebsd.org> From: Craig Rodrigues Date: Mon, 23 Jun 2014 22:35:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r267808 - in stable/10: sbin/mount_nullfs sys/x86/acpica X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2014 22:35:42 -0000 Author: rodrigc Date: Mon Jun 23 22:35:41 2014 New Revision: 267808 URL: http://svnweb.freebsd.org/changeset/base/267808 Log: Undo bad merge. Modified: stable/10/sbin/mount_nullfs/mount_nullfs.c stable/10/sys/x86/acpica/madt.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/mount_nullfs/mount_nullfs.c ============================================================================== --- stable/10/sbin/mount_nullfs/mount_nullfs.c Mon Jun 23 22:31:28 2014 (r267807) +++ stable/10/sbin/mount_nullfs/mount_nullfs.c Mon Jun 23 22:35:41 2014 (r267808) @@ -103,25 +103,18 @@ main(int argc, char *argv[]) err(EX_USAGE, "%s", source); if (subdir(target, source) || subdir(source, target)) - errx(EX_USAGE, "%s (%s) and %s are not lldistinct paths", + errx(EX_USAGE, "%s (%s) and %s are not distinct paths", argv[0], target, argv[1]); - printf("Debug: 1\n"); build_iovec(&iov, &iovlen, "fstype", nullfs, (size_t)-1); build_iovec(&iov, &iovlen, "fspath", source, (size_t)-1); build_iovec(&iov, &iovlen, "target", target, (size_t)-1); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); - printf("Debug: 2, source: %zd target: %zdd\n", strlen(source), strlen(target)); if (nmount(iov, iovlen, 0) < 0) { - printf("Debug: 3\n"); - if (errmsg[0] != 0) { - printf("Debug 4\n"); + if (errmsg[0] != 0) err(1, "%s: %s", source, errmsg); - } - else { - printf("Debug 5\n"); + else err(1, "%s", source); - } } exit(0); } Modified: stable/10/sys/x86/acpica/madt.c ============================================================================== --- stable/10/sys/x86/acpica/madt.c Mon Jun 23 22:31:28 2014 (r267807) +++ stable/10/sys/x86/acpica/madt.c Mon Jun 23 22:35:41 2014 (r267808) @@ -306,11 +306,10 @@ interrupt_polarity(UINT16 IntiFlags, UIN case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); case ACPI_MADT_POLARITY_ACTIVE_LOW: - break; + return (INTR_POLARITY_LOW); default: - printf("WARNING: Bogus Interrupt Polarity. Assume POLALITY LOW"); + panic("Bogus Interrupt Polarity"); } - return (INTR_POLARITY_LOW); } static enum intr_trigger @@ -326,13 +325,10 @@ interrupt_trigger(UINT16 IntiFlags, UINT case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); case ACPI_MADT_TRIGGER_LEVEL: - break; + return (INTR_TRIGGER_LEVEL); default: - printf("WARNING: Bogus Interrupt Trigger Mode. Assume Level trigger."); - - break; + panic("Bogus Interrupt Trigger Mode"); } - return (INTR_TRIGGER_LEVEL); } /*