debian/arch: Unify CPUSET options.

debian/changelog: Update.

svn path=/dists/trunk/linux-2.6/; revision=7588

19 files changed, 3 insertions, 18 deletions

diff --git a/debian/arch/alpha/config.alpha-smp b/debian/arch/alpha/config.alpha-smp
index 40b5f02315f9..ee14a1f00dca 100644
--- a/debian/arch/alpha/config.alpha-smp
+++ b/debian/arch/alpha/config.alpha-smp
@@ -1,5 +1,4 @@
 CONFIG_SMP=y
 CONFIG_NR_CPUS=64
-# CONFIG_CPUSETS is not set
 # CONFIG_ALPHA_LEGACY_START_ADDRESS is not set
 CONFIG_SCSI=y
diff --git a/debian/arch/amd64/config.amd64 b/debian/arch/amd64/config.amd64
index 997f014d70a4..75c7049ed21a 100644
--- a/debian/arch/amd64/config.amd64
+++ b/debian/arch/amd64/config.amd64
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-CONFIG_CPUSETS=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SMP=y
 # CONFIG_NUMA_EMU is not set
diff --git a/debian/arch/config b/debian/arch/config
index a253dfe80b04..b1f97281bfe4 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -1051,3 +1051,4 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_ROUTE=y
 CONFIG_DVB_PLL=m
+CONFIG_CPUSETS=y
diff --git a/debian/arch/hppa/config.parisc-smp b/debian/arch/hppa/config.parisc-smp
index 258e878a7e48..2e6b4ed4e9c9 100644
--- a/debian/arch/hppa/config.parisc-smp
+++ b/debian/arch/hppa/config.parisc-smp
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_PA7000=y
 # CONFIG_PA8X00 is not set
diff --git a/debian/arch/hppa/config.parisc64-smp b/debian/arch/hppa/config.parisc64-smp
index 3454ca1f4185..1f402d992385 100644
--- a/debian/arch/hppa/config.parisc64-smp
+++ b/debian/arch/hppa/config.parisc64-smp
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_PA7000 is not set
 CONFIG_PA8X00=y
diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686
index a80ce443f990..6e75945b746b 100644
--- a/debian/arch/i386/config.686
+++ b/debian/arch/i386/config.686
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 CONFIG_M686=y
diff --git a/debian/arch/i386/config.686-bigmem b/debian/arch/i386/config.686-bigmem
index 49cc2f9f53d7..fe4048f92c64 100644
--- a/debian/arch/i386/config.686-bigmem
+++ b/debian/arch/i386/config.686-bigmem
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 CONFIG_M686=y
diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7
index 9738a23d0354..e33c1866c211 100644
--- a/debian/arch/i386/config.k7
+++ b/debian/arch/i386/config.k7
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 # CONFIG_M686 is not set
diff --git a/debian/arch/ia64/config.itanium b/debian/arch/ia64/config.itanium
index 715800ed94df..4f6d33627b67 100644
--- a/debian/arch/ia64/config.itanium
+++ b/debian/arch/ia64/config.itanium
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_ITANIUM=y
 # CONFIG_MCKINLEY is not set
diff --git a/debian/arch/ia64/config.mckinley b/debian/arch/ia64/config.mckinley
index 2e657e4c3424..02eec32e2c2b 100644
--- a/debian/arch/ia64/config.mckinley
+++ b/debian/arch/ia64/config.mckinley
@@ -1,5 +1,4 @@
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_ITANIUM is not set
 CONFIG_MCKINLEY=y
diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a
index b3715bc2b02b..fa560d859739 100644
--- a/debian/arch/mips/config.sb1-bcm91250a
+++ b/debian/arch/mips/config.sb1-bcm91250a
@@ -168,7 +168,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 # CONFIG_IKCONFIG is not set
-# CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b
index 28adb51deca1..e1612afdaa78 100644
--- a/debian/arch/mips/config.sb1a-bcm91480b
+++ b/debian/arch/mips/config.sb1a-bcm91480b
@@ -163,7 +163,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 # CONFIG_IKCONFIG is not set
-# CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a
index cef2fe9a64ad..162f036eb9ae 100644
--- a/debian/arch/mipsel/config.sb1-bcm91250a
+++ b/debian/arch/mipsel/config.sb1-bcm91250a
@@ -168,7 +168,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 # CONFIG_IKCONFIG is not set
-# CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b
index 2416a3f891ba..315e7afbd3ee 100644
--- a/debian/arch/mipsel/config.sb1a-bcm91480b
+++ b/debian/arch/mipsel/config.sb1a-bcm91480b
@@ -163,7 +163,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_AUDIT=y
 # CONFIG_IKCONFIG is not set
-# CONFIG_CPUSETS is not set
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EMBEDDED=y
diff --git a/debian/arch/powerpc/config.powerpc-smp b/debian/arch/powerpc/config.powerpc-smp
index be3f48f10821..4cd576248957 100644
--- a/debian/arch/powerpc/config.powerpc-smp
+++ b/debian/arch/powerpc/config.powerpc-smp
@@ -1,7 +1,6 @@
 # CONFIG_APUS is not set
 CONFIG_PPC32=y
 CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
 CONFIG_STOP_MACHINE=y
 CONFIG_SMP=y
 CONFIG_IRQ_ALL_CPUS=y
diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64
index bc5395615b5f..a4593342e914 100644
--- a/debian/arch/powerpc/config.powerpc64
+++ b/debian/arch/powerpc/config.powerpc64
@@ -2,7 +2,6 @@
 CONFIG_PPC64=y
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
-CONFIG_CPUSETS=y
 # CONFIG_DEBUGGER is not set
 CONFIG_EEH=y
 # CONFIG_FB_ATY128 is not set
diff --git a/debian/arch/s390/config b/debian/arch/s390/config
index 568e4282629b..9c38dc825525 100644
--- a/debian/arch/s390/config
+++ b/debian/arch/s390/config
@@ -4,7 +4,6 @@ CONFIG_CLEAN_COMPILE=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
-CONFIG_CPUSETS=y
 CONFIG_STOP_MACHINE=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp
index 319e29dbfa60..55cc93c20da2 100644
--- a/debian/arch/sparc/config.sparc64-smp
+++ b/debian/arch/sparc/config.sparc64-smp
@@ -392,7 +392,6 @@ CONFIG_USB_STORAGE_DPCM=y
 CONFIG_IDE_GENERIC=m
 CONFIG_USB=y
 # CONFIG_I2C_I810 is not set
-# CONFIG_CPUSETS is not set
 # CONFIG_SENSORS_VIA686A is not set
 CONFIG_SPARSEMEM_EXTREME=y
 # CONFIG_SENSORS_PC87360 is not set
diff --git a/debian/changelog b/debian/changelog
index 93bfd1529eb7..16192772875c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Fix home of patch apply script.
+  * Unify CPUSET option. (closes: #391931)
 
   [ Steve Langasek ]
   * [alpha] restore alpha-prctl.patch, which keeps disappearing every time
@@ -27,7 +28,7 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
   * bugfix/sky2-receive-FIFO-fix.patch: fix sky2 hangs on some chips
     Thanks to Stephen Hemminger for the patch. (Closes: #391382)
 
- -- dann frazier <dannf@debian.org>  Mon,  9 Oct 2006 10:59:58 -0600
+ -- Bastian Blank <waldi@debian.org>  Tue, 10 Oct 2006 13:20:11 +0200
 
 linux-2.6 (2.6.18-2) unstable; urgency=low