Commit 106eaa8e authored Feb 21, 2016 by Paul Gortmaker Committed by David Vrabel Mar 21, 2016

drivers/xen: make [xen-]ballon explicitly non-modular



The Makefile / Kconfig currently controlling compilation here is:

obj-y   += grant-table.o features.o balloon.o manage.o preempt.o time.o
[...]
obj-$(CONFIG_XEN_BALLOON)               += xen-balloon.o

...with:

drivers/xen/Kconfig:config XEN_BALLOON
drivers/xen/Kconfig:    bool "Xen memory balloon driver"

...meaning that they currently are not being built as modules by anyone.

Lets remove the modular code that is essentially orphaned, so that
when reading the driver there is no doubt it is builtin-only.

In doing so we uncover two implict includes that were obtained
by module.h having such a wide include scope itself:

In file included from drivers/xen/xen-balloon.c:41:0:
include/xen/balloon.h:26:51: warning: ‘struct page’ declared inside parameter list [enabled by default]
 int alloc_xenballooned_pages(int nr_pages, struct page **pages);
                                                   ^
include/xen/balloon.h: In function ‘register_xen_selfballooning’:
include/xen/balloon.h:35:10: error: ‘ENOSYS’ undeclared (first use in this function)
  return -ENOSYS;
          ^

This is fixed by adding mm-types.h and errno.h to the list.

We also delete the MODULE_LICENSE tags since all that information
is already contained at the top of the file in the comments.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

parent 59aa56bf

drivers/xen/balloon.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		#include <linux/kernel.h>
		#include <linux/sched.h>
		#include <linux/errno.h>
		#include <linux/module.h>
		#include <linux/mm.h>
		#include <linux/bootmem.h>
		#include <linux/pagemap.h>
		@@ -751,7 +750,4 @@ static int __init balloon_init(void)

		return 0;
		}

		subsys_initcall(balloon_init);

		MODULE_LICENSE("GPL");

drivers/xen/xen-balloon.c

+3 −11

Original line number	Diff line number	Diff line
		@@ -33,7 +33,9 @@
		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/errno.h>
		#include <linux/mm_types.h>
		#include <linux/init.h>
		#include <linux/capability.h>

		#include <xen/xen.h>
		@@ -109,14 +111,6 @@ static int __init balloon_init(void)
		}
		subsys_initcall(balloon_init);

		static void balloon_exit(void)
		{
		/* XXX - release balloon here */
		return;
		}

		module_exit(balloon_exit);

		#define BALLOON_SHOW(name, format, args...) \
		static ssize_t show_##name(struct device *dev, \
		struct device_attribute *attr, \
		@@ -250,5 +244,3 @@ static int register_balloon(struct device *dev)

		return 0;
		}

		MODULE_LICENSE("GPL");

Admin message