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

Commit 288ce216 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge "Merge 5.4.262 into android11-5.4-lts" into android11-5.4-lts

parents 4e4cce8b a3aeec7a

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 261

SUBLEVEL = 262

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/include/asm/exception.h

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 


#include <linux/interrupt.h>



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#define __exception_irq_entry	__irq_entry

#else

#define __exception_irq_entry

#endif



#endif /* __ASM_ARM_EXCEPTION_H */

arch/parisc/include/uapi/asm/pdc.h

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ struct pdc_model { /* for PDC_MODEL */ 
	unsigned long arch_rev;

	unsigned long pot_key;

	unsigned long curr_key;

	unsigned long width;	/* default of PSW_W bit (1=enabled) */

};



struct pdc_cache_cf {		/* for PDC_CACHE  (I/D-caches) */

arch/parisc/kernel/entry.S

+3 −4
Original line number Diff line number Diff line
@@ -511,13 +511,13 @@ 
	 * to a CPU TLB 4k PFN (4k => 12 bits to shift) */

	#define PAGE_ADD_SHIFT		(PAGE_SHIFT-12)

	#define PAGE_ADD_HUGE_SHIFT	(REAL_HPAGE_SHIFT-12)

	#define PFN_START_BIT	(63-ASM_PFN_PTE_SHIFT+(63-58)-PAGE_ADD_SHIFT)



	/* Drop prot bits and convert to page addr for iitlbt and idtlbt */

	.macro		convert_for_tlb_insert20 pte,tmp

#ifdef CONFIG_HUGETLB_PAGE

	copy		\pte,\tmp

	extrd,u		\tmp,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\

				64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte

	extrd,u		\tmp,PFN_START_BIT,PFN_START_BIT+1,\pte



	depdi		_PAGE_SIZE_ENCODING_DEFAULT,63,\

				(63-58)+PAGE_ADD_SHIFT,\pte
@@ -525,8 +525,7 @@ 
	depdi		_HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\

				(63-58)+PAGE_ADD_HUGE_SHIFT,\pte

#else /* Huge pages disabled */

	extrd,u		\pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\

				64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte

	extrd,u		\pte,PFN_START_BIT,PFN_START_BIT+1,\pte

	depdi		_PAGE_SIZE_ENCODING_DEFAULT,63,\

				(63-58)+PAGE_ADD_SHIFT,\pte

#endif

arch/parisc/kernel/head.S

+2 −3
Original line number Diff line number Diff line
@@ -69,9 +69,8 @@ $bss_loop: 
	stw,ma          %arg2,4(%r1)

	stw,ma          %arg3,4(%r1)



#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20)

	/* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU

	 * and halt kernel if we detect a PA1.x CPU. */

#if defined(CONFIG_PA20)

	/* check for 64-bit capable CPU as required by current kernel */

	ldi		32,%r10

	mtctl		%r10,%cr11

	.level 2.0