Commit 36e584de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.17-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:

 - some fixes of kmalloc() flags

 - one fix of the xenbus driver

 - an update of the pv sound driver interface needed for a driver which
   will go through the sound tree

* tag 'for-linus-4.17-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: xenbus_dev_frontend: Really return response string
  xen/sndif: Sync up with the canonical definition in Xen
  xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_reg_add
  xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in xen_pcibk_config_quirks_init
  xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_device_alloc
  xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_init_device
  xen: xen-pciback: Replace GFP_ATOMIC with GFP_KERNEL in pcistub_probe
parents 854da238 ebf04f33

drivers/xen/xen-pciback/conf_space_quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int xen_pcibk_config_quirks_init(struct pci_dev *dev) 
	struct xen_pcibk_config_quirk *quirk;

	int ret = 0;



	quirk = kzalloc(sizeof(*quirk), GFP_ATOMIC);

	quirk = kzalloc(sizeof(*quirk), GFP_KERNEL);

	if (!quirk) {

		ret = -ENOMEM;

		goto out;

drivers/xen/xen-pciback/pci_stub.c

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static struct pcistub_device *pcistub_device_alloc(struct pci_dev *dev) 


	dev_dbg(&dev->dev, "pcistub_device_alloc\n");



	psdev = kzalloc(sizeof(*psdev), GFP_ATOMIC);

	psdev = kzalloc(sizeof(*psdev), GFP_KERNEL);

	if (!psdev)

		return NULL;
@@ -364,7 +364,7 @@ static int pcistub_init_device(struct pci_dev *dev) 
	 * here and then to call kfree(pci_get_drvdata(psdev->dev)).

	 */

	dev_data = kzalloc(sizeof(*dev_data) +  strlen(DRV_NAME "[]")

				+ strlen(pci_name(dev)) + 1, GFP_ATOMIC);

				+ strlen(pci_name(dev)) + 1, GFP_KERNEL);

	if (!dev_data) {

		err = -ENOMEM;

		goto out;
@@ -577,7 +577,7 @@ static int pcistub_probe(struct pci_dev *dev, const struct pci_device_id *id) 
		}



		if (!match) {

			pci_dev_id = kmalloc(sizeof(*pci_dev_id), GFP_ATOMIC);

			pci_dev_id = kmalloc(sizeof(*pci_dev_id), GFP_KERNEL);

			if (!pci_dev_id) {

				err = -ENOMEM;

				goto out;
@@ -1149,7 +1149,7 @@ static int pcistub_reg_add(int domain, int bus, int slot, int func, 
	}

	dev = psdev->dev;



	field = kzalloc(sizeof(*field), GFP_ATOMIC);

	field = kzalloc(sizeof(*field), GFP_KERNEL);

	if (!field) {

		err = -ENOMEM;

		goto out;

drivers/xen/xenbus/xenbus_dev_frontend.c

+2 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int xenbus_command_reply(struct xenbus_file_priv *u, 
{

	struct {

		struct xsd_sockmsg hdr;

		const char body[16];

		char body[16];

	} msg;

	int rc;
@@ -412,6 +412,7 @@ static int xenbus_command_reply(struct xenbus_file_priv *u, 
	msg.hdr.len = strlen(reply) + 1;

	if (msg.hdr.len > sizeof(msg.body))

		return -E2BIG;

	memcpy(&msg.body, reply, msg.hdr.len);



	mutex_lock(&u->reply_mutex);

	rc = queue_reply(&u->read_buffers, &msg, sizeof(msg.hdr) + msg.hdr.len);

include/xen/interface/io/sndif.h

+306 −16

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE