From 784883e07f2a5173990577a0d132271a7fd03dc4 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Mon, 12 Sep 2005 02:13:51 +0000 Subject: [PATCH] * Disable BSDv3 accounting on hppa and alpha, it was already disabled on all other architectures. Also unify BSD accounting config into top level config, rather than per flavour configs. This shows that BSD accounting is available on all except sparc and the rpc and s3c2410 flavours of arm. I am not sure if that is intentional. svn path=/dists/trunk/linux-2.6/; revision=4167 --- debian/arch/alpha/config | 2 -- debian/arch/amd64/config | 2 -- debian/arch/arm/config.footbridge | 2 -- debian/arch/arm/config.ixp4xx | 2 -- debian/arch/config | 2 ++ debian/arch/hppa/config | 2 -- debian/arch/i386/config | 2 -- debian/arch/ia64/config | 2 -- debian/arch/m68k/config | 2 -- debian/arch/powerpc/config | 2 -- debian/arch/powerpc/noconfig.apus | 2 -- debian/arch/s390/config | 2 -- debian/changelog | 16 +++++++++++----- 13 files changed, 13 insertions(+), 27 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 66e86fad6..650d513f8 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -4,8 +4,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_ISA_DMA=y # CONFIG_GENERIC_IOMAP is not set CONFIG_CLEAN_COMPILE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_AUDIT is not set # CONFIG_KOBJECT_UEVENT is not set # CONFIG_IKCONFIG is not set diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 1b6b7dd52..27300fd18 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -7,8 +7,6 @@ CONFIG_EARLY_PRINTK=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_CLEAN_COMPILE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set CONFIG_KOBJECT_UEVENT=y diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index d892f0a83..12fa57d58 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1,6 +1,4 @@ CONFIG_CLEAN_COMPILE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_EMBEDDED=y # CONFIG_MODULE_UNLOAD is not set # CONFIG_MODVERSIONS is not set diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 9cffca5f8..edd0ac6f0 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1,6 +1,4 @@ CONFIG_CLEAN_COMPILE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_EMBEDDED=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_MODULE_UNLOAD is not set diff --git a/debian/arch/config b/debian/arch/config index e6af07c69..61c8587c5 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -301,3 +301,5 @@ CONFIG_SCSI_SATA=y # CONFIG_TCG_TPM is not set CONFIG_SCSI_QLA2XXX=m CONFIG_USB_MON=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_BSD_PROCESS_ACCT=y diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 2c63cb952..a7fbe2839 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -13,8 +13,6 @@ CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index d93f1af21..e399e33d0 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -5,8 +5,6 @@ CONFIG_GENERIC_IOMAP=y # CONFIG_CLEAN_COMPILE is not set CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index d0332ecb3..67cbe7e0e 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -1,6 +1,4 @@ CONFIG_CLEAN_COMPILE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index ecc170315..aa949f2aa 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -10,8 +10,6 @@ CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y # CONFIG_HOTPLUG is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 61ce6820d..dbe3d88c9 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -6,8 +6,6 @@ CONFIG_PPC32=y CONFIG_GENERIC_NVRAM=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_CLEAN_COMPILE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_AUDIT=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set diff --git a/debian/arch/powerpc/noconfig.apus b/debian/arch/powerpc/noconfig.apus index ce9896f6a..4f7f65e41 100644 --- a/debian/arch/powerpc/noconfig.apus +++ b/debian/arch/powerpc/noconfig.apus @@ -28,8 +28,6 @@ CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_HOTPLUG is not set diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 0d467c693..7325e23d3 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -2,8 +2,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_S390=y CONFIG_CLEAN_COMPILE=y CONFIG_LOCK_KERNEL=y -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set diff --git a/debian/changelog b/debian/changelog index c071081bb..17a7fb499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,5 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low - [ Bastian Blank ] - * - [ Frederik Schüler ] * Added class and longclass descriptions for amd64 flavours. * Added patch-2.6.13.1: @@ -17,7 +14,16 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low - aacraid: 2.6.13 aacraid bad BUG_ON fix - Kconfig: saa7134-dvb must select tda1004x - -- Frederik Schüler Sat, 10 Sep 2005 18:12:13 +0200 + [ Simon Horman ] + + * Disable BSDv3 accounting on hppa and alpha, it was already + disabled on all other architectures. Also unify BSD accounting + config into top level config, rather than per flavour configs. + This shows that BSD accounting is available on all except + sparc and the rpc and s3c2410 flavours of arm. + I am not sure if that is intentional. + + -- Simon Horman Fri, 9 Sep 2005 11:38:06 +0900 linux-2.6 (2.6.12-7) UNRELEASED; urgency=low @@ -25,7 +31,7 @@ linux-2.6 (2.6.12-7) UNRELEASED; urgency=low * [SECURITY] THe seq_file memory leak fix included in 2.6.12-6 as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800. - -- Simon Horman Fri, 9 Sep 2005 11:38:06 +0900 + -- Simon Horman Mon, 12 Sep 2005 11:01:38 +0900 linux-2.6 (2.6.12-6) unstable; urgency=high