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

Commit 15a9d795 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.203 into android11-5.4-lts 



Changes in 5.4.203
	drm: remove drm_fb_helper_modinit
	powerpc/ftrace: Remove ftrace init tramp once kernel init is complete
	kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]
	net: mscc: ocelot: allow unregistered IP multicast flooding
	ARM: 8989/1: use .fpu assembler directives instead of assembler arguments
	ARM: 8990/1: use VFP assembler mnemonics in register load/store macros
	ARM: 8971/1: replace the sole use of a symbol with its definition
	crypto: arm/sha256-neon - avoid ADRL pseudo instruction
	crypto: arm/sha512-neon - avoid ADRL pseudo instruction
	ARM: 8933/1: replace Sun/Solaris style flag on section directive
	ARM: 8929/1: use APSR_nzcv instead of r15 as mrc operand
	ARM: OMAP2+: drop unnecessary adrl
	ARM: 9029/1: Make iwmmxt.S support Clang's integrated assembler
	crypto: arm - use Kconfig based compiler checks for crypto opcodes
	crypto: arm/ghash-ce - define fpu before fpu registers are referenced
	Linux 5.4.203

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I88af32308f769d0b30b66a0a6d9b0ddf2e5a49e1
parents 476819f5 871cbc20

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 202

SUBLEVEL = 203

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/bootp/init.S

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *  size immediately following the kernel, we could build this into

 *  a binary blob, and concatenate the zImage using the cat command.

 */

		.section .start,#alloc,#execinstr

		.section .start, "ax"

		.type	_start, #function

		.globl	_start

arch/arm/boot/compressed/big-endian.S

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *  Author: Nicolas Pitre

 */



	.section ".start", #alloc, #execinstr

	.section ".start", "ax"



	mrc	p15, 0, r0, c1, c0, 0	@ read control reg

	orr	r0, r0, #(1 << 7)	@ enable big endian mode

arch/arm/boot/compressed/head.S

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ 
#endif

		.endm



		.section ".start", #alloc, #execinstr

		.section ".start", "ax"

/*

 * sort out different calling conventions

 */
@@ -1274,7 +1274,7 @@ iflush: 
__armv5tej_mmu_cache_flush:

		tst	r4, #1

		movne	pc, lr

1:		mrc	p15, 0, r15, c7, c14, 3	@ test,clean,invalidate D cache

1:		mrc	p15, 0, APSR_nzcv, c7, c14, 3	@ test,clean,invalidate D cache

		bne	1b

		mcr	p15, 0, r0, c7, c5, 0	@ flush I cache

		mcr	p15, 0, r0, c7, c10, 4	@ drain WB

arch/arm/boot/compressed/piggy.S

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

	.section .piggydata,#alloc

	.section .piggydata, "a"

	.globl	input_data

input_data:

	.incbin	"arch/arm/boot/compressed/piggy_data"