From owner-svn-src-projects@freebsd.org Tue Jan 5 17:37:58 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C06BA62CB0 for ; Tue, 5 Jan 2016 17:37:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D462E15A1; Tue, 5 Jan 2016 17:37:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05HbvfU009242; Tue, 5 Jan 2016 17:37:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05HbuKf009240; Tue, 5 Jan 2016 17:37:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601051737.u05HbuKf009240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 5 Jan 2016 17:37:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r293213 - in projects/release-install-debug: lib/libc/gen sys/x86/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 05 Jan 2016 17:37:58 -0000 Author: gjb Date: Tue Jan 5 17:37:56 2016 New Revision: 293213 URL: https://svnweb.freebsd.org/changeset/base/293213 Log: Fix two mis-merged files. Sponsored by: The FreeBSD Foundation Modified: projects/release-install-debug/lib/libc/gen/ulimit.c projects/release-install-debug/sys/x86/include/acpica_machdep.h Modified: projects/release-install-debug/lib/libc/gen/ulimit.c ============================================================================== --- projects/release-install-debug/lib/libc/gen/ulimit.c Tue Jan 5 17:34:20 2016 (r293212) +++ projects/release-install-debug/lib/libc/gen/ulimit.c Tue Jan 5 17:37:56 2016 (r293213) @@ -58,7 +58,6 @@ ulimit(int cmd, ...) if (arg > RLIM_INFINITY / 512) arg = RLIM_INFINITY / 512; limit.rlim_max = limit.rlim_cur = arg * 512; - limit.rlim_max = limit.rlim_cur = arg * 512; /* The setrlimit() function sets errno to EPERM if needed. */ if (setrlimit(RLIMIT_FSIZE, &limit) == -1) Modified: projects/release-install-debug/sys/x86/include/acpica_machdep.h ============================================================================== --- projects/release-install-debug/sys/x86/include/acpica_machdep.h Tue Jan 5 17:34:20 2016 (r293212) +++ projects/release-install-debug/sys/x86/include/acpica_machdep.h Tue Jan 5 17:37:56 2016 (r293213) @@ -74,6 +74,7 @@ enum intr_polarity; void acpi_SetDefaultIntrModel(int model); void acpi_cpu_c1(void); +void acpi_cpu_idle_mwait(uint32_t mwait_hint); void *acpi_map_table(vm_paddr_t pa, const char *sig); void acpi_unmap_table(void *table); vm_paddr_t acpi_find_table(const char *sig);