[ia64] Stop disabling CONFIG_HOTPLUG_CPU, which was blocking

CONFIG_KEXEC from being enabled

svn path=/dists/trunk/linux-2.6/; revision=14082
This commit is contained in:
dann frazier 2009-08-04 20:56:03 +00:00
parent dc018a6dd7
commit 487b3f525b
4 changed files with 3 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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 <maks@debian.org> Thu, 18 Jun 2009 23:50:56 +0200

View File

@ -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
##

View File

@ -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

View File

@ -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