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

Commit 70a84627 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.9.221(cf77b7c4) into msm-4.9"

parents 786d73bf c4a753dd

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 218

SUBLEVEL = 221

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/mach-imx/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -86,8 +86,10 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a 
obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o

obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o

endif

ifeq ($(CONFIG_ARM_CPU_SUSPEND),y)

AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a

obj-$(CONFIG_SOC_IMX6) += resume-imx6.o

endif

obj-$(CONFIG_SOC_IMX6) += pm-imx6.o



obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

arch/arm64/configs/cuttlefish_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ CONFIG_SETEND_EMULATION=y 
CONFIG_ARM64_SW_TTBR0_PAN=y

CONFIG_ARM64_LSE_ATOMICS=y

CONFIG_RANDOMIZE_BASE=y

# CONFIG_EFI is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_COMPAT=y

CONFIG_PM_WAKELOCKS=y
@@ -202,6 +201,7 @@ CONFIG_DEBUG_DEVRES=y 
CONFIG_OF_UNITTEST=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP_MIN_COUNT=16

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_VIRTIO_BLK=y
@@ -422,6 +422,7 @@ CONFIG_MSDOS_FS=y 
CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

# CONFIG_EFIVAR_FS is not set

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

arch/arm64/kernel/armv8_deprecated.c

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static struct undef_hook setend_hooks[] = { 
	},

	{

		/* Thumb mode */

		.instr_mask	= 0x0000fff7,

		.instr_mask	= 0xfffffff7,

		.instr_val	= 0x0000b650,

		.pstate_mask	= (COMPAT_PSR_T_BIT | COMPAT_PSR_MODE_MASK),

		.pstate_val	= (COMPAT_PSR_T_BIT | COMPAT_PSR_MODE_USR),

arch/arm64/kernel/cpu_errata.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/arm-smccc.h>

#include <linux/psci.h>

#include <linux/types.h>

#include <asm/cachetype.h>

#include <asm/cpu.h>