Commit cdb3033e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core, to pick up pending v6.7 fixes for... 


Merge branch 'sched/urgent' into sched/core, to pick up pending v6.7 fixes for the v6.8 merge window

This fix didn't make it upstream in time, pick it up
for the v6.8 merge window.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fbb66ce0 f60a631a

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -6050,10 +6050,8 @@ M: Mikulas Patocka <mpatocka@redhat.com> 
M:	dm-devel@lists.linux.dev

L:	dm-devel@lists.linux.dev

S:	Maintained

W:	http://sources.redhat.com/dm

Q:	http://patchwork.kernel.org/project/dm-devel/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git

T:	quilt http://people.redhat.com/agk/patches/linux/editing/

F:	Documentation/admin-guide/device-mapper/

F:	drivers/md/Kconfig

F:	drivers/md/Makefile
@@ -9526,6 +9524,7 @@ F: drivers/bus/hisi_lpc.c 
HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)

M:	Yisen Zhuang <yisen.zhuang@huawei.com>

M:	Salil Mehta <salil.mehta@huawei.com>

M:	Jijie Shao <shaojijie@huawei.com>

L:	netdev@vger.kernel.org

S:	Maintained

W:	http://www.hisilicon.com

arch/arc/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ config ARC 
	select OF

	select OF_EARLY_FLATTREE

	select PCI_SYSCALL if PCI

	select PERF_USE_VMALLOC if ARC_CACHE_VIPT_ALIASING

	select HAVE_ARCH_JUMP_LABEL if ISA_ARCV2 && !CPU_ENDIAN_BE32

	select TRACE_IRQFLAGS_SUPPORT
@@ -232,10 +231,6 @@ config ARC_CACHE_PAGES 
	  Note that Global I/D ENABLE + Per Page DISABLE works but corollary

	  Global DISABLE + Per Page ENABLE won't work



config ARC_CACHE_VIPT_ALIASING

	bool "Support VIPT Aliasing D$"

	depends on ARC_HAS_DCACHE && ISA_ARCOMPACT



endif #ARC_CACHE



config ARC_HAS_ICCM

arch/arc/include/asm/cacheflush.h

+0 −43
Original line number Diff line number Diff line
@@ -44,31 +44,10 @@ void dma_cache_wback(phys_addr_t start, unsigned long sz); 


#define flush_cache_dup_mm(mm)			/* called on fork (VIVT only) */



#ifndef CONFIG_ARC_CACHE_VIPT_ALIASING



#define flush_cache_mm(mm)			/* called on munmap/exit */

#define flush_cache_range(mm, u_vstart, u_vend)

#define flush_cache_page(vma, u_vaddr, pfn)	/* PF handling/COW-break */



#else	/* VIPT aliasing dcache */



/* To clear out stale userspace mappings */

void flush_cache_mm(struct mm_struct *mm);

void flush_cache_range(struct vm_area_struct *vma,

	unsigned long start,unsigned long end);

void flush_cache_page(struct vm_area_struct *vma,

	unsigned long user_addr, unsigned long page);



/*

 * To make sure that userspace mapping is flushed to memory before

 * get_user_pages() uses a kernel mapping to access the page

 */

#define ARCH_HAS_FLUSH_ANON_PAGE

void flush_anon_page(struct vm_area_struct *vma,

	struct page *page, unsigned long u_vaddr);



#endif	/* CONFIG_ARC_CACHE_VIPT_ALIASING */



/*

 * A new pagecache page has PG_arch_1 clear - thus dcache dirty by default

 * This works around some PIO based drivers which don't call flush_dcache_page
@@ -76,28 +55,6 @@ void flush_anon_page(struct vm_area_struct *vma, 
 */

#define PG_dc_clean	PG_arch_1



#define CACHE_COLORS_NUM	4

#define CACHE_COLORS_MSK	(CACHE_COLORS_NUM - 1)

#define CACHE_COLOR(addr)	(((unsigned long)(addr) >> (PAGE_SHIFT)) & CACHE_COLORS_MSK)



/*

 * Simple wrapper over config option

 * Bootup code ensures that hardware matches kernel configuration

 */

static inline int cache_is_vipt_aliasing(void)

{

	return IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);

}



/*

 * checks if two addresses (after page aligning) index into same cache set

 */

#define addr_not_cache_congruent(addr1, addr2)				\

({									\

	cache_is_vipt_aliasing() ? 					\

		(CACHE_COLOR(addr1) != CACHE_COLOR(addr2)) : 0;		\

})



#define copy_to_user_page(vma, page, vaddr, dst, src, len)		\

do {									\

	memcpy(dst, src, len);						\

arch/arc/include/asm/entry-arcv2.h

+32 −0
Original line number Diff line number Diff line
@@ -291,4 +291,36 @@ 
				/* M = 8-1  N = 8 */

.endm



.macro SAVE_ABI_CALLEE_REGS

	push	r13

	push	r14

	push	r15

	push	r16

	push	r17

	push	r18

	push	r19

	push	r20

	push	r21

	push	r22

	push	r23

	push	r24

	push	r25

.endm



.macro RESTORE_ABI_CALLEE_REGS

	pop	r25

	pop	r24

	pop	r23

	pop	r22

	pop	r21

	pop	r20

	pop	r19

	pop	r18

	pop	r17

	pop	r16

	pop	r15

	pop	r14

	pop	r13

.endm



#endif