git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
xen
/
xen-balloon.c
diff --git
a/drivers/xen/xen-balloon.c
b/drivers/xen/xen-balloon.c
index a67236b024522732a2e7cc8e9861ad9c46c87141..6d12fc36821093eb006eae43ea1daa0709091862 100644
(file)
--- a/
drivers/xen/xen-balloon.c
+++ b/
drivers/xen/xen-balloon.c
@@
-129,8
+129,6
@@
void xen_balloon_init(void)
{
register_balloon(&balloon_dev);
- register_xen_selfballooning(&balloon_dev);
-
register_xenstore_notifier(&xenstore_notifier);
}
EXPORT_SYMBOL_GPL(xen_balloon_init);