From 11de119c8a379a0d4d5821453b1cc4bd56664044 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 9 Apr 2014 02:02:22 +0000 Subject: Explicitly set various config symbols to their default values svn path=/dists/trunk/linux/; revision=21218 --- debian/config/armel/config | 6 ++++ debian/config/config | 68 +++++++++++++++++++++++++++++++++++++ debian/config/ia64/config | 5 +++ debian/config/kernelarch-x86/config | 5 +++ debian/config/powerpc/config | 5 +++ debian/config/sparc/config | 5 +++ 6 files changed, 94 insertions(+) diff --git a/debian/config/armel/config b/debian/config/armel/config index 3d62027a287b..f33adc4d3a0d 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -122,6 +122,12 @@ CONFIG_CPU_THERMAL=y # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRTIO_BALLOON is not set +## +## file: lib/xz/Kconfig +## +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y + ## ## file: security/apparmor/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 979b6e8dcf8d..b1966a5edfbd 100644 --- a/debian/config/config +++ b/debian/config/config @@ -74,10 +74,13 @@ CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_CMAC=m CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRCT10DIF=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -113,6 +116,12 @@ CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m +## +## file: crypto/asymmetric_keys/Kconfig +## +#. Not yet +# CONFIG_ASYMMETRIC_KEY_TYPE is not set + ## ## file: drivers/accessibility/Kconfig ## @@ -421,6 +430,11 @@ CONFIG_EFI_VARS=m CONFIG_EFI_VARS_PSTORE=m # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +## +## file: drivers/fmc/Kconfig +## +# CONFIG_FMC is not set + ## ## file: drivers/gpio/Kconfig ## @@ -848,6 +862,8 @@ CONFIG_HID_SENSOR_ALS=m ## ## file: drivers/iio/magnetometer/Kconfig ## +# CONFIG_AK8975 is not set +# CONFIG_MAG3110 is not set CONFIG_HID_SENSOR_MAGNETOMETER_3D=m # CONFIG_IIO_ST_MAGN_3AXIS is not set @@ -862,6 +878,17 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m # CONFIG_MPL3115 is not set # CONFIG_IIO_ST_PRESS is not set +## +## file: drivers/iio/temperature/Kconfig +## +# CONFIG_TMP006 is not set + +## +## file: drivers/iio/trigger/Kconfig +## +# CONFIG_IIO_INTERRUPT_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set + ## ## file: drivers/infiniband/Kconfig ## @@ -1160,6 +1187,11 @@ CONFIG_TOUCHSCREEN_TPS6507X=m ## CONFIG_IOMMU_SUPPORT=y +## +## file: drivers/ipack/Kconfig +## +# CONFIG_IPACK_BUS is not set + ## ## file: drivers/isdn/Kconfig ## @@ -3144,6 +3176,11 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_PTP_1588_CLOCK_GIANFAR=m CONFIG_PTP_1588_CLOCK_IXP46X=m +## +## file: drivers/pwm/Kconfig +## +# CONFIG_PWM is not set + ## ## file: drivers/regulator/Kconfig ## @@ -3154,6 +3191,11 @@ CONFIG_PTP_1588_CLOCK_IXP46X=m ## # CONFIG_STE_MODEM_RPROC is not set +## +## file: drivers/reset/Kconfig +## +# CONFIG_RESET_CONTROLLER is not set + ## ## file: drivers/rtc/Kconfig ## @@ -4185,6 +4227,7 @@ CONFIG_AUFS_EXPORT=y # CONFIG_AUFS_SHWH is not set # CONFIG_AUFS_BR_RAMFS is not set # CONFIG_AUFS_BR_FUSE is not set +CONFIG_AUFS_BR_HFSPLUS=y # CONFIG_AUFS_DEBUG is not set ## @@ -4220,6 +4263,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set ## ## file: fs/cachefiles/Kconfig @@ -4364,6 +4408,7 @@ CONFIG_HFS_FS=m ## file: fs/hfsplus/Kconfig ## CONFIG_HFSPLUS_FS=m +# CONFIG_HFSPLUS_FS_POSIX_ACL is not set ## ## file: fs/hpfs/Kconfig @@ -4864,6 +4909,9 @@ CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set CONFIG_CRC7=m CONFIG_LIBCRC32C=m +# CONFIG_CRC8 is not set +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_CORDIC=m # CONFIG_DDR is not set ## @@ -4926,6 +4974,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set @@ -4939,6 +4988,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set # CONFIG_ATOMIC64_SELFTEST is not set #. Self-test # CONFIG_ASYNC_RAID6_TEST is not set @@ -4968,6 +5018,13 @@ CONFIG_DEBUG_BUGVERBOSE=y ## file: lib/xz/Kconfig ## # CONFIG_XZ_DEC_TEST is not set +#. These are enabled again by arch config, matching the defaults +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set +# CONFIG_XZ_DEC_ARM is not set +# CONFIG_XZ_DEC_ARMTHUMB is not set +# CONFIG_XZ_DEC_SPARC is not set ## ## file: mm/Kconfig @@ -5731,6 +5788,7 @@ CONFIG_DEFAULT_SECURITY_DAC=y ## CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y ## ## file: security/integrity/ima/Kconfig @@ -5741,6 +5799,10 @@ CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 ## file: security/keys/Kconfig ## CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +# CONFIG_TRUSTED_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set CONFIG_KEYS_DEBUG_PROC_KEYS=y ## @@ -5763,6 +5825,12 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## file: security/tomoyo/Kconfig ## CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +#. This is so horrible... +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" ## ## file: security/yama/Kconfig diff --git a/debian/config/ia64/config b/debian/config/ia64/config index d3d87fb189b6..f664afe87859 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -771,6 +771,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y ## CONFIG_PSTORE=y +## +## file: lib/xz/Kconfig +## +CONFIG_XZ_DEC_IA64=y + ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 3e11992711c4..426aaf7575fe 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1756,6 +1756,11 @@ CONFIG_SPARSE_IRQ=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +## +## file: lib/xz/Kconfig +## +CONFIG_XZ_DEC_X86=y + ## ## file: mm/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index ecec599b296a..89b83f1853bb 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -871,6 +871,11 @@ CONFIG_USBPCWATCHDOG=m # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_STACKOVERFLOW is not set +## +## file: lib/xz/Kconfig +## +CONFIG_XZ_DEC_POWERPC=y + ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index b3ac69c71de8..e9db83b18947 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -535,6 +535,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y ## # CONFIG_W1 is not set +## +## file: lib/xz/Kconfig +## +CONFIG_XZ_DEC_SPARC=y + ## ## file: mm/Kconfig ## -- cgit v1.2.3