xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 7b4ea9456d ("Revert "x86/mm/64: Do not sync vmalloc/ioremap mappings"") into android-mainline

Browse Source 
Steps on the way to 5.9-rc1

Resolves conflicts in:
	drivers/irqchip/qcom-pdc.c
	include/linux/device.h
	net/xfrm/xfrm_state.c
	security/lsm_audit.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4aeb3d04f4717714a421721eb3ce690c099bb30a
This commit is contained in:
Greg Kroah-Hartman
2020-08-07 16:01:35 +02:00
parent 075d0ec13d 7b4ea9456d
commit f04a11ac99
5470 changed files with 439814 additions and 93400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/irqchip/qcom-pdc.c
View File

@@ -13,9 +13,9 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/soc/qcom/irq.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
@@ -525,31 +525,8 @@ fail:
return ret;
}
#ifdef MODULE
static int qcom_pdc_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct device_node *parent = of_irq_find_parent(np);
return qcom_pdc_init(np, parent);
}
static const struct of_device_id qcom_pdc_match_table[] = {
{ .compatible = "qcom,pdc" },
{}
};
MODULE_DEVICE_TABLE(of, qcom_pdc_match_table);
static struct platform_driver qcom_pdc_driver = {
.probe = qcom_pdc_probe,
.driver = {
.name = "qcom-pdc",
.of_match_table = qcom_pdc_match_table,
},
};
module_platform_driver(qcom_pdc_driver);
#else
IRQCHIP_DECLARE(qcom_pdc, "qcom,pdc", qcom_pdc_init);
#endif
IRQCHIP_PLATFORM_DRIVER_BEGIN(qcom_pdc)
IRQCHIP_MATCH("qcom,pdc", qcom_pdc_init)
IRQCHIP_PLATFORM_DRIVER_END(qcom_pdc)
MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Power Domain Controller");
MODULE_LICENSE("GPL v2");