diff --git a/debian/arch/alpha/config.alpha-smp b/debian/arch/alpha/config.alpha-smp index 40b5f0231..ee14a1f00 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 997f014d7..75c7049ed 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 a253dfe80..b1f97281b 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 258e878a7..2e6b4ed4e 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 3454ca1f4..1f402d992 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 a80ce443f..6e75945b7 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 49cc2f9f5..fe4048f92 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 9738a23d0..e33c1866c 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 715800ed9..4f6d33627 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 2e657e4c3..02eec32e2 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 b3715bc2b..fa560d859 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 28adb51de..e1612afda 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 cef2fe9a6..162f036eb 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 2416a3f89..315e7afbd 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 be3f48f10..4cd576248 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 bc5395615..a4593342e 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 568e42826..9c38dc825 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 319e29dbf..55cc93c20 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 93bfd1529..161927728 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 Mon, 9 Oct 2006 10:59:58 -0600 + -- Bastian Blank Tue, 10 Oct 2006 13:20:11 +0200 linux-2.6 (2.6.18-2) unstable; urgency=low