X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian.raspi2%2Fconfig%2Fconfig.common.ubuntu;h=7b77a43d3ed50fb81537bf8bd09a313d9a4ad52e;hb=4c53a8b9a405f9552b48b2514ddb21ba59e6393a;hp=c7b661153c860502e91bf95299b579d47147fc19;hpb=bcad384f2c39284a002703ec4fb979f2a45fdec8;p=mirror_ubuntu-artful-kernel.git diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu index c7b661153c86..7b77a43d3ed5 100644 --- a/debian.raspi2/config/config.common.ubuntu +++ b/debian.raspi2/config/config.common.ubuntu @@ -265,6 +265,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ARCH_UNIPHIER is not set CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y # CONFIG_ARCH_VEXPRESS is not set # CONFIG_ARCH_VIRT is not set # CONFIG_ARCH_VULCAN is not set @@ -302,6 +303,7 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y CONFIG_ARM64_MODULE_PLTS=y CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_PAN=y +# CONFIG_ARM64_PMEM is not set CONFIG_ARM64_PTDUMP_CORE=y # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set @@ -646,7 +648,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_BLK_DEV_LOOP_MIN_COUNT=256 CONFIG_BLK_DEV_MD=y CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NULL_BLK=m @@ -1168,9 +1170,9 @@ CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ENGINE=m CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_GHASH_ARM64_CE=m CONFIG_CRYPTO_GHASH_ARM_CE=m CONFIG_CRYPTO_HASH=y @@ -1334,12 +1336,6 @@ CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 # CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_SECURITY="apparmor" -CONFIG_DEFAULT_SECURITY_APPARMOR=y -# CONFIG_DEFAULT_SECURITY_DAC is not set -# CONFIG_DEFAULT_SECURITY_SELINUX is not set -# CONFIG_DEFAULT_SECURITY_SMACK is not set -# CONFIG_DEFAULT_SECURITY_TOMOYO is not set CONFIG_DEFAULT_TCP_CONG="cubic" CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_DEPRECATED_PARAM_STRUCT is not set @@ -2049,6 +2045,7 @@ CONFIG_HAMRADIO=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDENED_USERCOPY=y # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set +CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -2069,7 +2066,6 @@ CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -# CONFIG_HAVE_ARCH_VMAP_STACK is not set CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_SMCCC=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set @@ -2850,7 +2846,7 @@ CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m CONFIG_JOYSTICK_PSXPAD_SPI=m -# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y CONFIG_JOYSTICK_RPISENSE=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m @@ -4412,6 +4408,7 @@ CONFIG_QCA7000_UART=m CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y CONFIG_QCOM_FALKOR_ERRATUM_1009=y +CONFIG_QCOM_FALKOR_ERRATUM_E1041=y CONFIG_QCOM_HIDMA=m CONFIG_QCOM_HIDMA_MGMT=m CONFIG_QCOM_PM8XXX_XOADC=m @@ -4428,6 +4425,7 @@ CONFIG_QNX6FS_FS=m CONFIG_QORIQ_CPUFREQ=m CONFIG_QORIQ_THERMAL=m CONFIG_QSEMI_PHY=m +CONFIG_QUEUED_RWLOCKS=y CONFIG_QUOTA=y CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -4850,13 +4848,14 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_HISI_SAS=m CONFIG_SCSI_IMM=m -CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_ISCSI_ATTRS=y # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_LOGGING=y CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set CONFIG_SCSI_MOD=y +# CONFIG_SCSI_MQ_DEFAULT is not set CONFIG_SCSI_NETLINK=y # CONFIG_SCSI_OSD_DEBUG is not set CONFIG_SCSI_OSD_DPRINT_SENSE=1 @@ -4894,10 +4893,19 @@ CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 # CONFIG_SECURITY_APPARMOR_DEBUG is not set CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +CONFIG_SECURITY_APPARMOR_STACKED=y +CONFIG_SECURITY_DEFAULT_DISPLAY_APPARMOR=y +# CONFIG_SECURITY_DEFAULT_DISPLAY_FIRST is not set +CONFIG_SECURITY_DEFAULT_DISPLAY_NAME="apparmor" +# CONFIG_SECURITY_DEFAULT_DISPLAY_SELINUX is not set +# CONFIG_SECURITY_DEFAULT_DISPLAY_SMACK is not set +# CONFIG_SECURITY_DEFAULT_DISPLAY_TOMOYO is not set # CONFIG_SECURITY_DMESG_RESTRICT is not set # CONFIG_SECURITY_LOADPIN is not set +# CONFIG_SECURITY_LSM_DEBUG is not set CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y +CONFIG_SECURITY_NO_EXCLUSIVE_LSM=y CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set CONFIG_SECURITY_SELINUX=y @@ -4907,14 +4915,18 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_STACKED is not set CONFIG_SECURITY_SMACK=y CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y CONFIG_SECURITY_SMACK_BRINGUP=y CONFIG_SECURITY_SMACK_NETFILTER=y +# CONFIG_SECURITY_SMACK_STACKED is not set +CONFIG_SECURITY_STACKING=y CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y +# CONFIG_SECURITY_TOMOYO_STACKED is not set CONFIG_SECURITY_WRITABLE_HOOKS=y CONFIG_SECURITY_YAMA=y CONFIG_SELECT_MEMORY_MODEL=y @@ -5484,7 +5496,7 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPI=y CONFIG_SPI_ALTERA=m CONFIG_SPI_AXI_SPI_ENGINE=m -CONFIG_SPI_BCM2835=m +CONFIG_SPI_BCM2835=y CONFIG_SPI_BCM2835AUX=m CONFIG_SPI_BCM_QSPI=m CONFIG_SPI_BITBANG=m @@ -5916,6 +5928,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX_DIAG=m +CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_UNUSED_SYMBOLS=y CONFIG_UPROBES=y CONFIG_UPROBE_EVENTS=y @@ -6356,6 +6369,7 @@ CONFIG_VL6180=m CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y +CONFIG_VMAP_STACK=y # CONFIG_VMSPLIT_1G is not set CONFIG_VMSPLIT_2G=y # CONFIG_VMSPLIT_3G is not set