diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-23 11:22:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-23 11:22:45 -0700 |
| commit | a56e88ec05df50110f2bf578b6e17128f37111ed (patch) | |
| tree | fe3ee0bcd1cef2d28ffd62a0c012ad972c581049 /include | |
| parent | Merge tag 'hwmon-for-linus-v4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (diff) | |
| parent | xen/balloon: don't online new memory initially (diff) | |
| download | linux-rng-a56e88ec05df50110f2bf578b6e17128f37111ed.tar.xz linux-rng-a56e88ec05df50110f2bf578b6e17128f37111ed.zip | |
Merge tag 'for-linus-4.13b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Some fixes and cleanups for running under Xen"
* tag 'for-linus-4.13b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/balloon: don't online new memory initially
xen/x86: fix cpu hotplug
xen/grant-table: log the lack of grants
xen/x86: Don't BUG on CPU0 offlining
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/balloon.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h index d1767dfb0d95..8906361bb50c 100644 --- a/include/xen/balloon.h +++ b/include/xen/balloon.h @@ -35,3 +35,11 @@ static inline int register_xen_selfballooning(struct device *dev) return -ENOSYS; } #endif + +#ifdef CONFIG_XEN_BALLOON +void xen_balloon_init(void); +#else +static inline void xen_balloon_init(void) +{ +} +#endif |