Browse code

aarch64: config_aarch64 fix for 4.14.67

Change-Id: Ief8c9ac5614680dd897160e2339bdcacfae152a4
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5818
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>

Ajay Kaher authored on 2018/09/29 03:56:07
Showing 2 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 #
2 2
 # Automatically generated file; DO NOT EDIT.
3
-# Linux/arm64 4.14.54 Kernel Configuration
3
+# Linux/arm64 4.14.67 Kernel Configuration
4 4
 #
5 5
 CONFIG_ARM64=y
6 6
 CONFIG_64BIT=y
... ...
@@ -231,7 +231,7 @@ CONFIG_KEXEC_CORE=y
231 231
 CONFIG_KPROBES=y
232 232
 CONFIG_JUMP_LABEL=y
233 233
 # CONFIG_STATIC_KEYS_SELFTEST is not set
234
-# CONFIG_UPROBES is not set
234
+CONFIG_UPROBES=y
235 235
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
236 236
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
237 237
 CONFIG_KRETPROBES=y
... ...
@@ -617,6 +617,7 @@ CONFIG_XEN=y
617 617
 CONFIG_FORCE_MAX_ZONEORDER=11
618 618
 CONFIG_UNMAP_KERNEL_AT_EL0=y
619 619
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
620
+CONFIG_ARM64_SSBD=y
620 621
 CONFIG_ARMV8_DEPRECATED=y
621 622
 CONFIG_SWP_EMULATION=y
622 623
 CONFIG_CP15_BARRIER_EMULATION=y
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux
4 4
 Version:        4.14.67
5
-Release:        1%{?kat_build:.%kat_build}%{?dist}
5
+Release:        2%{?kat_build:.%kat_build}%{?dist}
6 6
 License:    	GPLv2
7 7
 URL:        	http://www.kernel.org/
8 8
 Group:        	System Environment/Kernel
... ...
@@ -367,6 +367,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
367 367
 %endif
368 368
 
369 369
 %changelog
370
+*   Tue Sep 25 2018 Ajay Kaher <akaher@vmware.com> 4.14.67-2
371
+-   Build hang (at make oldconfig) fix in config_aarch64
370 372
 *   Wed Sep 19 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.14.67-1
371 373
 -   Update to version 4.14.67
372 374
 *   Tue Sep 18 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.14.54-7