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

Commit 40adef7d 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.179 (aab9adb4) into msm-4.4"

parents 589a44d3 325632da

Documentation/arm/kernel_mode_neon.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ TL;DR summary 
* Use only NEON instructions, or VFP instructions that don't rely on support

  code

* Isolate your NEON code in a separate compilation unit, and compile it with

  '-mfpu=neon -mfloat-abi=softfp'

  '-march=armv7-a -mfpu=neon -mfloat-abi=softfp'

* Put kernel_neon_begin() and kernel_neon_end() calls around the calls into your

  NEON code

* Don't sleep in your NEON code, and be aware that it will be executed with
@@ -87,7 +87,7 @@ instructions appearing in unexpected places if no special care is taken. 
Therefore, the recommended and only supported way of using NEON/VFP in the

kernel is by adhering to the following rules:

* isolate the NEON code in a separate compilation unit and compile it with

  '-mfpu=neon -mfloat-abi=softfp';

  '-march=armv7-a -mfpu=neon -mfloat-abi=softfp';

* issue the calls to kernel_neon_begin(), kernel_neon_end() as well as the calls

  into the unit containing the NEON code from a compilation unit which is *not*

  built with the GCC flag '-mfpu=neon' set.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 178

SUBLEVEL = 179

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -622,7 +622,7 @@ CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%)) 
ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)

$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif
@@ -651,7 +651,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)

KBUILD_CFLAGS	+= -Os

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2

arch/arm/boot/dts/sama5d2-pinfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ 
#define PIN_PC9__GPIO			PINMUX_PIN(PIN_PC9, 0, 0)

#define PIN_PC9__FIQ			PINMUX_PIN(PIN_PC9, 1, 3)

#define PIN_PC9__GTSUCOMP		PINMUX_PIN(PIN_PC9, 2, 1)

#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 2, 1)

#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 3, 1)

#define PIN_PC9__TIOA4			PINMUX_PIN(PIN_PC9, 4, 2)

#define PIN_PC10			74

#define PIN_PC10__GPIO			PINMUX_PIN(PIN_PC10, 0, 0)

arch/arm/crypto/sha256-armv4.pl

+2 −1
Original line number Diff line number Diff line
@@ -205,10 +205,11 @@ K256: 
.global	sha256_block_data_order

.type	sha256_block_data_order,%function

sha256_block_data_order:

.Lsha256_block_data_order:

#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha256_block_data_order

#else

	adr	r3,sha256_block_data_order

	adr	r3,.Lsha256_block_data_order

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap

arch/arm/crypto/sha256-core.S_shipped

+2 −1
Original line number Diff line number Diff line
@@ -86,10 +86,11 @@ K256: 
.global	sha256_block_data_order

.type	sha256_block_data_order,%function

sha256_block_data_order:

.Lsha256_block_data_order:

#if __ARM_ARCH__<7

	sub	r3,pc,#8		@ sha256_block_data_order

#else

	adr	r3,sha256_block_data_order

	adr	r3,.Lsha256_block_data_order

#endif

#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)

	ldr	r12,.LOPENSSL_armcap