[Glibc-bsd-commits] r4156 - in trunk/kfreebsd-10/debian: . arch/amd64 arch/i386 patches

[Robert Millan]

Author: rmh
Date: 2012-03-18 17:12:09 +0000 (Sun, 18 Mar 2012)
New Revision: 4156

Modified:
   trunk/kfreebsd-10/debian/arch/amd64/amd64.config
   trunk/kfreebsd-10/debian/arch/i386/686.config
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/999_config.diff
Log:
Defer SMP kernel option to upstream config.

Modified: trunk/kfreebsd-10/debian/arch/amd64/amd64.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2012-03-18 17:10:37 UTC (rev 4155)
+++ trunk/kfreebsd-10/debian/arch/amd64/amd64.config	2012-03-18 17:12:09 UTC (rev 4156)
@@ -3,8 +3,6 @@
 cpu		HAMMER
 ident		Debian-amd64
 
-options		SMP		# Symmetric MultiProcessor Kernel
-
 options		COMPAT_LINUX32
 
 # UTF-8 console support

Modified: trunk/kfreebsd-10/debian/arch/i386/686.config
===================================================================
--- trunk/kfreebsd-10/debian/arch/i386/686.config	2012-03-18 17:10:37 UTC (rev 4155)
+++ trunk/kfreebsd-10/debian/arch/i386/686.config	2012-03-18 17:12:09 UTC (rev 4156)
@@ -4,8 +4,6 @@
 makeoptions	COPTFLAGS="-O2 -pipe -march=i686 -mtune=generic"
 ident		Debian-i686
 
-options		SMP		# Symmetric MultiProcessor Kernel
-
 options		COMPAT_LINUX
 
 # UTF-8 console support

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2012-03-18 17:10:37 UTC (rev 4155)
+++ trunk/kfreebsd-10/debian/changelog	2012-03-18 17:12:09 UTC (rev 4156)
@@ -6,8 +6,9 @@
     in debian/rules).
   * Remove ALTQ_NOPCC in kernel configs, it is no longer required by SMP
     systems (see altq_subr.c).
+  * Defer SMP kernel option to upstream config.
 
- -- Robert Millan <rmh at debian.org>  Sun, 18 Mar 2012 18:10:30 +0100
+ -- Robert Millan <rmh at debian.org>  Sun, 18 Mar 2012 18:12:03 +0100
 
 kfreebsd-10 (10.0~svn232747-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/999_config.diff	2012-03-18 17:10:37 UTC (rev 4155)
+++ trunk/kfreebsd-10/debian/patches/999_config.diff	2012-03-18 17:12:09 UTC (rev 4156)
@@ -25,15 +25,6 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -78,7 +80,7 @@
- options 	KDB_TRACE		# Print a stack trace for a panic.
- 
- # Make an SMP-capable kernel by default
--options 	SMP			# Symmetric MultiProcessor Kernel
-+#options 	SMP			# Symmetric MultiProcessor Kernel
- 
- # CPU frequency control
- device		cpufreq
 @@ -87,9 +89,6 @@
  device		acpi
  device		pci
@@ -121,15 +112,6 @@
  options 	KTRACE			# ktrace(1) support
  options 	STACK			# stack(9) support
  options 	SYSVSHM			# SYSV-style shared memory
-@@ -78,7 +82,7 @@
- options 	KDB_TRACE		# Print a stack trace for a panic.
- 
- # To make an SMP kernel, the next two lines are needed
--options 	SMP			# Symmetric MultiProcessor Kernel
-+#options 	SMP			# Symmetric MultiProcessor Kernel
- device		apic			# I/O APIC
- 
- # CPU frequency control
 @@ -89,9 +93,6 @@
  device		eisa
  device		pci