[Glibc-bsd-commits] r3599 - in trunk/kfreebsd-9/debian: arch/i386 patches

[Robert Millan]

Author: rmh
Date: 2011-07-16 21:27:36 +0000 (Sat, 16 Jul 2011)
New Revision: 3599

Modified:
   trunk/kfreebsd-9/debian/arch/i386/xen.config
   trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff
Log:
Remove SEMMAP setting from config (see r224016 in upstream SVN)

Modified: trunk/kfreebsd-9/debian/arch/i386/xen.config
===================================================================
--- trunk/kfreebsd-9/debian/arch/i386/xen.config	2011-07-16 20:45:21 UTC (rev 3598)
+++ trunk/kfreebsd-9/debian/arch/i386/xen.config	2011-07-16 21:27:36 UTC (rev 3599)
@@ -34,7 +34,6 @@
 options         SEMMNI=256
 options         SEMMNS=512
 options         SEMMNU=256
-options         SEMMAP=256
 
 # Network options
 device		carp

Modified: trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff	2011-07-16 20:45:21 UTC (rev 3598)
+++ trunk/kfreebsd-9/debian/patches/906_grow_sysv_ipc_limits.diff	2011-07-16 21:27:36 UTC (rev 3599)
@@ -23,7 +23,7 @@
 
 --- a/sys/amd64/conf/GENERIC
 +++ b/sys/amd64/conf/GENERIC
-@@ -55,6 +55,12 @@
+@@ -55,6 +55,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
@@ -32,13 +32,12 @@
 +options                SEMMNI=256
 +options                SEMMNS=512
 +options                SEMMNU=256
-+options                SEMMAP=256
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
  options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 --- a/sys/i386/conf/GENERIC
 +++ b/sys/i386/conf/GENERIC
-@@ -56,6 +56,12 @@
+@@ -56,6 +56,11 @@
  options 	SYSVSHM			# SYSV-style shared memory
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
@@ -47,7 +46,6 @@
 +options                SEMMNI=256
 +options                SEMMNS=512
 +options                SEMMNU=256
-+options                SEMMAP=256
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
  options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
  options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev