[kernel] r14082 - in dists/trunk/linux-2.6/debian: . config/ia64

[Dann Frazier]

Author: dannf
Date: Tue Aug  4 20:56:03 2009
New Revision: 14082

Log:
[ia64] Stop disabling CONFIG_HOTPLUG_CPU, which was blocking
CONFIG_KEXEC from being enabled

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/ia64/config.itanium
   dists/trunk/linux-2.6/debian/config/ia64/config.mckinley

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Aug  4 18:17:11 2009	(r14081)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Aug  4 20:56:03 2009	(r14082)
@@ -55,6 +55,8 @@
 
   [ dann frazier ]
   * n_tty: Fix echo race
+  * [ia64] Stop disabling CONFIG_HOTPLUG_CPU, which was blocking
+    CONFIG_KEXEC from being enabled
 
  -- maximilian attems <maks at debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Tue Aug  4 18:17:11 2009	(r14081)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Tue Aug  4 20:56:03 2009	(r14082)
@@ -15,6 +15,7 @@
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=m
 CONFIG_KEXEC=y
+CONFIG_HOTPLUG_CPU=y
 CONFIG_CRASH_DUMP=y
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/ia64/config.itanium
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config.itanium	Tue Aug  4 18:17:11 2009	(r14081)
+++ dists/trunk/linux-2.6/debian/config/ia64/config.itanium	Tue Aug  4 20:56:03 2009	(r14082)
@@ -7,6 +7,5 @@
 ## end choice
 CONFIG_SMP=y
 CONFIG_NR_CPUS=64
-# CONFIG_HOTPLUG_CPU is not set
 # CONFIG_SCHED_SMT is not set
 

Modified: dists/trunk/linux-2.6/debian/config/ia64/config.mckinley
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config.mckinley	Tue Aug  4 18:17:11 2009	(r14081)
+++ dists/trunk/linux-2.6/debian/config/ia64/config.mckinley	Tue Aug  4 20:56:03 2009	(r14082)
@@ -7,6 +7,5 @@
 ## end choice
 CONFIG_SMP=y
 CONFIG_NR_CPUS=64
-# CONFIG_HOTPLUG_CPU is not set
 # CONFIG_SCHED_SMT is not set