From 487b3f525bb172c1c80aa0850b03bd23678e3bb6 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 4 Aug 2009 20:56:03 +0000 Subject: [PATCH] [ia64] Stop disabling CONFIG_HOTPLUG_CPU, which was blocking CONFIG_KEXEC from being enabled svn path=/dists/trunk/linux-2.6/; revision=14082 --- debian/changelog | 2 ++ debian/config/ia64/config | 1 + debian/config/ia64/config.itanium | 1 - debian/config/ia64/config.mckinley | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ca16bb8e..eea9914ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,8 @@ linux-2.6 (2.6.31~rc5-1~experimental.1) UNRELEASED; urgency=low [ dann frazier ] * n_tty: Fix echo race + * [ia64] Stop disabling CONFIG_HOTPLUG_CPU, which was blocking + CONFIG_KEXEC from being enabled -- maximilian attems Thu, 18 Jun 2009 23:50:56 +0200 diff --git a/debian/config/ia64/config b/debian/config/ia64/config index d09d83067..abd76620d 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -15,6 +15,7 @@ CONFIG_IA64_MCA_RECOVERY=m CONFIG_PERFMON=y CONFIG_IA64_PALINFO=m CONFIG_KEXEC=y +CONFIG_HOTPLUG_CPU=y CONFIG_CRASH_DUMP=y ## diff --git a/debian/config/ia64/config.itanium b/debian/config/ia64/config.itanium index af9910d28..e683b846b 100644 --- a/debian/config/ia64/config.itanium +++ b/debian/config/ia64/config.itanium @@ -7,6 +7,5 @@ CONFIG_ITANIUM=y ## end choice CONFIG_SMP=y CONFIG_NR_CPUS=64 -# CONFIG_HOTPLUG_CPU is not set # CONFIG_SCHED_SMT is not set diff --git a/debian/config/ia64/config.mckinley b/debian/config/ia64/config.mckinley index d2a47ed3f..6da85354e 100644 --- a/debian/config/ia64/config.mckinley +++ b/debian/config/ia64/config.mckinley @@ -7,6 +7,5 @@ CONFIG_MCKINLEY=y ## end choice CONFIG_SMP=y CONFIG_NR_CPUS=64 -# CONFIG_HOTPLUG_CPU is not set # CONFIG_SCHED_SMT is not set