aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2010-12-21 08:50:34 -0600
committerNatanael Copa <ncopa@alpinelinux.org>2011-01-06 15:06:10 +0000
commit3ad2e3fce86ea9b4fce695e4bc089390abf04064 (patch)
tree08962539a31a861d010b2981c4d7d73b3cf3b1af
parent5c7d74869bb3840e551387a14212d244401486b5 (diff)
downloadalpine_aports-3ad2e3fce86ea9b4fce695e4bc089390abf04064.tar.bz2
alpine_aports-3ad2e3fce86ea9b4fce695e4bc089390abf04064.tar.xz
alpine_aports-3ad2e3fce86ea9b4fce695e4bc089390abf04064.zip
main/linux-grsec: Rebuild kernelconfig on x86_64.
(cherry picked from commit ddd9afb6e344d1509f51aa029ae509dc9c5e7301)
-rw-r--r--main/linux-grsec/kernelconfig.x86_6414
1 files changed, 11 insertions, 3 deletions
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index b5ddf5f15c..d730addc70 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.35.8 3# Linux kernel version: 2.6.35.9
4# Wed Nov 24 14:52:40 2010 4# Tue Dec 21 08:49:30 2010
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7# CONFIG_X86_32 is not set 7# CONFIG_X86_32 is not set
@@ -118,6 +118,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
118CONFIG_SYSCTL=y 118CONFIG_SYSCTL=y
119CONFIG_ANON_INODES=y 119CONFIG_ANON_INODES=y
120CONFIG_EMBEDDED=y 120CONFIG_EMBEDDED=y
121CONFIG_UID16=y
121CONFIG_SYSCTL_SYSCALL=y 122CONFIG_SYSCTL_SYSCALL=y
122# CONFIG_KALLSYMS is not set 123# CONFIG_KALLSYMS is not set
123CONFIG_HOTPLUG=y 124CONFIG_HOTPLUG=y
@@ -184,6 +185,7 @@ CONFIG_STOP_MACHINE=y
184CONFIG_BLOCK=y 185CONFIG_BLOCK=y
185CONFIG_BLK_DEV_BSG=y 186CONFIG_BLK_DEV_BSG=y
186# CONFIG_BLK_DEV_INTEGRITY is not set 187# CONFIG_BLK_DEV_INTEGRITY is not set
188CONFIG_BLOCK_COMPAT=y
187 189
188# 190#
189# IO Schedulers 191# IO Schedulers
@@ -510,12 +512,17 @@ CONFIG_HOTPLUG_PCI_SHPC=m
510# Executable file formats / Emulations 512# Executable file formats / Emulations
511# 513#
512CONFIG_BINFMT_ELF=y 514CONFIG_BINFMT_ELF=y
515CONFIG_COMPAT_BINFMT_ELF=y
513# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 516# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
514# CONFIG_HAVE_AOUT is not set 517# CONFIG_HAVE_AOUT is not set
515CONFIG_BINFMT_MISC=m 518CONFIG_BINFMT_MISC=m
516CONFIG_IA32_EMULATION=y 519CONFIG_IA32_EMULATION=y
517# CONFIG_COMPAT_FOR_U64_ALIGNMENT is not set 520# CONFIG_IA32_AOUT is not set
521CONFIG_COMPAT=y
522CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
523CONFIG_SYSVIPC_COMPAT=y
518CONFIG_NET=y 524CONFIG_NET=y
525CONFIG_COMPAT_NETLINK_MESSAGES=y
519 526
520# 527#
521# Networking options 528# Networking options
@@ -4207,6 +4214,7 @@ CONFIG_QUOTA_TREE=m
4207CONFIG_QFMT_V1=m 4214CONFIG_QFMT_V1=m
4208CONFIG_QFMT_V2=m 4215CONFIG_QFMT_V2=m
4209CONFIG_QUOTACTL=y 4216CONFIG_QUOTACTL=y
4217CONFIG_QUOTACTL_COMPAT=y
4210CONFIG_AUTOFS_FS=m 4218CONFIG_AUTOFS_FS=m
4211CONFIG_AUTOFS4_FS=m 4219CONFIG_AUTOFS4_FS=m
4212CONFIG_FUSE_FS=m 4220CONFIG_FUSE_FS=m