aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/xen/balloon.c4
-rw-r--r--drivers/xen/xen-balloon.c14
2 files changed, 3 insertions, 15 deletions
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 12eab503efd1..481c3f86033a 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -42,7 +42,6 @@
42#include <linux/kernel.h> 42#include <linux/kernel.h>
43#include <linux/sched.h> 43#include <linux/sched.h>
44#include <linux/errno.h> 44#include <linux/errno.h>
45#include <linux/module.h>
46#include <linux/mm.h> 45#include <linux/mm.h>
47#include <linux/bootmem.h> 46#include <linux/bootmem.h>
48#include <linux/pagemap.h> 47#include <linux/pagemap.h>
@@ -751,7 +750,4 @@ static int __init balloon_init(void)
751 750
752 return 0; 751 return 0;
753} 752}
754
755subsys_initcall(balloon_init); 753subsys_initcall(balloon_init);
756
757MODULE_LICENSE("GPL");
diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c
index 39e7ef8d3957..79865b8901ba 100644
--- a/drivers/xen/xen-balloon.c
+++ b/drivers/xen/xen-balloon.c
@@ -33,7 +33,9 @@
33#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 33#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
34 34
35#include <linux/kernel.h> 35#include <linux/kernel.h>
36#include <linux/module.h> 36#include <linux/errno.h>
37#include <linux/mm_types.h>
38#include <linux/init.h>
37#include <linux/capability.h> 39#include <linux/capability.h>
38 40
39#include <xen/xen.h> 41#include <xen/xen.h>
@@ -109,14 +111,6 @@ static int __init balloon_init(void)
109} 111}
110subsys_initcall(balloon_init); 112subsys_initcall(balloon_init);
111 113
112static void balloon_exit(void)
113{
114 /* XXX - release balloon here */
115 return;
116}
117
118module_exit(balloon_exit);
119
120#define BALLOON_SHOW(name, format, args...) \ 114#define BALLOON_SHOW(name, format, args...) \
121 static ssize_t show_##name(struct device *dev, \ 115 static ssize_t show_##name(struct device *dev, \
122 struct device_attribute *attr, \ 116 struct device_attribute *attr, \
@@ -250,5 +244,3 @@ static int register_balloon(struct device *dev)
250 244
251 return 0; 245 return 0;
252} 246}
253
254MODULE_LICENSE("GPL");