| From 842775f1509054ea969f1787f38d6a0ec2ccfaba Mon Sep 17 00:00:00 2001 |
| From: Ross Lagerwall <ross.lagerwall@citrix.com> |
| Date: Tue, 10 May 2016 10:27:54 +0100 |
| Subject: xen/balloon: Fix declared-but-not-defined warning |
| |
| From: Ross Lagerwall <ross.lagerwall@citrix.com> |
| |
| commit 842775f1509054ea969f1787f38d6a0ec2ccfaba upstream. |
| |
| Fix a declared-but-not-defined warning when building with |
| XEN_BALLOON_MEMORY_HOTPLUG=n. This fixes a regression introduced by |
| commit dfd74a1edfab ("xen/balloon: Fix crash when ballooning on x86 32 |
| bit PAE"). |
| |
| Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> |
| Acked-by: Juergen Gross <jgross@suse.com> |
| Signed-off-by: David Vrabel <david.vrabel@citrix.com> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/xen/balloon.c | 28 +++++++++++++--------------- |
| 1 file changed, 13 insertions(+), 15 deletions(-) |
| |
| --- a/drivers/xen/balloon.c |
| +++ b/drivers/xen/balloon.c |
| @@ -152,8 +152,6 @@ static DECLARE_WAIT_QUEUE_HEAD(balloon_w |
| static void balloon_process(struct work_struct *work); |
| static DECLARE_DELAYED_WORK(balloon_worker, balloon_process); |
| |
| -static void release_memory_resource(struct resource *resource); |
| - |
| /* When ballooning out (allocating memory to return to Xen) we don't really |
| want the kernel to try too hard since that can trigger the oom killer. */ |
| #define GFP_BALLOON \ |
| @@ -249,6 +247,19 @@ static enum bp_state update_schedule(enu |
| } |
| |
| #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG |
| +static void release_memory_resource(struct resource *resource) |
| +{ |
| + if (!resource) |
| + return; |
| + |
| + /* |
| + * No need to reset region to identity mapped since we now |
| + * know that no I/O can be in this region |
| + */ |
| + release_resource(resource); |
| + kfree(resource); |
| +} |
| + |
| static struct resource *additional_memory_resource(phys_addr_t size) |
| { |
| struct resource *res; |
| @@ -287,19 +298,6 @@ static struct resource *additional_memor |
| return res; |
| } |
| |
| -static void release_memory_resource(struct resource *resource) |
| -{ |
| - if (!resource) |
| - return; |
| - |
| - /* |
| - * No need to reset region to identity mapped since we now |
| - * know that no I/O can be in this region |
| - */ |
| - release_resource(resource); |
| - kfree(resource); |
| -} |
| - |
| static enum bp_state reserve_additional_memory(void) |
| { |
| long credit; |