mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
xen/balloon: Fix declared-but-not-defined warning
Fix a declared-but-not-defined warning when building with
XEN_BALLOON_MEMORY_HOTPLUG=n. This fixes a regression introduced by
commit dfd74a1edf
("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>
This commit is contained in:
parent
33688abb28
commit
842775f150
1 changed files with 13 additions and 15 deletions
|
@ -151,8 +151,6 @@ static DECLARE_WAIT_QUEUE_HEAD(balloon_wq);
|
||||||
static void balloon_process(struct work_struct *work);
|
static void balloon_process(struct work_struct *work);
|
||||||
static DECLARE_DELAYED_WORK(balloon_worker, balloon_process);
|
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
|
/* 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. */
|
want the kernel to try too hard since that can trigger the oom killer. */
|
||||||
#define GFP_BALLOON \
|
#define GFP_BALLOON \
|
||||||
|
@ -248,6 +246,19 @@ static enum bp_state update_schedule(enum bp_state state)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
|
#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)
|
static struct resource *additional_memory_resource(phys_addr_t size)
|
||||||
{
|
{
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
@ -286,19 +297,6 @@ static struct resource *additional_memory_resource(phys_addr_t size)
|
||||||
return res;
|
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)
|
static enum bp_state reserve_additional_memory(void)
|
||||||
{
|
{
|
||||||
long credit;
|
long credit;
|
||||||
|
|
Loading…
Reference in a new issue