diff options
| author | Linus Torvalds | 2018-11-10 15:58:48 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-11-10 15:58:48 +0100 |
| commit | ab6e1f378f546b0caa616ac0fcc730725cc2d222 (patch) | |
| tree | 8d359eb5a61166482e3a672a7fc7f0a7f9200e76 /drivers/xen/grant-table.c | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6... (diff) | |
| parent | xen: remove size limit of privcmd-buf mapping interface (diff) | |
| download | kernel-qcow2-linux-ab6e1f378f546b0caa616ac0fcc730725cc2d222.tar.gz kernel-qcow2-linux-ab6e1f378f546b0caa616ac0fcc730725cc2d222.tar.xz kernel-qcow2-linux-ab6e1f378f546b0caa616ac0fcc730725cc2d222.zip | |
Merge tag 'for-linus-4.20a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Several fixes, mostly for rather recent regressions when running under
Xen"
* tag 'for-linus-4.20a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: remove size limit of privcmd-buf mapping interface
xen: fix xen_qlock_wait()
x86/xen: fix pv boot
xen-blkfront: fix kernel panic with negotiate_mq error path
xen/grant-table: Fix incorrect gnttab_dma_free_pages() pr_debug message
CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM
Diffstat (limited to 'drivers/xen/grant-table.c')
| -rw-r--r-- | drivers/xen/grant-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index f15f89df1f36..7ea6fb6a2e5d 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -914,7 +914,7 @@ int gnttab_dma_free_pages(struct gnttab_dma_alloc_args *args) ret = xenmem_reservation_increase(args->nr_pages, args->frames); if (ret != args->nr_pages) { - pr_debug("Failed to decrease reservation for DMA buffer\n"); + pr_debug("Failed to increase reservation for DMA buffer\n"); ret = -EFAULT; } else { ret = 0; |