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

!2390 Backport 5.10.174 - 5.10.175 LTS patches from upstream. 

Merge Pull Request from: @sanglipeng 
 
Issue: https://gitee.com/open_euler/dashboard?issue_id=I8711T

Backport 5.10.174 -  5.10.175 LTS patches from upstream.

Conflicts:

Already merged(2):
1d2366624b4c：ext4: fix another off-by-one fsmap error on 1k block filesystems
a4932a2c5446：ipmi:watchdog: Set panic count to proper value on a panic

Rejected(1):
7aa5a495cbf8：ipmi/watchdog: replace atomic_add() and atomic_sub()

Kabi broken(2):
bb7597777c13：irqdomain: Change the type of 'size' in __irq_domain_add() to be consistent
aeab1f1a60ae：irqdomain: Fix domain registration race

Total patches: 93 - 2 - 1 -2 = 88 
 
Link:https://gitee.com/openeuler/kernel/pulls/2390

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents be25759c b649d7fe

arch/alpha/kernel/module.c

+1 −3
Original line number Diff line number Diff line
@@ -146,10 +146,8 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, 
	base = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr;

	symtab = (Elf64_Sym *)sechdrs[symindex].sh_addr;



	/* The small sections were sorted to the end of the segment.

	   The following should definitely cover them.  */

	gp = (u64)me->core_layout.base + me->core_layout.size - 0x8000;

	got = sechdrs[me->arch.gotsecindex].sh_addr;

	gp = got + 0x8000;



	for (i = 0; i < n; i++) {

		unsigned long r_sym = ELF64_R_SYM (rela[i].r_info);

arch/arm64/include/asm/efi.h

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
({									\

	efi_virtmap_load();						\

	__efi_fpsimd_begin();						\

	spin_lock(&efi_rt_lock);					\

	raw_spin_lock(&efi_rt_lock);					\

})



#undef arch_efi_call_virt
@@ -34,12 +34,12 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 


#define arch_efi_call_virt_teardown()					\

({									\

	spin_unlock(&efi_rt_lock);					\

	raw_spin_unlock(&efi_rt_lock);					\

	__efi_fpsimd_end();						\

	efi_virtmap_unload();						\

})



extern spinlock_t efi_rt_lock;

extern raw_spinlock_t efi_rt_lock;

efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...);



#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)

arch/arm64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f) 
	return s;

}



DEFINE_SPINLOCK(efi_rt_lock);

DEFINE_RAW_SPINLOCK(efi_rt_lock);



asmlinkage u64 *efi_rt_stack_top __ro_after_init;

arch/mips/include/asm/mach-rc32434/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ struct pci_msu { 
				 PCI_CFG04_STAT_SSE | \

				 PCI_CFG04_STAT_PE)



#define KORINA_CNFG1		((KORINA_STAT<<16)|KORINA_CMD)

#define KORINA_CNFG1		(KORINA_STAT | KORINA_CMD)



#define KORINA_REVID		0

#define KORINA_CLASS_CODE	0

arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts

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


/ {

	model = "fsl,T1040RDB-REV-A";

	compatible = "fsl,T1040RDB-REV-A";

};



&seville_port0 {