diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-08 01:49:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-08 01:49:20 +0300 |
| commit | f74fd13f4585e418a3e630a82468be58bf1d98c1 (patch) | |
| tree | c9738bc4729be166257a3cfd25a17cad049be314 /drivers/xen/gntdev-common.h | |
| parent | 6dc517a3872ba280c20b2348f2170e4e26e25953 (diff) | |
| parent | 14855954f63608c5622d5eaa964d3872ce5c5514 (diff) | |
| download | linux-f74fd13f4585e418a3e630a82468be58bf1d98c1.tar.xz | |
Merge tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull more xen updates from Juergen Gross:
- a patch to fix a build warning
- a cleanup of no longer needed code in the Xen event handling
- a small series for the Xen grant driver avoiding high order
allocations and replacing an insane global limit by a per-call one
- a small series fixing Xen frontend/backend module referencing
* tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen-blkback: allow module to be cleanly unloaded
xen/xenbus: reference count registered modules
xen/gntdev: switch from kcalloc() to kvcalloc()
xen/gntdev: replace global limit of mapped pages by limit per call
xen/gntdev: remove redundant non-zero check on ret
xen/events: remove event handling recursion detection
Diffstat (limited to 'drivers/xen/gntdev-common.h')
| -rw-r--r-- | drivers/xen/gntdev-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/gntdev-common.h b/drivers/xen/gntdev-common.h index 91e44c04f787..9a3960ecff6c 100644 --- a/drivers/xen/gntdev-common.h +++ b/drivers/xen/gntdev-common.h @@ -81,7 +81,7 @@ void gntdev_add_map(struct gntdev_priv *priv, struct gntdev_grant_map *add); void gntdev_put_map(struct gntdev_priv *priv, struct gntdev_grant_map *map); -bool gntdev_account_mapped_pages(int count); +bool gntdev_test_page_count(unsigned int count); int gntdev_map_grant_pages(struct gntdev_grant_map *map); |