[kernel] r15089 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Mon Feb  1 16:20:46 2010
New Revision: 15089

Log:
x86: Disable deprecated X86_CPU_DEBUG, causes boot failures.

see upstream bugzilla #15075

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Feb  1 13:41:22 2010	(r15088)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Feb  1 16:20:46 2010	(r15089)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.32-7) UNRELEASED; urgency=low
+
+  * [x86] Disable deprecated X86_CPU_DEBUG, causes boot failures.
+
+ -- maximilian attems <maks at debian.org>  Mon, 01 Feb 2010 17:16:31 +0100
+
 linux-2.6 (2.6.32-6) unstable; urgency=high
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Feb  1 13:41:22 2010	(r15088)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Feb  1 16:20:46 2010	(r15089)
@@ -34,7 +34,7 @@
 CONFIG_MICROCODE_AMD=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-CONFIG_X86_CPU_DEBUG=m
+# CONFIG_X86_CPU_DEBUG is not set
 CONFIG_NODES_SHIFT=6
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW_64K=y