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 /drivers/xen/balloon.c | |
| parent | 4b162c530d9c101381500e586fedb1340595a6ff (diff) | |
| parent | 96edd61dcf44362d3ef0bed1a5361e0ac7886a63 (diff) | |
| download | linux-a56e88ec05df50110f2bf578b6e17128f37111ed.tar.gz linux-a56e88ec05df50110f2bf578b6e17128f37111ed.tar.xz | |
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 'drivers/xen/balloon.c')
| -rw-r--r-- | drivers/xen/balloon.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index 50dcb68d8070..ab609255a0f3 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -780,6 +780,9 @@ static int __init balloon_init(void) } #endif + /* Init the xen-balloon driver. */ + xen_balloon_init(); + return 0; } subsys_initcall(balloon_init); |