OSDN -- オープンソース・ソフトウェアの開発とダウンロード
日本語の翻訳状況 translation status for ja

Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

kernel: コミット

kernel


コミットメタ情報

リビジョンd25a822a6c788f0212a25a96c18464e87faa3a42 (tree)
日時2018-05-01 16:29:44
作者Chih-Wei Huang <cwhuang@linu...>
コミッターChih-Wei Huang

ログメッセージ

Android-x86: update defconfig for the 7.1-r2 release

Enable cgroup related configs.

変更サマリ

差分

--- 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.9.80 Kernel Configuration
3+# Linux/x86_64 4.9.95 Kernel Configuration
44 #
55 CONFIG_64BIT=y
66 CONFIG_X86_64=y
@@ -149,13 +149,17 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
149149 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
150150 CONFIG_ARCH_SUPPORTS_INT128=y
151151 CONFIG_CGROUPS=y
152-# CONFIG_CGROUP_DEBUG is not set
152+CONFIG_CGROUP_DEBUG=y
153153 CONFIG_CGROUP_FREEZER=y
154154 # CONFIG_CGROUP_PIDS is not set
155155 # CONFIG_CGROUP_DEVICE is not set
156-# CONFIG_CPUSETS is not set
156+CONFIG_CPUSETS=y
157+CONFIG_PROC_PID_CPUSET=y
157158 CONFIG_CGROUP_CPUACCT=y
158-# CONFIG_MEMCG is not set
159+CONFIG_CGROUP_SCHEDTUNE=y
160+CONFIG_PAGE_COUNTER=y
161+CONFIG_MEMCG=y
162+# CONFIG_MEMCG_SWAP is not set
159163 # CONFIG_BLK_CGROUP is not set
160164 CONFIG_CGROUP_SCHED=y
161165 CONFIG_FAIR_GROUP_SCHED=y
@@ -170,7 +174,7 @@ CONFIG_NAMESPACES=y
170174 # CONFIG_PID_NS is not set
171175 # CONFIG_NET_NS is not set
172176 # CONFIG_SCHED_AUTOGROUP is not set
173-# CONFIG_SCHED_TUNE is not set
177+CONFIG_SCHED_TUNE=y
174178 # CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
175179 # CONFIG_SYSFS_DEPRECATED is not set
176180 CONFIG_RELAY=y
@@ -280,6 +284,8 @@ CONFIG_CC_STACKPROTECTOR=y
280284 # CONFIG_CC_STACKPROTECTOR_NONE is not set
281285 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
282286 CONFIG_CC_STACKPROTECTOR_STRONG=y
287+# CONFIG_LTO is not set
288+CONFIG_LTO_NONE=y
283289 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
284290 CONFIG_HAVE_CONTEXT_TRACKING=y
285291 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -638,6 +644,7 @@ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
638644 CONFIG_CPU_FREQ_GOV_COMMON=y
639645 CONFIG_CPU_FREQ_STAT=y
640646 CONFIG_CPU_FREQ_STAT_DETAILS=y
647+CONFIG_CPU_FREQ_TIMES=y
641648 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
642649 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
643650 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@@ -4580,7 +4587,7 @@ CONFIG_FB_MB862XX_PCI_GDC=y
45804587 CONFIG_FB_MB862XX_I2C=y
45814588 # CONFIG_FB_BROADSHEET is not set
45824589 # CONFIG_FB_AUO_K190X is not set
4583-# CONFIG_FB_HYPERV is not set
4590+CONFIG_FB_HYPERV=m
45844591 # CONFIG_FB_SIMPLE is not set
45854592 # CONFIG_FB_SSD1307 is not set
45864593 # CONFIG_FB_SM712 is not set
@@ -5801,6 +5808,7 @@ CONFIG_VIDEO_LM3554=m
58015808 CONFIG_ASHMEM=y
58025809 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
58035810 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
5811+# CONFIG_ANDROID_VSOC is not set
58045812 # CONFIG_ION is not set
58055813 # CONFIG_FIQ_WATCHDOG is not set
58065814 # CONFIG_STAGING_BOARD is not set
@@ -6509,6 +6517,7 @@ CONFIG_PROC_KCORE=y
65096517 CONFIG_PROC_SYSCTL=y
65106518 CONFIG_PROC_PAGE_MONITOR=y
65116519 # CONFIG_PROC_CHILDREN is not set
6520+CONFIG_PROC_UID=y
65126521 CONFIG_KERNFS=y
65136522 CONFIG_SYSFS=y
65146523 CONFIG_TMPFS=y
@@ -7053,6 +7062,7 @@ CONFIG_CRYPTO_SERPENT=m
70537062 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
70547063 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
70557064 CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
7065+# CONFIG_CRYPTO_SPECK is not set
70567066 CONFIG_CRYPTO_TEA=m
70577067 CONFIG_CRYPTO_TWOFISH=m
70587068 CONFIG_CRYPTO_TWOFISH_COMMON=m
--- 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.9.80 Kernel Configuration
3+# Linux/x86 4.9.95 Kernel Configuration
44 #
55 # CONFIG_64BIT is not set
66 CONFIG_X86_32=y
@@ -141,13 +141,17 @@ CONFIG_NMI_LOG_BUF_SHIFT=13
141141 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
142142 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
143143 CONFIG_CGROUPS=y
144-# CONFIG_CGROUP_DEBUG is not set
144+CONFIG_CGROUP_DEBUG=y
145145 CONFIG_CGROUP_FREEZER=y
146146 # CONFIG_CGROUP_PIDS is not set
147147 # CONFIG_CGROUP_DEVICE is not set
148-# CONFIG_CPUSETS is not set
148+CONFIG_CPUSETS=y
149+CONFIG_PROC_PID_CPUSET=y
149150 CONFIG_CGROUP_CPUACCT=y
150-# CONFIG_MEMCG is not set
151+CONFIG_CGROUP_SCHEDTUNE=y
152+CONFIG_PAGE_COUNTER=y
153+CONFIG_MEMCG=y
154+# CONFIG_MEMCG_SWAP is not set
151155 # CONFIG_BLK_CGROUP is not set
152156 CONFIG_CGROUP_SCHED=y
153157 CONFIG_FAIR_GROUP_SCHED=y
@@ -162,7 +166,7 @@ CONFIG_NAMESPACES=y
162166 # CONFIG_PID_NS is not set
163167 # CONFIG_NET_NS is not set
164168 # CONFIG_SCHED_AUTOGROUP is not set
165-# CONFIG_SCHED_TUNE is not set
169+CONFIG_SCHED_TUNE=y
166170 # CONFIG_DEFAULT_USE_ENERGY_AWARE is not set
167171 # CONFIG_SYSFS_DEPRECATED is not set
168172 CONFIG_RELAY=y
@@ -271,6 +275,8 @@ CONFIG_CC_STACKPROTECTOR=y
271275 # CONFIG_CC_STACKPROTECTOR_NONE is not set
272276 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
273277 CONFIG_CC_STACKPROTECTOR_STRONG=y
278+# CONFIG_LTO is not set
279+CONFIG_LTO_NONE=y
274280 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
275281 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
276282 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
@@ -637,6 +643,7 @@ CONFIG_CPU_FREQ_GOV_ATTR_SET=y
637643 CONFIG_CPU_FREQ_GOV_COMMON=y
638644 CONFIG_CPU_FREQ_STAT=y
639645 CONFIG_CPU_FREQ_STAT_DETAILS=y
646+CONFIG_CPU_FREQ_TIMES=y
640647 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
641648 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
642649 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@@ -4708,7 +4715,7 @@ CONFIG_FB_MB862XX_PCI_GDC=y
47084715 CONFIG_FB_MB862XX_I2C=y
47094716 # CONFIG_FB_BROADSHEET is not set
47104717 # CONFIG_FB_AUO_K190X is not set
4711-# CONFIG_FB_HYPERV is not set
4718+CONFIG_FB_HYPERV=m
47124719 # CONFIG_FB_SIMPLE is not set
47134720 CONFIG_FB_SSD1307=m
47144721 # CONFIG_FB_SM712 is not set
@@ -5972,6 +5979,7 @@ CONFIG_VIDEO_LM3554=m
59725979 CONFIG_ASHMEM=y
59735980 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
59745981 CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
5982+# CONFIG_ANDROID_VSOC is not set
59755983 # CONFIG_ION is not set
59765984 # CONFIG_FIQ_WATCHDOG is not set
59775985 # CONFIG_STAGING_BOARD is not set
@@ -6689,6 +6697,7 @@ CONFIG_PROC_KCORE=y
66896697 CONFIG_PROC_SYSCTL=y
66906698 CONFIG_PROC_PAGE_MONITOR=y
66916699 # CONFIG_PROC_CHILDREN is not set
6700+CONFIG_PROC_UID=y
66926701 CONFIG_KERNFS=y
66936702 CONFIG_SYSFS=y
66946703 CONFIG_TMPFS=y
@@ -7207,6 +7216,7 @@ CONFIG_CRYPTO_CHACHA20=m
72077216 CONFIG_CRYPTO_SEED=m
72087217 CONFIG_CRYPTO_SERPENT=m
72097218 CONFIG_CRYPTO_SERPENT_SSE2_586=m
7219+# CONFIG_CRYPTO_SPECK is not set
72107220 CONFIG_CRYPTO_TEA=m
72117221 CONFIG_CRYPTO_TWOFISH=m
72127222 CONFIG_CRYPTO_TWOFISH_COMMON=y
旧リポジトリブラウザで表示