diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-02-19 08:39:16 +0000 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2013-02-19 08:39:16 +0000 |
| commit | b535bc8b6bb57100b82a96cfc8036b44352e30fc (patch) | |
| tree | 31be403d6baa1479e97293ffc6b072e40c0c09e6 /main/linux-grsec/kernelconfig.x86 | |
| parent | 13e403edbd162d0ba72c8247277274c49e063766 (diff) | |
| parent | cd5234ffb565c96748944cc9a0438a2dcb23b134 (diff) | |
| download | aports-b535bc8b6bb57100b82a96cfc8036b44352e30fc.tar.bz2 aports-b535bc8b6bb57100b82a96cfc8036b44352e30fc.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86')
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 0e4dd3dfb..648495afc 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -401,7 +401,7 @@ CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m +# CONFIG_X86_MSR is not set CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y @@ -457,7 +457,7 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y # CONFIG_EFI is not set -# CONFIG_SECCOMP is not set +CONFIG_SECCOMP=y # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y |