diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-12 17:02:20 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-12 17:02:20 -0600 |
| commit | bad8c4a850eaf386df681d951e3afc06bf1c7cf8 (patch) | |
| tree | a348010cf1ac174e431af125b5d784c4d18e7667 /net/9p | |
| parent | 772d0e9144df4fdf68b23f2136a512e2e5670e9a (diff) | |
| parent | f57034cedeb6e00256313a2a6ee67f974d709b0b (diff) | |
| download | linux-bad8c4a850eaf386df681d951e3afc06bf1c7cf8.tar.gz linux-bad8c4a850eaf386df681d951e3afc06bf1c7cf8.tar.bz2 linux-bad8c4a850eaf386df681d951e3afc06bf1c7cf8.zip | |
Merge tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- two cleanup patches
- a fix of a memory leak in the Xen pvfront driver
- a fix of a locking issue in the Xen hypervisor console driver
* tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/pvcalls: free active map buffer on pvcalls_front_free_map
hvc/xen: lock console list traversal
x86/xen: Remove the unused function p2m_index()
xen: make remove callback of xen driver void returned
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_xen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index 9630b1275557..82c7005ede65 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -305,13 +305,12 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) kfree(priv); } -static int xen_9pfs_front_remove(struct xenbus_device *dev) +static void xen_9pfs_front_remove(struct xenbus_device *dev) { struct xen_9pfs_front_priv *priv = dev_get_drvdata(&dev->dev); dev_set_drvdata(&dev->dev, NULL); xen_9pfs_front_free(priv); - return 0; } static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev, |