[PATCH v2] xen/balloon: Fix declared-but-not-defined warning

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH v2] xen/balloon: Fix declared-but-not-defined warning

Ross Lagerwall-2
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 <[hidden email]>
---
v2: Moved function instead of adding a prototype.

 drivers/xen/balloon.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index d46839f..e4db19e 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -151,8 +151,6 @@ static DECLARE_WAIT_QUEUE_HEAD(balloon_wq);
 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 \
@@ -248,6 +246,19 @@ static enum bp_state update_schedule(enum bp_state state)
 }
 
 #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;
@@ -286,19 +297,6 @@ static struct resource *additional_memory_resource(phys_addr_t size)
  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;
--
2.4.11

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH v2] xen/balloon: Fix declared-but-not-defined warning

Juergen Gross
On 10/05/16 11:27, Ross Lagerwall wrote:
> 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 <[hidden email]>

Acked-by: Juergen Gross <[hidden email]>


Thanks,

Juergen
Reply | Threaded
Open this post in threaded view
|

Re: [Xen-devel] [PATCH v2] xen/balloon: Fix declared-but-not-defined warning

David Vrabel
In reply to this post by Ross Lagerwall-2
On 10/05/16 10:27, Ross Lagerwall wrote:
> 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").

Applied to for-linus-4.7b, thanks.

I have not Cc'd stable since this only fixes a warning.

David