Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio update from Michael Tsirkin: "This adds reporting hugepage stats to virtio-balloon" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio_balloon: export hugetlb page allocation counts

Linus Torvalds committed 8 years ago

Commit e241e3f2 parents e5c3722 6c64fe72 files · +9 −1Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/virtio_balloon.h+3−1

@@ -53,7 +53,9 @@ struct virtio_balloon_config { · 52 unmodified lines
53	53	#define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */
54	54	#define VIRTIO_BALLOON_S_AVAIL 6 /* Available memory as in /proc */
55	55	#define VIRTIO_BALLOON_S_CACHES 7 /* Disk caches */
56		−#define VIRTIO_BALLOON_S_NR 8
	56	+#define VIRTIO_BALLOON_S_HTLB_PGALLOC 8 /* Hugetlb page allocations */
	57	+#define VIRTIO_BALLOON_S_HTLB_PGFAIL 9 /* Hugetlb page allocation failures */
	58	+#define VIRTIO_BALLOON_S_NR 10
57	59
58	60	/*
59	61	* Memory statistics structure.