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

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

Merge 5.4-rc8 into android-mainline 



Linux 5.4-rc8

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1f55e5d34dc78ddb064910ce1e1b7a7b5b39aaba
parents f9aa2c60 af42d346

MAINTAINERS

+5 −3
Original line number Diff line number Diff line
@@ -3261,7 +3261,6 @@ S: Maintained 
F:	drivers/cpufreq/bmips-cpufreq.c









BROADCOM BMIPS MIPS ARCHITECTURE









M:	Kevin Cernekee <cernekee@gmail.com>









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









L:	linux-mips@vger.kernel.org








@@ -8299,11 +8298,14 @@ F:	drivers/hid/intel-ish-hid/















INTEL IOMMU (VT-d)









M:	David Woodhouse <dwmw2@infradead.org>









M:	Lu Baolu <baolu.lu@linux.intel.com>









L:	iommu@lists.linux-foundation.org









T:	git git://git.infradead.org/iommu-2.6.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









S:	Supported









F:	drivers/iommu/intel-iommu.c









F:	drivers/iommu/dmar.c









F:	drivers/iommu/intel*.[ch]









F:	include/linux/intel-iommu.h









F:	include/linux/intel-svm.h

















INTEL IOP-ADMA DMA DRIVER









R:	Dan Williams <dan.j.williams@intel.com>
































Makefile



+4
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 5









PATCHLEVEL = 4









SUBLEVEL = 0









EXTRAVERSION = -rc7









EXTRAVERSION = -rc8









NAME = Kleptomaniac Octopus



















# *DOCUMENTATION*








@@ -921,6 +921,9 @@ ifeq ($(CONFIG_RELR),y)







LDFLAGS_vmlinux	+= --pack-dyn-relocs=relr









endif



















# make the checker run with the right architecture









CHECKFLAGS += --arch=$(ARCH)



















# insure the checker run with the right endianness









CHECKFLAGS += $(if $(CONFIG_CPU_BIG_ENDIAN),-mbig-endian,-mlittle-endian)










































arch/mips/sgi-ip27/Kconfig



+0
−7






























Original line number
Diff line number
Diff line







@@ -38,10 +38,3 @@ config REPLICATE_KTEXT







	  Say Y here to enable replicating the kernel text across multiple









	  nodes in a NUMA cluster.  This trades memory for speed.

















config REPLICATE_EXHANDLERS









	bool "Exception handler replication support"









	depends on SGI_IP27









	help









	  Say Y here to enable replicating the kernel exception handlers









	  across multiple nodes in a NUMA cluster. This trades memory for









	  speed.
























arch/mips/sgi-ip27/ip27-init.c



+6
−15






























Original line number
Diff line number
Diff line







@@ -69,23 +69,14 @@ static void per_hub_init(cnodeid_t cnode)

















	hub_rtc_init(cnode);



















#ifdef CONFIG_REPLICATE_EXHANDLERS









	/*









	 * If this is not a headless node initialization,









	 * copy over the caliased exception handlers.









	 */









	if (get_compact_nodeid() == cnode) {









		extern char except_vec2_generic, except_vec3_generic;









		extern void build_tlb_refill_handler(void);



















		memcpy((void *)(CKSEG0 + 0x100), &except_vec2_generic, 0x80);









		memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x80);









		build_tlb_refill_handler();









		memcpy((void *)(CKSEG0 + 0x100), (void *) CKSEG0, 0x80);









		memcpy((void *)(CKSEG0 + 0x180), &except_vec3_generic, 0x100);









	if (nasid) {









		/* copy exception handlers from first node to current node */









		memcpy((void *)NODE_OFFSET_TO_K0(nasid, 0),









		       (void *)CKSEG0, 0x200);









		__flush_cache_all();









		/* switch to node local exception handlers */









		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_8K);









	}









#endif









}



















void per_cpu_init(void)
































arch/mips/sgi-ip27/ip27-memory.c



+0
−4






























Original line number
Diff line number
Diff line







@@ -332,11 +332,7 @@ static void __init mlreset(void)







		 * thinks it is a node 0 address.









		 */









		REMOTE_HUB_S(nasid, PI_REGION_PRESENT, (region_mask | 1));









#ifdef CONFIG_REPLICATE_EXHANDLERS









		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_8K);









#else









		REMOTE_HUB_S(nasid, PI_CALIAS_SIZE, PI_CALIAS_SIZE_0);









#endif



















#ifdef LATER









		/*