diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 10:37:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 10:37:56 -0800 |
| commit | 9f3e15129902bca9d8e296c165345f158bac94eb (patch) | |
| tree | 45c6715462029e90802962a55f4e1baad1ef09ca /include/uapi | |
| parent | 2efda9042d76fcab0fb87b7ee8d84da52bf122b0 (diff) | |
| parent | 5a10b7dbf904bfe01bb9fcc6298f7df09eed77d5 (diff) | |
| download | op-kernel-dev-9f3e15129902bca9d8e296c165345f158bac94eb.zip op-kernel-dev-9f3e15129902bca9d8e296c165345f158bac94eb.tar.gz | |
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull virtio updates from Rusty Russell:
"A balloon enhancement, and a minor race-on-module-unload theoretical
bug which doesn't merit cc: stable.
All the exciting stuff went via MST this cycle"
* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
virtio_balloon: free some memory from balloon on OOM
virtio_balloon: return the amount of freed memory from leak_balloon()
virtio_blk: fix race at module removal
virtio: Fix comment typo 'CONFIG_S_FAILED'
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/virtio_balloon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index 5e26f61..be40f70 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h @@ -31,6 +31,7 @@ /* The feature bitmap for virtio balloon */ #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */ #define VIRTIO_BALLOON_F_STATS_VQ 1 /* Memory Stats virtqueue */ +#define VIRTIO_BALLOON_F_DEFLATE_ON_OOM 2 /* Deflate balloon on OOM */ /* Size of a PFN in the balloon interface. */ #define VIRTIO_BALLOON_PFN_SHIFT 12 |
