[Glibc-bsd-commits] r2630 - trunk/kfreebsd-8/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2009-07-16 14:54:39 +0000 (Thu, 16 Jul 2009)
New Revision: 2630

Modified:
   trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
Log:
Fix patches/906_grow_sysv_ipc_limits.diff


Modified: trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff	2009-07-16 13:46:04 UTC (rev 2629)
+++ trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff	2009-07-16 14:54:39 UTC (rev 2630)
@@ -1,4 +1,3 @@
-
 Status: Rejected in upstream (kern/77353)
 
 postgresql documentation encourages to grow SysV IPC limits on *BSD systems
@@ -22,41 +21,37 @@
     You might also want to configure your kernel to lock shared memory into RAM and prevent it from being paged out to swap. Use the sysctl setting kern.ipc.shm_use_phys. 
 </quote>
 
-Index: src/sys/i386/conf/GENERIC
-===================================================================
---- src.orig/sys/i386/conf/GENERIC
-+++ src/sys/i386/conf/GENERIC
-@@ -57,8 +57,14 @@
+--- kfreebsd-8-8.0~cvs20090715.orig/sys/amd64/conf/GENERIC
++++ kfreebsd-8-8.0~cvs20090715/sys/amd64/conf/GENERIC
+@@ -63,8 +63,14 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-+options         SHMMAXPGS=4096
-+options         SHMSEG=256
++options		SHMMAXPGS=4096
++options		SHMSEG=256
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
-+options         SEMMNI=256
-+options         SEMMNS=512
-+options         SEMMNU=256
-+options         SEMMAP=256
++options		SEMMNI=256
++options		SEMMNS=512
++options		SEMMNU=256
++options		SEMMAP=256
+ options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
- options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
- options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-Index: src/sys/amd64/conf/GENERIC
-===================================================================
---- src.orig/sys/amd64/conf/GENERIC
-+++ src/sys/amd64/conf/GENERIC
-@@ -57,8 +57,14 @@
+ options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
+--- kfreebsd-8-8.0~cvs20090715.orig/sys/i386/conf/GENERIC
++++ kfreebsd-8-8.0~cvs20090715/sys/i386/conf/GENERIC
+@@ -64,8 +64,14 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-+options         SHMMAXPGS=4096
-+options         SHMSEG=256
++options		SHMMAXPGS=4096
++options		SHMSEG=256
  options 	SYSVMSG			# SYSV-style message queues
  options 	SYSVSEM			# SYSV-style semaphores
-+options         SEMMNI=256
-+options         SEMMNS=512
-+options         SEMMNU=256
-+options         SEMMAP=256
++options		SEMMNI=256
++options		SEMMNS=512
++options		SEMMNU=256
++options		SEMMAP=256
+ options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
  options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
- options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
- options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
+ options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.