diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-06 09:59:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-06 09:59:27 -0700 |
| commit | 68beef571071014ef34a3beac65fe2af7e8e3cf6 (patch) | |
| tree | 7a6e7b5875e909baf587b947b536512d95d046de /include/xen/balloon.h | |
| parent | Merge tags 'auxdisplay-for-linus-v5.9-rc4', 'clang-format-for-linus-v5.9-rc4' and 'compiler-attributes-for-linus-v5.9-rc4' of git://github.com/ojeda/linux (diff) | |
| parent | xen: add helpers to allocate unpopulated memory (diff) | |
| download | linux-dev-68beef571071014ef34a3beac65fe2af7e8e3cf6.tar.xz linux-dev-68beef571071014ef34a3beac65fe2af7e8e3cf6.zip | |
Merge tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
"A small series for fixing a problem with Xen PVH guests when running
as backends (e.g. as dom0).
Mapping other guests' memory is now working via ZONE_DEVICE, thus not
requiring to abuse the memory hotplug functionality for that purpose"
* tag 'for-linus-5.9-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: add helpers to allocate unpopulated memory
memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC
xen/balloon: add header guard
Diffstat (limited to 'include/xen/balloon.h')
| -rw-r--r-- | include/xen/balloon.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h index 6fb95aa19405..6dbdb0b3fd03 100644 --- a/include/xen/balloon.h +++ b/include/xen/balloon.h @@ -2,6 +2,8 @@ /****************************************************************************** * Xen balloon functionality */ +#ifndef _XEN_BALLOON_H +#define _XEN_BALLOON_H #define RETRY_UNLIMITED 0 @@ -34,3 +36,5 @@ static inline void xen_balloon_init(void) { } #endif + +#endif /* _XEN_BALLOON_H */ |