diff options
| author | Maximilian Attems <maks@debian.org> | 2010-02-01 16:20:46 +0000 |
|---|---|---|
| committer | Maximilian Attems <maks@debian.org> | 2010-02-01 16:20:46 +0000 |
| commit | 1edf84b96ba4470218d33d82c4c5cd3289879261 (patch) | |
| tree | ad3a5fbc189cb9b96ea3184dba23d571598b772b | |
| parent | 22de7196fb2d63829d1ee746662a25e983f84ebf (diff) | |
| download | kernel_replicant_linux-1edf84b96ba4470218d33d82c4c5cd3289879261.tar.gz kernel_replicant_linux-1edf84b96ba4470218d33d82c4c5cd3289879261.tar.bz2 kernel_replicant_linux-1edf84b96ba4470218d33d82c4c5cd3289879261.zip | |
x86: Disable deprecated X86_CPU_DEBUG, causes boot failures.
see upstream bugzilla #15075
svn path=/dists/trunk/linux-2.6/; revision=15089
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/config/kernelarch-x86/config | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index b3a4b71d9a87..ebe63b1bb3c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@debian.org> Mon, 01 Feb 2010 17:16:31 +0100 + linux-2.6 (2.6.32-6) unstable; urgency=high [ Ben Hutchings ] diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 47edfc8e793e..e8dea8561bcf 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -34,7 +34,7 @@ CONFIG_MICROCODE_INTEL=y 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 |