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

Commit 67a883f4 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.135 (03fcc2fe) into msm-4.9"

parents d7f191f8 c5976f89

Documentation/filesystems/fscrypt.rst

deleted100644 → 0
+0 −626

File deleted.

Preview size limit exceeded, changes collapsed.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 134

SUBLEVEL = 135

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/Makefile

+1 −23
Original line number Diff line number Diff line
@@ -8,34 +8,12 @@ 


UTS_MACHINE := arc



ifeq ($(CROSS_COMPILE),)

ifndef CONFIG_CPU_BIG_ENDIAN

CROSS_COMPILE := arc-linux-

else

CROSS_COMPILE := arceb-linux-

endif

endif



KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs



is_700 = $(shell $(CC) -dM -E - < /dev/null | grep -q "ARC700" && echo 1 || echo 0)



ifdef CONFIG_ISA_ARCOMPACT

ifeq ($(is_700), 0)

    $(error Toolchain not configured for ARCompact builds)

endif

endif



ifdef CONFIG_ISA_ARCV2

ifeq ($(is_700), 1)

    $(error Toolchain not configured for ARCv2 builds)

endif

endif



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file

# We had a customer reported bug where some code built in kernel was NOT using
@@ -89,7 +67,7 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB 
# --build-id w/o "-marclinux". Default arc-elf32-ld is OK

ldflags-$(upto_gcc44)			+= -marclinux



LIBGCC	:= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)

LIBGCC	= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)



# Modules with short calls might break for calls into builtin-kernel

KBUILD_CFLAGS_MODULE	+= -mlong-calls -mno-millicode

arch/arm/crypto/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -120,11 +120,4 @@ config CRYPTO_GHASH_ARM_CE 
	  that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)

	  that is part of the ARMv8 Crypto Extensions



config CRYPTO_SPECK_NEON

	tristate "NEON accelerated Speck cipher algorithms"

	depends on KERNEL_MODE_NEON

	select CRYPTO_BLKCIPHER

	select CRYPTO_GF128MUL

	select CRYPTO_SPECK



endif

arch/arm/crypto/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o 
obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o

obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o

obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o

obj-$(CONFIG_CRYPTO_SPECK_NEON) += speck-neon.o



ce-obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o

ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o
@@ -37,7 +36,6 @@ sha1-arm-ce-y := sha1-ce-core.o sha1-ce-glue.o 
sha2-arm-ce-y	:= sha2-ce-core.o sha2-ce-glue.o

aes-arm-ce-y	:= aes-ce-core.o aes-ce-glue.o

ghash-arm-ce-y	:= ghash-ce-core.o ghash-ce-glue.o

speck-neon-y := speck-neon-core.o speck-neon-glue.o



quiet_cmd_perl = PERL    $@

      cmd_perl = $(PERL) $(<) > $(@)