Commit bad8c4a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 772d0e91 f57034ce

arch/x86/xen/p2m.c

+0 −5
Original line number Diff line number Diff line
@@ -134,11 +134,6 @@ static inline unsigned p2m_mid_index(unsigned long pfn) 
	return (pfn / P2M_PER_PAGE) % P2M_MID_PER_PAGE;

}



static inline unsigned p2m_index(unsigned long pfn)

{

	return pfn % P2M_PER_PAGE;

}



static void p2m_top_mfn_init(unsigned long *top)

{

	unsigned i;

drivers/block/xen-blkback/xenbus.c

+1 −3
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, 
	return 0;

}



static int xen_blkbk_remove(struct xenbus_device *dev)

static void xen_blkbk_remove(struct xenbus_device *dev)

{

	struct backend_info *be = dev_get_drvdata(&dev->dev);
@@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev) 
		/* Put the reference we set in xen_blkif_alloc(). */

		xen_blkif_put(be->blkif);

	}



	return 0;

}



int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,

drivers/block/xen-blkfront.c

+1 −2
Original line number Diff line number Diff line
@@ -2467,7 +2467,7 @@ static void blkback_changed(struct xenbus_device *dev, 
	}

}



static int blkfront_remove(struct xenbus_device *xbdev)

static void blkfront_remove(struct xenbus_device *xbdev)

{

	struct blkfront_info *info = dev_get_drvdata(&xbdev->dev);
@@ -2488,7 +2488,6 @@ static int blkfront_remove(struct xenbus_device *xbdev) 
	}



	kfree(info);

	return 0;

}



static int blkfront_is_ready(struct xenbus_device *dev)

drivers/char/tpm/xen-tpmfront.c

+1 −2
Original line number Diff line number Diff line
@@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev, 
	return tpm_chip_register(priv->chip);

}



static int tpmfront_remove(struct xenbus_device *dev)

static void tpmfront_remove(struct xenbus_device *dev)

{

	struct tpm_chip *chip = dev_get_drvdata(&dev->dev);

	struct tpm_private *priv = dev_get_drvdata(&chip->dev);

	tpm_chip_unregister(chip);

	ring_free(priv);

	dev_set_drvdata(&chip->dev, NULL);

	return 0;

}



static int tpmfront_resume(struct xenbus_device *dev)

drivers/gpu/drm/xen/xen_drm_front.c

+1 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev, 
	return xenbus_switch_state(xb_dev, XenbusStateInitialising);

}



static int xen_drv_remove(struct xenbus_device *dev)

static void xen_drv_remove(struct xenbus_device *dev)

{

	struct xen_drm_front_info *front_info = dev_get_drvdata(&dev->dev);

	int to = 100;
@@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev) 


	xen_drm_drv_fini(front_info);

	xenbus_frontend_closed(dev);

	return 0;

}



static const struct xenbus_device_id xen_driver_ids[] = {