From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbcBOLuE (ORCPT ); Mon, 15 Feb 2016 06:50:04 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:43127 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750925AbcBOLuC (ORCPT ); Mon, 15 Feb 2016 06:50:02 -0500 X-IronPort-AV: E=Sophos;i="5.22,450,1449532800"; d="scan'208";a="338207258" Date: Mon, 15 Feb 2016 11:49:34 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Paul Gortmaker CC: , Konrad Rzeszutek Wilk , Boris Ostrovsky , "David Vrabel" , Subject: Re: [PATCH 2/5] drivers/xen: make [xen-]ballon explicitly non-modular In-Reply-To: <1455481970-15239-3-git-send-email-paul.gortmaker@windriver.com> Message-ID: References: <1455481970-15239-1-git-send-email-paul.gortmaker@windriver.com> <1455481970-15239-3-git-send-email-paul.gortmaker@windriver.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1342847746-1112766822-1455534291=:27008" Content-ID: X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --1342847746-1112766822-1455534291=:27008 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Content-ID: On Sun, 14 Feb 2016, Paul Gortmaker wrote: > 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. > > Cc: Konrad Rzeszutek Wilk > Cc: Boris Ostrovsky > Cc: David Vrabel > Cc: xen-devel@lists.xenproject.org > Signed-off-by: Paul Gortmaker Reviewed-by: Stefano Stabellini > drivers/xen/balloon.c | 4 ---- > drivers/xen/xen-balloon.c | 14 +++----------- > 2 files changed, 3 insertions(+), 15 deletions(-) > > diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c > index 7c8a2cf16f58..9781e0dd59d6 100644 > --- a/drivers/xen/balloon.c > +++ b/drivers/xen/balloon.c > @@ -42,7 +42,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -760,7 +759,4 @@ static int __init balloon_init(void) > > return 0; > } > - > subsys_initcall(balloon_init); > - > -MODULE_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 @@ > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > #include > -#include > +#include > +#include > +#include > #include > > #include > @@ -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"); > -- > 2.6.1 > --1342847746-1112766822-1455534291=:27008--