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

!6124 xen/events: close evtchn after mapping cleanup 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UNNCP4YZHB4PK4CZ5H6LPL6AHAWN4POE/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2GS 
 
Link:https://gitee.com/openeuler/kernel/pulls/6124

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 10bacee0 299a172c

drivers/xen/events/events_base.c

+2 −3
Original line number Diff line number Diff line
@@ -885,8 +885,8 @@ static void shutdown_pirq(struct irq_data *data) 
		return;



	do_mask(info, EVT_MASK_REASON_EXPLICIT);

	xen_evtchn_close(evtchn);

	xen_irq_info_cleanup(info);

	xen_evtchn_close(evtchn);

}



static void enable_pirq(struct irq_data *data)
@@ -929,8 +929,6 @@ static void __unbind_from_irq(unsigned int irq) 
	if (VALID_EVTCHN(evtchn)) {

		unsigned int cpu = cpu_from_irq(irq);



		xen_evtchn_close(evtchn);



		switch (type_from_irq(irq)) {

		case IRQT_VIRQ:

			per_cpu(virq_to_irq, cpu)[virq_from_irq(irq)] = -1;
@@ -943,6 +941,7 @@ static void __unbind_from_irq(unsigned int irq) 
		}



		xen_irq_info_cleanup(info);

		xen_evtchn_close(evtchn);

	}



	xen_free_irq(irq);