UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

misc/pvpanic : break dependency on ACPI 

The pvpanic driver is available for architectures that do not
support ACPI.So break the dependency.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Peng Hao <peng.hao2@zte.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peng Hao 2018-11-06 22:57:18 +08:00 committed by Greg Kroah-Hartman
parent a8b71d2735
commit 77703e0b03
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/Kconfig
View File

@ -515,7 +515,7 @@ config MISC_RTSX
config PVPANIC config PVPANIC
tristate "pvpanic device support" tristate "pvpanic device support"
depends on ACPI depends on ACPI || OF
help help
This driver provides support for the pvpanic device. pvpanic is This driver provides support for the pvpanic device. pvpanic is
a paravirtualized device provided by QEMU; it lets a virtual machine a paravirtualized device provided by QEMU; it lets a virtual machine

23
drivers/misc/pvpanic.c
View File

@ -57,6 +57,7 @@ static struct notifier_block pvpanic_panic_nb = {
.priority = 1, /* let this called before broken drm_fb_helper */ .priority = 1, /* let this called before broken drm_fb_helper */
}; };
#ifdef CONFIG_ACPI
static int pvpanic_add(struct acpi_device *device); static int pvpanic_add(struct acpi_device *device);
static int pvpanic_remove(struct acpi_device *device); static int pvpanic_remove(struct acpi_device *device);
@ -126,6 +127,24 @@ static int pvpanic_remove(struct acpi_device *device)
return 0; return 0;
} }
static int pvpanic_register_acpi_driver(void)
{
return acpi_bus_register_driver(&pvpanic_driver);
}
static void pvpanic_unregister_acpi_driver(void)
{
acpi_bus_unregister_driver(&pvpanic_driver);
}
#else
static int pvpanic_register_acpi_driver(void)
{
return -ENODEV;
}
static void pvpanic_unregister_acpi_driver(void) {}
#endif
static int pvpanic_mmio_probe(struct platform_device *pdev) static int pvpanic_mmio_probe(struct platform_device *pdev)
{ {
struct resource *mem; struct resource *mem;
@ -172,7 +191,7 @@ static int __init pvpanic_mmio_init(void)
if (acpi_disabled) if (acpi_disabled)
return platform_driver_register(&pvpanic_mmio_driver); return platform_driver_register(&pvpanic_mmio_driver);
else else
return acpi_bus_register_driver(&pvpanic_driver); return pvpanic_register_acpi_driver();
} }
static void __exit pvpanic_mmio_exit(void) static void __exit pvpanic_mmio_exit(void)
@ -180,7 +199,7 @@ static void __exit pvpanic_mmio_exit(void)
if (acpi_disabled) if (acpi_disabled)
platform_driver_unregister(&pvpanic_mmio_driver); platform_driver_unregister(&pvpanic_mmio_driver);
else else
acpi_bus_unregister_driver(&pvpanic_driver); pvpanic_unregister_acpi_driver();
} }
module_init(pvpanic_mmio_init); module_init(pvpanic_mmio_init);