diff options
author | Michael Mason <ms13sp@gmail.com> | 2009-08-07 20:10:13 +0000 |
---|---|---|
committer | Michael Mason <ms13sp@gmail.com> | 2009-08-07 20:10:13 +0000 |
commit | ec8a8d7e534e0817b9d5c3d5bdc7c931d427d245 (patch) | |
tree | faf6a1386e756246ee5b843da5fc929306535458 /main/linux-grsec/kernelconfig | |
parent | 33d32854b1630a53e318d51b7ffe1118fede11ec (diff) | |
parent | 6d71de19a0fbfbe69873ea6c4779ed647889b892 (diff) | |
download | aports-ec8a8d7e534e0817b9d5c3d5bdc7c931d427d245.tar.bz2 aports-ec8a8d7e534e0817b9d5c3d5bdc7c931d427d245.tar.xz |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/linux-grsec/kernelconfig')
-rw-r--r-- | main/linux-grsec/kernelconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/main/linux-grsec/kernelconfig b/main/linux-grsec/kernelconfig index 71ee5348..5fd6c53c 100644 --- a/main/linux-grsec/kernelconfig +++ b/main/linux-grsec/kernelconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30.4 -# Mon Aug 3 08:50:09 2009 +# Fri Aug 7 08:30:31 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -163,12 +163,12 @@ CONFIG_BLK_DEV_BSG=y CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=m CONFIG_IOSCHED_DEADLINE=m -CONFIG_IOSCHED_CFQ=m +CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_FREEZER=y @@ -244,10 +244,10 @@ CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set # CONFIG_IOMMU_API is not set CONFIG_NR_CPUS=8 -# CONFIG_SCHED_SMT is not set +CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT_NONE=y -# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y @@ -304,7 +304,7 @@ CONFIG_MTRR=y CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -# CONFIG_X86_PAT is not set +CONFIG_X86_PAT=y # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set |