svn commit: r293213 - in projects/release-install-debug: lib/libc/gen sys/x86/include

[Glen Barber]

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);