Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45614f0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.172 (b3e9e81e) into msm-4.4"

parents b27a0532 dd21e159

Documentation/filesystems/proc.txt

+3 −1
Original line number Diff line number Diff line
@@ -471,7 +471,9 @@ manner. The codes are the following: 


Note that there is no guarantee that every flag and associated mnemonic will

be present in all further kernel releases. Things get changed, the flags may

be vanished or the reverse -- new added.

be vanished or the reverse -- new added. Interpretation of their meaning

might change in future as well. So each consumer of these flags has to

follow each specific kernel version for the exact semantic.



The "Name" field will only be present on a mapping that has been named by

userspace, and will show the name passed in by userspace.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 171

SUBLEVEL = 172

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm64/configs/cuttlefish_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -387,8 +387,6 @@ CONFIG_SDCARD_FS=y 
CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_VIRTUALIZATION=y

CONFIG_VHOST_VSOCK=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

# CONFIG_ENABLE_MUST_CHECK is not set

arch/arm64/include/asm/kvm_arm.h

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <asm/types.h>



/* Hyp Configuration Register (HCR) bits */

#define HCR_API		(UL(1) << 41)

#define HCR_APK		(UL(1) << 40)

#define HCR_ID		(UL(1) << 33)

#define HCR_CD		(UL(1) << 32)

#define HCR_RW_SHIFT	31
@@ -81,6 +83,7 @@ 
			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW)

#define HCR_VIRT_EXCP_MASK (HCR_VA | HCR_VI | HCR_VF)

#define HCR_INT_OVERRIDE   (HCR_FMO | HCR_IMO)

#define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK)





/* TCR_EL2 Registers bits */

arch/arm64/kernel/head.S

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm/cputype.h>

#include <asm/elf.h>

#include <asm/kernel-pgtable.h>

#include <asm/kvm_arm.h>

#include <asm/memory.h>

#include <asm/pgtable-hwdef.h>

#include <asm/pgtable.h>
@@ -503,7 +504,7 @@ CPU_LE( bic x0, x0, #(3 << 24) ) // Clear the EE and E0E bits for EL1 
	ret



	/* Hyp configuration. */

2:	mov	x0, #(1 << 31)			// 64-bit EL1

2:	mov_q	x0, HCR_HOST_NVHE_FLAGS

	msr	hcr_el2, x0



	/* Generic timers. */