Unverified Commit 5eb59931 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5684 Backport 5.10.200 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I9CSYQ

Conflicts:
Already merged(7):
31c31a78dccf  drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper()
c0db17e55ff6  ext4: add two helper functions extent_logical_end() and pa_logical_end()
58fe961c606c  ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow
6b977a7323f7  ext4: avoid overlapping preallocations due to overflow
0258ca32b0ea  perf/core: Fix potential NULL deref
b2e62728b106  kobject: Fix slab-out-of-bounds in fill_kobj_path()
571ce7d944cd  f2fs: fix to do sanity check on inode type during garbage collection

Kabi broken(6):
82e7769c707a  driver: platform: Add helper for safer setting of driver_override
61ca67cad863  rpmsg: Constify local variable in field store macro
049001ff4de3  rpmsg: Fix kfree() of static memory on setting driver_override
96a84b4e4718  rpmsg: Fix calling device_lock() on non-initialized device
a3535721a6d4  rpmsg: glink: Release driver_override
07b6d90baec1  rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
 
 

Total patches: 91 - 7 - 6 = 78 
 
Link:https://gitee.com/openeuler/kernel/pulls/5684

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 737efe73 db3221dc

arch/powerpc/kernel/setup-common.c

+2 −0
Original line number Diff line number Diff line
@@ -906,6 +906,8 @@ void __init setup_arch(char **cmdline_p) 


	/* Parse memory topology */

	mem_topology_setup();

	/* Set max_mapnr before paging_init() */

	set_max_mapnr(max_pfn);



	/*

	 * Release secondary cpus out of their spinloops at 0x60 now that

arch/powerpc/mm/mem.c

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ void __init mem_init(void) 
#endif



	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);

	set_max_mapnr(max_pfn);



	kasan_late_init();

arch/sparc/lib/checksum_32.S

+1 −1
Original line number Diff line number Diff line
@@ -463,5 +463,5 @@ ccslow: cmp %g1, 0 
 * we only bother with faults on loads... */



cc_fault:

	ret

	retl

	 clr	%o0

arch/x86/include/asm/i8259.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ struct legacy_pic { 
	void (*make_irq)(unsigned int irq);

};



void legacy_pic_pcat_compat(void);



extern struct legacy_pic *legacy_pic;

extern struct legacy_pic null_legacy_pic;

arch/x86/include/asm/setup.h

+21 −25
Original line number Diff line number Diff line
@@ -108,27 +108,16 @@ extern unsigned long _brk_end; 
void *extend_brk(size_t size, size_t align);



/*

 * Reserve space in the brk section.  The name must be unique within

 * the file, and somewhat descriptive.  The size is in bytes.  Must be

 * used at file scope.

 * Reserve space in the .brk section, which is a block of memory from which the

 * caller is allowed to allocate very early (before even memblock is available)

 * by calling extend_brk().  All allocated memory will be eventually converted

 * to memblock.  Any leftover unallocated memory will be freed.

 *

 * (This uses a temp function to wrap the asm so we can pass it the

 * size parameter; otherwise we wouldn't be able to.  We can't use a

 * "section" attribute on a normal variable because it always ends up

 * being @progbits, which ends up allocating space in the vmlinux

 * executable.)

 * The size is in bytes.

 */

#define RESERVE_BRK(name,sz)						\

	static void __section(".discard.text") __used notrace		\

	__brk_reservation_fn_##name##__(void) {				\

		asm volatile (						\

			".pushsection .brk_reservation,\"aw\",@nobits;" \

			".brk." #name ":"				\

			" 1:.skip %c0;"					\

			" .size .brk." #name ", . - 1b;"		\

			" .popsection"					\

			: : "i" (sz));					\

	}

#define RESERVE_BRK(name, size)					\

	__section(".bss..brk") __aligned(1) __used	\

	static char __brk_##name[size]



/* Helper for reserving space for arrays of things */

#define RESERVE_BRK_ARRAY(type, name, entries)		\
@@ -146,12 +135,19 @@ asmlinkage void __init x86_64_start_reservations(char *real_mode_data); 


#endif /* __i386__ */

#endif /* _SETUP */

#else

#define RESERVE_BRK(name,sz)				\

	.pushsection .brk_reservation,"aw",@nobits;	\

.brk.name:						\

1:	.skip sz;					\

	.size .brk.name,.-1b;				\



#else  /* __ASSEMBLY */



.macro __RESERVE_BRK name, size

	.pushsection .bss..brk, "aw"

SYM_DATA_START(__brk_\name)

	.skip \size

SYM_DATA_END(__brk_\name)

	.popsection

.endm



#define RESERVE_BRK(name, size) __RESERVE_BRK name, size



#endif /* __ASSEMBLY__ */



#endif /* _ASM_X86_SETUP_H */