diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 10:47:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 10:47:46 +0000 |
commit | 41966710ab574f1fcedf3e10e1ceef911c096d1d (patch) | |
tree | a370f9fb2392267d1e7b06d7c9f43c6d80eb12be /include/xen/balloon.h | |
parent | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (diff) | |
parent | 1dd6c0770d7d4ca477a1a8452ab0161b1150e4ad (diff) |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'include/xen/balloon.h')
-rw-r--r-- | include/xen/balloon.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h index 76f7538bb33..d29c153705b 100644 --- a/include/xen/balloon.h +++ b/include/xen/balloon.h @@ -25,8 +25,9 @@ extern struct balloon_stats balloon_stats; void balloon_set_new_target(unsigned long target); -int alloc_xenballooned_pages(int nr_pages, struct page** pages); -void free_xenballooned_pages(int nr_pages, struct page** pages); +int alloc_xenballooned_pages(int nr_pages, struct page **pages, + bool highmem); +void free_xenballooned_pages(int nr_pages, struct page **pages); struct sys_device; #ifdef CONFIG_XEN_SELFBALLOONING |