From 90a7a09edeaaf9d8d6bec35e6a2855017c3d78e1 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 13 Sep 2005 14:37:54 +0000 Subject: [PATCH] * Move audit and preempt settings to core config file. * Fix powerpc configuration. * debian/arch/alpha/config, debian/arch/amd64/config, debian/arch/arm/config, debian/arch/hppa/config, debian/arch/i386/config, debian/arch/ia64/config, debian/arch/m68k/config, debian/arch/s390/config, debian/arch/sparc/config, debian/arch/sparc/config.sparc64: Remove audit and preempt settings. * debian/arch/config: Add audit and preempt settings. * debian/arch/powerpc/config - Remove audit and preempt settings. - Add HZ settings. * debian/arch/powerpc/config.powerpc, debian/arch/powerpc/config.powerpc-smp, debian/arch/powerpc/noconfig.apus: Fix several options. * debian/arch/powerpc/config.powerpc64: Add correct memory model. * debian/changelog: Update. svn path=/dists/trunk/linux-2.6/; revision=4181 --- debian/arch/alpha/config | 1 - debian/arch/amd64/config | 3 --- debian/arch/arm/config | 2 -- debian/arch/config | 7 ++++++- debian/arch/hppa/config | 2 -- debian/arch/i386/config | 2 -- debian/arch/ia64/config | 2 -- debian/arch/m68k/config | 1 - debian/arch/powerpc/config | 10 ++++++++-- debian/arch/powerpc/config.powerpc | 8 ++++++++ debian/arch/powerpc/config.powerpc-smp | 8 ++++++++ debian/arch/powerpc/config.powerpc64 | 7 ++++++- debian/arch/powerpc/noconfig.apus | 1 - debian/arch/s390/config | 2 -- debian/arch/sparc/config | 1 - debian/arch/sparc/config.sparc64 | 1 - debian/changelog | 6 +++++- 17 files changed, 41 insertions(+), 23 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 533284e42..c090d8906 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -4,7 +4,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_ISA_DMA=y # CONFIG_GENERIC_IOMAP is not set CONFIG_CLEAN_COMPILE=y -# CONFIG_AUDIT is not set # CONFIG_KOBJECT_UEVENT is not set # CONFIG_IKCONFIG is not set # CONFIG_EMBEDDED is not set diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 8b3829afd..cde3fd82d 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_AUDIT=y -# CONFIG_AUDITSYSCALL is not set CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -25,7 +23,6 @@ CONFIG_X86_CPUID=m CONFIG_X86_IO_APIC=y CONFIG_X86_LOCAL_APIC=y CONFIG_MTRR=y -# CONFIG_PREEMPT is not set CONFIG_HPET_TIMER=y CONFIG_X86_PM_TIMER=y CONFIG_GART_IOMMU=y diff --git a/debian/arch/arm/config b/debian/arch/arm/config index 29632344e..8f9c0b7a2 100644 --- a/debian/arch/arm/config +++ b/debian/arch/arm/config @@ -12,7 +12,6 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set CONFIG_SYSCTL=y -# CONFIG_AUDIT is not set # CONFIG_HOTPLUG is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set @@ -55,7 +54,6 @@ CONFIG_KMOD=y CONFIG_CPU_32=y CONFIG_CPU_CACHE_VIVT=y # CONFIG_PCCARD is not set -# CONFIG_PREEMPT is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 diff --git a/debian/arch/config b/debian/arch/config index 685dae0f7..0c9ea4967 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -286,7 +286,6 @@ CONFIG_NTFS_RW=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_NFS_COMMON=y -CONFIG_PREEMPT_NONE=y # CONFIG_TCG_TPM is not set CONFIG_USB_MON=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set @@ -382,3 +381,9 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=m +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +# CONFIG_PREEMPT_BKL is not set diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 4d614dc7a..b1212f9ea 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -14,7 +14,6 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_SYSCTL=y -# CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y @@ -45,7 +44,6 @@ CONFIG_KMOD=y # CONFIG_PA7100LC is not set # CONFIG_PA7200 is not set # CONFIG_PA7300LC is not set -# CONFIG_PREEMPT is not set CONFIG_GSC=y CONFIG_HPPB=y CONFIG_IOMMU_CCIO=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 7f6c09a68..b6b1773c4 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -5,7 +5,6 @@ CONFIG_GENERIC_IOMAP=y # CONFIG_CLEAN_COMPILE is not set CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y -# CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y @@ -41,7 +40,6 @@ CONFIG_X86_PC=y # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set CONFIG_HPET_TIMER=y -# CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_TOSHIBA=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 7547e816e..49f6c299e 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -1,5 +1,4 @@ CONFIG_CLEAN_COMPILE=y -# CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -32,7 +31,6 @@ CONFIG_DISCONTIGMEM=y # CONFIG_IA64_CYCLONE is not set CONFIG_IOSAPIC=y CONFIG_FORCE_MAX_ZONEORDER=18 -# CONFIG_PREEMPT is not set CONFIG_IA32_SUPPORT=y CONFIG_COMPAT=y CONFIG_IA64_MCA_RECOVERY=m diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index c776e5b98..2b911ae72 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -11,7 +11,6 @@ CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_SYSCTL=y -CONFIG_AUDIT=y # CONFIG_HOTPLUG is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 93cab9552..6d5006d0a 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -6,7 +6,6 @@ CONFIG_PPC32=y CONFIG_GENERIC_NVRAM=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_CLEAN_COMPILE=y -CONFIG_AUDIT=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set # CONFIG_EMBEDDED is not set @@ -80,7 +79,6 @@ CONFIG_PPC_PMAC=y CONFIG_PPC_PREP=y CONFIG_PPC_OF=y CONFIG_PPCBUG_NVRAM=y -# CONFIG_PREEMPT is not set CONFIG_HIGHMEM=y CONFIG_PROC_DEVICETREE=y CONFIG_PREP_RESIDUAL=y @@ -257,6 +255,7 @@ CONFIG_IEEE1394_CMP=m CONFIG_IEEE1394_AMDTP=m CONFIG_I2O=m CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m @@ -1239,6 +1238,7 @@ CONFIG_EXT2_FS=m CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT2_FS_XIP=n CONFIG_EXT3_FS=m CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m @@ -1340,3 +1340,9 @@ CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_KEXEC=y +CONFIG_PMAC_MEDIABAY=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 diff --git a/debian/arch/powerpc/config.powerpc b/debian/arch/powerpc/config.powerpc index 6997e86b7..78b974b6b 100644 --- a/debian/arch/powerpc/config.powerpc +++ b/debian/arch/powerpc/config.powerpc @@ -7,3 +7,11 @@ CONFIG_MKISS=m CONFIG_PCMCIA_XIRTULIP=m # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_MAC_FLOPPY=y +CONFIG_6xx=y +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_POWER3 is not set +# CONFIG_POWER4 is not set +# CONFIG_8xx is not set +# CONFIG_E200 is not set +# CONFIG_E500 is not set diff --git a/debian/arch/powerpc/config.powerpc-smp b/debian/arch/powerpc/config.powerpc-smp index 860b8fcca..3a8e65f5d 100644 --- a/debian/arch/powerpc/config.powerpc-smp +++ b/debian/arch/powerpc/config.powerpc-smp @@ -6,3 +6,11 @@ CONFIG_IRQ_ALL_CPUS=y CONFIG_NR_CPUS=4 # CONFIG_SOFTWARE_SUSPEND is not set # CONFIG_MAC_FLOPPY is not set +CONFIG_6xx=y +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_POWER3 is not set +# CONFIG_POWER4 is not set +# CONFIG_8xx is not set +# CONFIG_E200 is not set +# CONFIG_E500 is not set diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64 index b141a2d12..137948e22 100644 --- a/debian/arch/powerpc/config.powerpc64 +++ b/debian/arch/powerpc/config.powerpc64 @@ -6,7 +6,6 @@ CONFIG_CPUSETS=y # CONFIG_DEBUGGER is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_DISCONTIGMEM=y CONFIG_EARLY_PRINTK=y CONFIG_EEH=y # CONFIG_FB_ATY128 is not set @@ -44,6 +43,7 @@ CONFIG_PPC64=y CONFIG_PPC_MAPLE=y CONFIG_PPC_PMAC64=y CONFIG_PPC_PSERIES=y +# CONFIG_PPC_BPA is not set CONFIG_PPC_RTAS=y CONFIG_PPC_SPLPAR=y CONFIG_RTAS_FLASH=m @@ -62,3 +62,8 @@ CONFIG_STOP_MACHINE=y CONFIG_SYSVIPC_COMPAT=y CONFIG_THERM_PM72=y CONFIG_U3_DART=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_I2O_EXT_ADAPTEC_DMA64=y +CONFIG_WATCHDOG_RTAS=m diff --git a/debian/arch/powerpc/noconfig.apus b/debian/arch/powerpc/noconfig.apus index 4f7f65e41..f208f6f36 100644 --- a/debian/arch/powerpc/noconfig.apus +++ b/debian/arch/powerpc/noconfig.apus @@ -114,7 +114,6 @@ CONFIG_APUS=y # CONFIG_LITE5200 is not set # CONFIG_MPC834x_SYS is not set # CONFIG_SMP is not set -# CONFIG_PREEMPT is not set # CONFIG_HIGHMEM is not set CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 24155ebd7..af8e84586 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -2,7 +2,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_S390=y CONFIG_CLEAN_COMPILE=y CONFIG_LOCK_KERNEL=y -# CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_CPUSETS=y @@ -22,7 +21,6 @@ CONFIG_MACHCHK_WARNING=y CONFIG_QDIO=y # CONFIG_QDIO_PERF_STATS is not set # CONFIG_QDIO_DEBUG is not set -# CONFIG_PREEMPT is not set CONFIG_IPL=y # CONFIG_PROCESS_DEBUG is not set CONFIG_PFAULT=y diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index a1a1e17ff..4e8540ca2 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -1,5 +1,4 @@ CONFIG_CLEAN_COMPILE=y -# CONFIG_AUDIT is not set CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set # CONFIG_EMBEDDED is not set diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index 6cbb14bbb..8b2ec83d3 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -8,7 +8,6 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_SYSVIPC_COMPAT=y CONFIG_BBC_I2C=m # CONFIG_SMP is not set -# CONFIG_PREEMPT is not set # CONFIG_CPU_FREQ is not set CONFIG_SPARC64=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y diff --git a/debian/changelog b/debian/changelog index f86d7b8e6..21cceb3c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,11 @@ linux-2.6 (2.6.13-1) UNRELEASED; urgency=low * Ensure that only one kernel-manual/linux-manual package can be installed at a time to avoid file conflicts. (closes: #320042) - -- Simon Horman Mon, 12 Sep 2005 16:56:59 +0900 + [ Bastian Blank ] + * Move audit and preempt settings to core config file. + * Fix powerpc configuration. + + -- Bastian Blank Mon, 12 Sep 2005 19:01:53 +0000 linux-2.6 (2.6.12-6) unstable; urgency=high