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

!10765 mbigen: add kvm dependency 

Merge Pull Request from: @weiyuchen2013 
 
irq_mbigen.c编译强依赖符号vtimer_irqbypass，该符号由kvm模块提供，但控制该c文件的宏没有依赖KVM，导致内核编译到最后链接时失败

参考链接：
https://gitee.com/openeuler/kernel/issues/IAI7KE?from=project-issue 
 
Link:https://gitee.com/openeuler/kernel/pulls/10765

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 4cb01698 a8af21a9

drivers/irqchip/irq-mbigen.c

+4 −2
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static int vtimer_mbigen_set_regs(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_KVM

static int vtimer_mbigen_device_probe(struct platform_device *pdev)

{

	struct mbigen_device *mgn_chip = platform_get_drvdata(pdev);
@@ -816,6 +817,7 @@ static int vtimer_mbigen_device_probe(struct platform_device *pdev) 
		mgn_chip->base);

	return err;

}

#endif



static int mbigen_device_probe(struct platform_device *pdev)

{
@@ -853,9 +855,9 @@ static int mbigen_device_probe(struct platform_device *pdev) 
	}



	platform_set_drvdata(pdev, mgn_chip);



#ifdef CONFIG_KVM

	err = vtimer_mbigen_device_probe(pdev);



#endif

	if (err) {

		dev_err(&pdev->dev, "Failed to probe vtimer mbigen device\n");

		return err;