diff options
-rw-r--r-- | arch/x86_64/arch-config | 8 | ||||
-rw-r--r-- | defaults/kernel-generic-config | 83 |
2 files changed, 70 insertions, 21 deletions
diff --git a/arch/x86_64/arch-config b/arch/x86_64/arch-config index b369851..3f9ba59 100644 --- a/arch/x86_64/arch-config +++ b/arch/x86_64/arch-config @@ -2,6 +2,7 @@ CONFIG_EDAC_I7CORE=m CONFIG_EDAC_SBRIDGE=m CONFIG_EDAC_I7300=m CONFIG_EFI=y +CONFIG_EFI_STUB=y CONFIG_DRM_I915_KMS=y CONFIG_DRM_RADEON_KMS=y CONFIG_MAXSMP=y @@ -31,6 +32,10 @@ CONFIG_POWER_TRACER=y CONFIG_HIGH_RES_TIMERS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_MMU_AUDIT=y +CONFIG_KVM_DEVICE_ASSIGNMENT=y CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y @@ -121,3 +126,6 @@ CONFIG_X86_INTEL_PSTATE=m CONFIG_PVPANIC=y CONFIG_FB_HYPERV=m CONFIG_BLK_DEV_NVME=m +CONFIG_MICROCODE=m +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config index f9180a2..049e2cc 100644 --- a/defaults/kernel-generic-config +++ b/defaults/kernel-generic-config @@ -33,7 +33,8 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_SYSCTL=y CONFIG_LOG_BUF_SHIFT=19 -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y @@ -152,6 +153,25 @@ CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +CONFIG_EDAC_AMD64_ERROR_INJECTION=y +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82975X=m +CONFIG_EDAC_I3000=m +CONFIG_EDAC_I3200=m +CONFIG_EDAC_X38=m +CONFIG_EDAC_I5400=m +CONFIG_EDAC_I7CORE=m +CONFIG_EDAC_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m + # # Executable file formats # @@ -3155,13 +3175,14 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4DEV_COMPAT=y CONFIG_JBD2=y CONFIG_FS_MBCACHE=y -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS=m CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y -# CONFIG_JFS_FS is not set +# CONFIG_REISERFS_CHECK is not set +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set # CONFIG_JFS_STATISTICS is not set CONFIG_JFS_POSIX_ACL=y @@ -3172,7 +3193,8 @@ CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_SECURITY=y -# CONFIG_MINIX_FS is not set +CONFIG_XFS_RT=y +CONFIG_MINIX_FS=m # CONFIG_ROMFS_FS is not set CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -3186,7 +3208,7 @@ CONFIG_DNOTIFY=y CONFIG_AUTOFS4_FS=m # CONFIG_EXOFS_FS is not set # CONFIG_EXOFS_DEBUG is not set -# CONFIG_NILFS2_FS is not set +CONFIG_NILFS2_FS=m CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y @@ -3213,7 +3235,7 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m # # Pseudo filesystems @@ -3230,15 +3252,16 @@ CONFIG_DEBUG_FS=y # # Miscellaneous filesystems # -# CONFIG_ADFS_FS is not seta -# CONFIG_AFFS_FS is not set +CONFIG_ADFS_FS=m +CONFIG_AFFS_FS=m CONFIG_ECRYPT_FS=m -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_HFSPLUS_FS_POSIX_ACL=y # CONFIG_BEFS_FS is not set # CONFIG_BEFS_DEBUG is not set # CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set +CONFIG_EFS_FS=m CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set @@ -3248,22 +3271,33 @@ CONFIG_JFFS2_SUMMARY=y CONFIG_JFFS2_FS_XATTR=y CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_JFFS2_FS_SECURITY=y +CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_EMBEDDED is not set # CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m # CONFIG_QNX4FS_RW is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_QNX6FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set -# CONFIG_9P_FS is not set +CONFIG_9P_FS=m +CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y # CONFIG_9P_FSCACHE is not set CONFIG_FUSE_FS=m # CONFIG_OMFS_FS is not set CONFIG_CUSE=m +CONFIG_EFIVAR_FS=m # # Network File Systems @@ -3414,6 +3448,7 @@ CONFIG_NLS_ASCII=y CONFIG_PROFILING=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set +CONFIG_JUMP_LABEL=y # # Kernel hacking @@ -3438,6 +3473,7 @@ CONFIG_KGDB=y CONFIG_KGDB_SERIAL_CONSOLE=y CONFIG_KGDB_TESTS=y # CONFIG_KGDB_TESTS_ON_BOOT is not set +CONFIG_STRICT_DEVMEM=y # # Security options @@ -3460,6 +3496,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set +CONFIG_FHANDLE=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -3590,7 +3627,7 @@ CONFIG_PROC_PID_CPUSET=y # CONFIG_SYSFS_DEPRECATED_V2 is not set CONFIG_RELAY=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENABLE_WARN_DEPRECATED is not set @@ -3601,6 +3638,7 @@ CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -3830,6 +3868,7 @@ CONFIG_KPROBES=y # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set +CONFIG_SECCOMP=y CONFIG_HZ_1000=y CONFIG_TIMER_STATS=y @@ -3906,6 +3945,7 @@ CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set CONFIG_LATENCYTOP=y +CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y CONFIG_RESOURCE_COUNTERS=y # CONFIG_COMPAT_BRK is not set @@ -3942,7 +3982,7 @@ CONFIG_MEMSTICK_JMICRON_38X=m CONFIG_THERMAL_HWMON=y -CONFIG_OPTIMIZE_INLINING=y +# CONFIG_OPTIMIZE_INLINING is not set # FIXME: This should be x86/ia64 only # CONFIG_HP_ILO is not set @@ -4105,7 +4145,7 @@ CONFIG_SLOW_WORK=y # CONFIG_CRASH_DUMP is not set # CONFIG_CRASH is not set -CONFIG_STRIP_ASM_SYMS=y +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_RCU_FANOUT_EXACT is not set @@ -4149,6 +4189,7 @@ CONFIG_DEBUG_LIST=y CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_DEVRES is not set CONFIG_DEBUG_RODATA_TEST=y +CONFIG_DEBUG_SET_MODULE_RONX=y CONFIG_DEBUG_NX_TEST=m CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_DETECT_SOFTLOCKUP=y |