Patch "xen/balloon: Fix declared-but-not-defined warning" has been added to the 4.6-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
xen/balloon: Fix declared-but-not-defined warning
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xen-balloon-fix-declared-but-not-defined-warning.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
842775f1509054ea969f1787f38d6a0ec2ccfabaMon Sep 17 00:00:00 2001
From: Ross Lagerwall <[email protected]>
Date: Tue, 10 May 2016 10:27:54 +0100
Subject: xen/balloon: Fix declared-but-not-defined warning
From: Ross Lagerwall <[email protected]>
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").
--- drivers/xen/balloon.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/xen/balloon.c +13 -15
@@ -151,8 +151,6 @@ static DECLARE_WAIT_QUEUE_HEAD(balloon_wstatic 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(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;
@@ -286,19 +297,6 @@ static struct resource *additional_memorreturn 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;
Patches currently in stable-queue which might be from [email protected] are
queue-4.6/xen-balloon-fix-declared-but-not-defined-warning.patch