OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de

Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

kernel: Commit

kernel


Commit MetaInfo

Revision83f131159ba6c574cabdf025f40243fd7cdc62bc (tree)
Zeit2020-01-21 13:54:13
AutorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android-x86: update defconfig for the 9.0-rc2 release

Ändern Zusammenfassung

Diff

--- 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.80 Kernel Configuration
3+# Linux/x86_64 4.19.95 Kernel Configuration
44 #
55
66 #
@@ -373,6 +373,9 @@ CONFIG_ARCH_RANDOM=y
373373 CONFIG_X86_INTEL_UMIP=y
374374 # CONFIG_X86_INTEL_MPX is not set
375375 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
376+CONFIG_X86_INTEL_TSX_MODE_OFF=y
377+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
378+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
376379 CONFIG_EFI=y
377380 CONFIG_EFI_STUB=y
378381 CONFIG_EFI_MIXED=y
@@ -515,6 +518,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
515518 # CPU frequency scaling drivers
516519 #
517520 # CONFIG_CPUFREQ_DT is not set
521+# CONFIG_CPUFREQ_DUMMY is not set
518522 CONFIG_X86_INTEL_PSTATE=y
519523 CONFIG_X86_PCC_CPUFREQ=m
520524 CONFIG_X86_ACPI_CPUFREQ=m
@@ -795,6 +799,7 @@ CONFIG_BLK_SCSI_REQUEST=y
795799 # CONFIG_BLK_WBT is not set
796800 CONFIG_BLK_DEBUG_FS=y
797801 # CONFIG_BLK_SED_OPAL is not set
802+# CONFIG_BLK_INLINE_ENCRYPTION is not set
798803
799804 #
800805 # Partition Types
@@ -1498,6 +1503,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
14981503 CONFIG_FW_LOADER=y
14991504 CONFIG_EXTRA_FIRMWARE=""
15001505 # CONFIG_FW_LOADER_USER_HELPER is not set
1506+CONFIG_FW_CACHE=y
15011507 CONFIG_WANT_DEV_COREDUMP=y
15021508 CONFIG_ALLOW_DEV_COREDUMP=y
15031509 CONFIG_DEV_COREDUMP=y
@@ -4906,10 +4912,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
49064912 #
49074913 # Frame buffer Devices
49084914 #
4909-CONFIG_FB=y
4910-CONFIG_FIRMWARE_EDID=y
49114915 CONFIG_FB_CMDLINE=y
49124916 CONFIG_FB_NOTIFY=y
4917+CONFIG_FB=y
4918+CONFIG_FIRMWARE_EDID=y
49134919 CONFIG_FB_DDC=m
49144920 CONFIG_FB_BOOT_VESA_SUPPORT=y
49154921 CONFIG_FB_CFB_FILLRECT=y
@@ -6311,6 +6317,8 @@ CONFIG_ASHMEM=y
63116317 # CONFIG_ANDROID_VSOC is not set
63126318 CONFIG_ION=y
63136319 CONFIG_ION_SYSTEM_HEAP=y
6320+# CONFIG_ION_CARVEOUT_HEAP is not set
6321+# CONFIG_ION_CHUNK_HEAP is not set
63146322 # CONFIG_STAGING_BOARD is not set
63156323 # CONFIG_LTE_GDM724X is not set
63166324 # CONFIG_MTD_SPINAND_MT29F is not set
@@ -6999,6 +7007,7 @@ CONFIG_THUNDERBOLT=m
69997007 #
70007008 CONFIG_ANDROID=y
70017009 CONFIG_ANDROID_BINDER_IPC=y
7010+# CONFIG_ANDROID_BINDERFS is not set
70027011 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
70037012 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
70047013 # CONFIG_LIBNVDIMM is not set
@@ -7320,6 +7329,7 @@ CONFIG_SECURITY_SELINUX_DISABLE=y
73207329 CONFIG_SECURITY_SELINUX_DEVELOP=y
73217330 CONFIG_SECURITY_SELINUX_AVC_STATS=y
73227331 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
7332+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
73237333 # CONFIG_SECURITY_SMACK is not set
73247334 # CONFIG_SECURITY_TOMOYO is not set
73257335 # CONFIG_SECURITY_APPARMOR is not set
@@ -7333,7 +7343,6 @@ CONFIG_DEFAULT_SECURITY=""
73337343 #
73347344 # Kernel hardening options
73357345 #
7336-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
73377346
73387347 #
73397348 # Memory initialization
--- 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.80 Kernel Configuration
3+# Linux/x86 4.19.95 Kernel Configuration
44 #
55
66 #
@@ -398,6 +398,9 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
398398 CONFIG_ARCH_RANDOM=y
399399 # CONFIG_X86_SMAP is not set
400400 CONFIG_X86_INTEL_UMIP=y
401+CONFIG_X86_INTEL_TSX_MODE_OFF=y
402+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
403+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
401404 CONFIG_EFI=y
402405 CONFIG_EFI_STUB=y
403406 CONFIG_SECCOMP=y
@@ -527,6 +530,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
527530 # CPU frequency scaling drivers
528531 #
529532 # CONFIG_CPUFREQ_DT is not set
533+# CONFIG_CPUFREQ_DUMMY is not set
530534 CONFIG_X86_INTEL_PSTATE=y
531535 CONFIG_X86_PCC_CPUFREQ=m
532536 CONFIG_X86_ACPI_CPUFREQ=m
@@ -818,6 +822,7 @@ CONFIG_BLK_SCSI_REQUEST=y
818822 # CONFIG_BLK_WBT is not set
819823 CONFIG_BLK_DEBUG_FS=y
820824 # CONFIG_BLK_SED_OPAL is not set
825+# CONFIG_BLK_INLINE_ENCRYPTION is not set
821826
822827 #
823828 # Partition Types
@@ -1511,6 +1516,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
15111516 CONFIG_FW_LOADER=y
15121517 CONFIG_EXTRA_FIRMWARE=""
15131518 # CONFIG_FW_LOADER_USER_HELPER is not set
1519+CONFIG_FW_CACHE=y
15141520 CONFIG_WANT_DEV_COREDUMP=y
15151521 CONFIG_ALLOW_DEV_COREDUMP=y
15161522 CONFIG_DEV_COREDUMP=y
@@ -5014,10 +5020,10 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
50145020 #
50155021 # Frame buffer Devices
50165022 #
5017-CONFIG_FB=y
5018-CONFIG_FIRMWARE_EDID=y
50195023 CONFIG_FB_CMDLINE=y
50205024 CONFIG_FB_NOTIFY=y
5025+CONFIG_FB=y
5026+CONFIG_FIRMWARE_EDID=y
50215027 CONFIG_FB_DDC=m
50225028 CONFIG_FB_BOOT_VESA_SUPPORT=y
50235029 CONFIG_FB_CFB_FILLRECT=y
@@ -6464,6 +6470,8 @@ CONFIG_ASHMEM=y
64646470 # CONFIG_ANDROID_VSOC is not set
64656471 CONFIG_ION=y
64666472 CONFIG_ION_SYSTEM_HEAP=y
6473+# CONFIG_ION_CARVEOUT_HEAP is not set
6474+# CONFIG_ION_CHUNK_HEAP is not set
64676475 # CONFIG_STAGING_BOARD is not set
64686476 # CONFIG_LTE_GDM724X is not set
64696477 # CONFIG_MTD_SPINAND_MT29F is not set
@@ -7157,6 +7165,7 @@ CONFIG_THUNDERBOLT=m
71577165 #
71587166 CONFIG_ANDROID=y
71597167 CONFIG_ANDROID_BINDER_IPC=y
7168+# CONFIG_ANDROID_BINDERFS is not set
71607169 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
71617170 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
71627171 CONFIG_DAX=y
@@ -7473,6 +7482,7 @@ CONFIG_SECURITY_SELINUX_DISABLE=y
74737482 CONFIG_SECURITY_SELINUX_DEVELOP=y
74747483 CONFIG_SECURITY_SELINUX_AVC_STATS=y
74757484 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
7485+CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
74767486 # CONFIG_SECURITY_SMACK is not set
74777487 # CONFIG_SECURITY_TOMOYO is not set
74787488 # CONFIG_SECURITY_APPARMOR is not set
@@ -7486,7 +7496,6 @@ CONFIG_DEFAULT_SECURITY=""
74867496 #
74877497 # Kernel hardening options
74887498 #
7489-# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
74907499
74917500 #
74927501 # Memory initialization
Show on old repository browser