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

!10115 efi/unaccepted: touch soft lockup during memory accept 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hui Tang <tanghui20@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JQKTQRZXGJ32ZD5MPIU4DI7GRIJ34EIH/ 
 
https://gitee.com/openeuler/kernel/issues/I9UNKS 
 
Link:https://gitee.com/openeuler/kernel/pulls/10115

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 3dea642d e1b6f938

drivers/firmware/efi/unaccepted_memory.c

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/efi.h>

#include <linux/memblock.h>

#include <linux/spinlock.h>

#include <linux/nmi.h>

#include <asm/unaccepted_memory.h>



/* Protects unaccepted memory bitmap and accepting_list */
@@ -148,6 +149,9 @@ void accept_memory(phys_addr_t start, phys_addr_t end) 
	}



	list_del(&range.list);



	touch_softlockup_watchdog();



	spin_unlock_irqrestore(&unaccepted_memory_lock, flags);

}