diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-14 18:14:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-14 18:14:48 -0700 |
| commit | 91080ab38f3eaa2a0af4888220d007698a2e7b03 (patch) | |
| tree | ea44660d4d3d944ad92d9e2119eae9ea610979c9 /arch/um/drivers/virt-pci.c | |
| parent | 73344a3f6793d6b5384077be1e5ce6b90bbcaeb4 (diff) | |
| parent | 193cb8372424184dde28088a4230a5fed0afb0ad (diff) | |
| download | linux-91080ab38f3eaa2a0af4888220d007698a2e7b03.tar.gz linux-91080ab38f3eaa2a0af4888220d007698a2e7b03.tar.bz2 linux-91080ab38f3eaa2a0af4888220d007698a2e7b03.zip | |
Merge tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull UML updates from Richard Weinberger:
- Move to strscpy()
- Improve panic notifiers
- Fix NR_CPUS usage
- Fixes for various comments
- Fixes for virtio driver
* tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
uml: Remove the initialization of statics to 0
um: Do not initialise statics to 0.
um: Fix comment typo
um: Improve panic notifiers consistency and ordering
um: remove unused reactivate_chan() declaration
um: mmaper: add __exit annotations to module exit funcs
um: virt-pci: add __init/__exit annotations to module init/exit funcs
hostfs: move from strlcpy with unused retval to strscpy
um: move from strlcpy with unused retval to strscpy
um: increase default virtual physical memory to 64 MiB
UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK
um: read multiple msg from virtio slave request fd
Diffstat (limited to 'arch/um/drivers/virt-pci.c')
| -rw-r--r-- | arch/um/drivers/virt-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c index 027847023184..acb55b302b14 100644 --- a/arch/um/drivers/virt-pci.c +++ b/arch/um/drivers/virt-pci.c @@ -857,7 +857,7 @@ void *pci_root_bus_fwnode(struct pci_bus *bus) return um_pci_fwnode; } -static int um_pci_init(void) +static int __init um_pci_init(void) { int err, i; @@ -940,7 +940,7 @@ free: } module_init(um_pci_init); -static void um_pci_exit(void) +static void __exit um_pci_exit(void) { unregister_virtio_driver(&um_pci_virtio_driver); irq_domain_remove(um_pci_msi_domain); |