OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw

Android-x86
Fork
捐款

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

kernel: 提交

kernel


Commit MetaInfo

修訂914c6a31d738d35dd22e3361ed498defc38e569a (tree)
時間2019-10-25 00:14:10
作者Chih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android-x86: update defconfig for the 8.1-r3 release

Change Summary

差異

--- a/arch/x86/configs/android-x86_64_defconfig
+++ b/arch/x86/configs/android-x86_64_defconfig
@@ -1,6 +1,6 @@
11 #
22 # Automatically generated file; DO NOT EDIT.
3-# Linux/x86_64 4.19.50 Kernel Configuration
3+# Linux/x86_64 4.19.80 Kernel Configuration
44 #
55
66 #
@@ -116,6 +116,7 @@ CONFIG_RCU_NEED_SEGCBLIST=y
116116 CONFIG_BUILD_BIN2C=y
117117 CONFIG_IKCONFIG=y
118118 CONFIG_IKCONFIG_PROC=y
119+# CONFIG_IKHEADERS is not set
119120 CONFIG_LOG_BUF_SHIFT=17
120121 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
121122 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
@@ -165,7 +166,6 @@ CONFIG_RD_GZIP=y
165166 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
166167 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167168 CONFIG_SYSCTL=y
168-CONFIG_ANON_INODES=y
169169 CONFIG_HAVE_UID16=y
170170 CONFIG_SYSCTL_EXCEPTION_TRACE=y
171171 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -650,7 +650,7 @@ CONFIG_FIRMWARE_MEMMAP=y
650650 CONFIG_DMIID=y
651651 CONFIG_DMI_SYSFS=y
652652 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
653-# CONFIG_ISCSI_IBFT_FIND is not set
653+# CONFIG_ISCSI_IBFT is not set
654654 # CONFIG_FW_CFG_SYSFS is not set
655655 # CONFIG_GOOGLE_FIRMWARE is not set
656656
@@ -849,6 +849,12 @@ CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
849849 CONFIG_QUEUED_RWLOCKS=y
850850 CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
851851 CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
852+# CONFIG_GKI_HIDDEN_DRM_CONFIGS is not set
853+# CONFIG_GKI_HIDDEN_REGMAP_CONFIGS is not set
854+# CONFIG_GKI_HIDDEN_SND_SOC_CONFIGS is not set
855+# CONFIG_GKI_HIDDEN_GPIO_CONFIGS is not set
856+# CONFIG_GKI_LEGACY_WEXT_ALLCONFIG is not set
857+# CONFIG_GKI_HACKS_TO_FIX is not set
852858 CONFIG_FREEZER=y
853859
854860 #
@@ -2420,7 +2426,7 @@ CONFIG_SWPHY=y
24202426 #
24212427 CONFIG_AMD_PHY=m
24222428 CONFIG_AQUANTIA_PHY=m
2423-# CONFIG_ASIX_PHY is not set
2429+CONFIG_AX88796B_PHY=m
24242430 CONFIG_AT803X_PHY=m
24252431 CONFIG_BCM7XXX_PHY=m
24262432 CONFIG_BCM87XX_PHY=m
@@ -2691,10 +2697,11 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
26912697 CONFIG_MT7601U=m
26922698 CONFIG_MT76_CORE=m
26932699 CONFIG_MT76_LEDS=y
2700+CONFIG_MT76_USB=m
26942701 CONFIG_MT76x2_COMMON=m
2695-# CONFIG_MT76x0U is not set
2702+CONFIG_MT76x0U=m
26962703 CONFIG_MT76x2E=m
2697-# CONFIG_MT76x2U is not set
2704+CONFIG_MT76x2U=m
26982705 CONFIG_WLAN_VENDOR_RALINK=y
26992706 CONFIG_RT2X00=m
27002707 CONFIG_RT2400PCI=m
@@ -5769,7 +5776,6 @@ CONFIG_USB_EMI62=m
57695776 CONFIG_USB_EMI26=m
57705777 # CONFIG_USB_ADUTUX is not set
57715778 # CONFIG_USB_SEVSEG is not set
5772-# CONFIG_USB_RIO500 is not set
57735779 # CONFIG_USB_LEGOTOWER is not set
57745780 CONFIG_USB_LCD=m
57755781 # CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -7077,6 +7083,7 @@ CONFIG_EXPORTFS=m
70777083 CONFIG_FILE_LOCKING=y
70787084 CONFIG_MANDATORY_FILE_LOCKING=y
70797085 CONFIG_FS_ENCRYPTION=y
7086+# CONFIG_FS_VERITY is not set
70807087 CONFIG_FSNOTIFY=y
70817088 # CONFIG_DNOTIFY is not set
70827089 CONFIG_INOTIFY_USER=y
@@ -7279,6 +7286,7 @@ CONFIG_NLS_KOI8_U=m
72797286 # CONFIG_NLS_MAC_TURKISH is not set
72807287 CONFIG_NLS_UTF8=m
72817288 # CONFIG_DLM is not set
7289+# CONFIG_UNICODE is not set
72827290
72837291 #
72847292 # Security options
@@ -7317,11 +7325,21 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
73177325 # CONFIG_SECURITY_LOADPIN is not set
73187326 # CONFIG_SECURITY_YAMA is not set
73197327 # CONFIG_INTEGRITY is not set
7320-# CONFIG_IMA is not set
7321-# CONFIG_EVM is not set
73227328 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
73237329 CONFIG_DEFAULT_SECURITY_DAC=y
73247330 CONFIG_DEFAULT_SECURITY=""
7331+
7332+#
7333+# Kernel hardening options
7334+#
7335+# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
7336+
7337+#
7338+# Memory initialization
7339+#
7340+CONFIG_INIT_STACK_NONE=y
7341+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
7342+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
73257343 CONFIG_XOR_BLOCKS=m
73267344 CONFIG_CRYPTO_SHA256_DIRECT=y
73277345 CONFIG_CRYPTO=y
@@ -7707,7 +7725,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
77077725 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
77087726 # CONFIG_DEBUG_STACKOVERFLOW is not set
77097727 CONFIG_HAVE_ARCH_KASAN=y
7710-# CONFIG_KASAN is not set
7728+CONFIG_KASAN_STACK=1
77117729 CONFIG_ARCH_HAS_KCOV=y
77127730 # CONFIG_DEBUG_SHIRQ is not set
77137731
@@ -7855,6 +7873,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
78557873 # CONFIG_TEST_UDELAY is not set
78567874 # CONFIG_TEST_STATIC_KEYS is not set
78577875 # CONFIG_TEST_KMOD is not set
7876+# CONFIG_TEST_MEMINIT is not set
78587877 # CONFIG_MEMTEST is not set
78597878 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
78607879 # CONFIG_SAMPLES is not set
--- a/arch/x86/configs/android-x86_defconfig
+++ b/arch/x86/configs/android-x86_defconfig
@@ -1,6 +1,6 @@
11 #
22 # Automatically generated file; DO NOT EDIT.
3-# Linux/x86 4.19.50 Kernel Configuration
3+# Linux/x86 4.19.80 Kernel Configuration
44 #
55
66 #
@@ -114,6 +114,7 @@ CONFIG_RCU_NEED_SEGCBLIST=y
114114 CONFIG_BUILD_BIN2C=y
115115 CONFIG_IKCONFIG=y
116116 CONFIG_IKCONFIG_PROC=y
117+# CONFIG_IKHEADERS is not set
117118 CONFIG_LOG_BUF_SHIFT=17
118119 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
119120 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
@@ -161,7 +162,6 @@ CONFIG_RD_GZIP=y
161162 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
162163 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
163164 CONFIG_SYSCTL=y
164-CONFIG_ANON_INODES=y
165165 CONFIG_HAVE_UID16=y
166166 CONFIG_SYSCTL_EXCEPTION_TRACE=y
167167 CONFIG_HAVE_PCSPKR_PLATFORM=y
@@ -685,7 +685,7 @@ CONFIG_FIRMWARE_MEMMAP=y
685685 CONFIG_DMIID=y
686686 CONFIG_DMI_SYSFS=y
687687 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
688-# CONFIG_ISCSI_IBFT_FIND is not set
688+# CONFIG_ISCSI_IBFT is not set
689689 # CONFIG_FW_CFG_SYSFS is not set
690690 # CONFIG_GOOGLE_FIRMWARE is not set
691691
@@ -870,6 +870,12 @@ CONFIG_QUEUED_SPINLOCKS=y
870870 CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
871871 CONFIG_QUEUED_RWLOCKS=y
872872 CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
873+# CONFIG_GKI_HIDDEN_DRM_CONFIGS is not set
874+# CONFIG_GKI_HIDDEN_REGMAP_CONFIGS is not set
875+# CONFIG_GKI_HIDDEN_SND_SOC_CONFIGS is not set
876+# CONFIG_GKI_HIDDEN_GPIO_CONFIGS is not set
877+# CONFIG_GKI_LEGACY_WEXT_ALLCONFIG is not set
878+# CONFIG_GKI_HACKS_TO_FIX is not set
873879 CONFIG_FREEZER=y
874880
875881 #
@@ -2474,7 +2480,7 @@ CONFIG_SWPHY=y
24742480 #
24752481 CONFIG_AMD_PHY=m
24762482 CONFIG_AQUANTIA_PHY=m
2477-# CONFIG_ASIX_PHY is not set
2483+CONFIG_AX88796B_PHY=m
24782484 CONFIG_AT803X_PHY=m
24792485 CONFIG_BCM7XXX_PHY=m
24802486 CONFIG_BCM87XX_PHY=m
@@ -2745,10 +2751,11 @@ CONFIG_WLAN_VENDOR_MEDIATEK=y
27452751 CONFIG_MT7601U=m
27462752 CONFIG_MT76_CORE=m
27472753 CONFIG_MT76_LEDS=y
2754+CONFIG_MT76_USB=m
27482755 CONFIG_MT76x2_COMMON=m
2749-# CONFIG_MT76x0U is not set
2756+CONFIG_MT76x0U=m
27502757 CONFIG_MT76x2E=m
2751-# CONFIG_MT76x2U is not set
2758+CONFIG_MT76x2U=m
27522759 CONFIG_WLAN_VENDOR_RALINK=y
27532760 CONFIG_RT2X00=m
27542761 CONFIG_RT2400PCI=m
@@ -5920,7 +5927,6 @@ CONFIG_USB_EMI62=m
59205927 CONFIG_USB_EMI26=m
59215928 # CONFIG_USB_ADUTUX is not set
59225929 # CONFIG_USB_SEVSEG is not set
5923-# CONFIG_USB_RIO500 is not set
59245930 # CONFIG_USB_LEGOTOWER is not set
59255931 CONFIG_USB_LCD=m
59265932 # CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -7233,6 +7239,7 @@ CONFIG_EXPORTFS=m
72337239 CONFIG_FILE_LOCKING=y
72347240 CONFIG_MANDATORY_FILE_LOCKING=y
72357241 CONFIG_FS_ENCRYPTION=y
7242+# CONFIG_FS_VERITY is not set
72367243 CONFIG_FSNOTIFY=y
72377244 # CONFIG_DNOTIFY is not set
72387245 CONFIG_INOTIFY_USER=y
@@ -7434,6 +7441,7 @@ CONFIG_NLS_KOI8_U=m
74347441 # CONFIG_NLS_MAC_TURKISH is not set
74357442 CONFIG_NLS_UTF8=m
74367443 # CONFIG_DLM is not set
7444+# CONFIG_UNICODE is not set
74377445
74387446 #
74397447 # Security options
@@ -7473,6 +7481,18 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
74737481 # CONFIG_DEFAULT_SECURITY_SELINUX is not set
74747482 CONFIG_DEFAULT_SECURITY_DAC=y
74757483 CONFIG_DEFAULT_SECURITY=""
7484+
7485+#
7486+# Kernel hardening options
7487+#
7488+# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
7489+
7490+#
7491+# Memory initialization
7492+#
7493+CONFIG_INIT_STACK_NONE=y
7494+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
7495+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
74767496 CONFIG_XOR_BLOCKS=m
74777497 CONFIG_CRYPTO_SHA256_DIRECT=y
74787498 CONFIG_CRYPTO=y
@@ -7826,6 +7846,8 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
78267846 # CONFIG_DEBUG_HIGHMEM is not set
78277847 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
78287848 # CONFIG_DEBUG_STACKOVERFLOW is not set
7849+CONFIG_CC_HAS_KASAN_GENERIC=y
7850+CONFIG_KASAN_STACK=1
78297851 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
78307852 # CONFIG_DEBUG_SHIRQ is not set
78317853
@@ -7971,6 +7993,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
79717993 # CONFIG_TEST_UDELAY is not set
79727994 # CONFIG_TEST_STATIC_KEYS is not set
79737995 # CONFIG_TEST_KMOD is not set
7996+# CONFIG_TEST_MEMINIT is not set
79747997 # CONFIG_MEMTEST is not set
79757998 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
79767999 # CONFIG_SAMPLES is not set
Show on old repository browser