summaryrefslogtreecommitdiffstats
path: root/drivers/lguest/core.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-04-22 14:10:38 +0930
committerRusty Russell <rusty@rustcorp.com.au>2013-04-22 15:31:35 +0930
commit856c608827928d29f80605e85fc3f8f0ab3af4fb (patch)
tree8c1433d23aa1de7d9386fb5192c7239ab6f215a1 /drivers/lguest/core.c
parentc215a8b9eb17739c01d59faa7db9d1ef162a82a8 (diff)
downloadop-kernel-dev-856c608827928d29f80605e85fc3f8f0ab3af4fb.zip
op-kernel-dev-856c608827928d29f80605e85fc3f8f0ab3af4fb.tar.gz
lguest: rename switcher_page to switcher_pages.
There is a single page with the Switcher in it, but it's followed by 2 pages per Host CPU. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/lguest/core.c')
-rw-r--r--drivers/lguest/core.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index 0992523..211d826 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -22,7 +22,7 @@
unsigned long switcher_addr;
static struct vm_struct *switcher_vma;
-static struct page **switcher_page;
+static struct page **switcher_pages;
/* This One Big lock protects all inter-guest data structures. */
DEFINE_MUTEX(lguest_lock);
@@ -56,9 +56,9 @@ static __init int map_switcher(void)
* We allocate an array of struct page pointers. map_vm_area() wants
* this, rather than just an array of pages.
*/
- switcher_page = kmalloc(sizeof(switcher_page[0])*TOTAL_SWITCHER_PAGES,
- GFP_KERNEL);
- if (!switcher_page) {
+ switcher_pages = kmalloc(sizeof(switcher_pages[0])*TOTAL_SWITCHER_PAGES,
+ GFP_KERNEL);
+ if (!switcher_pages) {
err = -ENOMEM;
goto out;
}
@@ -68,8 +68,8 @@ static __init int map_switcher(void)
* so we make sure they're zeroed.
*/
for (i = 0; i < TOTAL_SWITCHER_PAGES; i++) {
- switcher_page[i] = alloc_page(GFP_KERNEL|__GFP_ZERO);
- if (!switcher_page[i]) {
+ switcher_pages[i] = alloc_page(GFP_KERNEL|__GFP_ZERO);
+ if (!switcher_pages[i]) {
err = -ENOMEM;
goto free_some_pages;
}
@@ -110,7 +110,7 @@ static __init int map_switcher(void)
* array of struct pages. It increments that pointer, but we don't
* care.
*/
- pagep = switcher_page;
+ pagep = switcher_pages;
err = map_vm_area(switcher_vma, PAGE_KERNEL_EXEC, &pagep);
if (err) {
printk("lguest: map_vm_area failed: %i\n", err);
@@ -135,8 +135,8 @@ free_pages:
i = TOTAL_SWITCHER_PAGES;
free_some_pages:
for (--i; i >= 0; i--)
- __free_pages(switcher_page[i], 0);
- kfree(switcher_page);
+ __free_pages(switcher_pages[i], 0);
+ kfree(switcher_pages);
out:
return err;
}
@@ -151,8 +151,8 @@ static void unmap_switcher(void)
vunmap(switcher_vma->addr);
/* Now we just need to free the pages we copied the switcher into */
for (i = 0; i < TOTAL_SWITCHER_PAGES; i++)
- __free_pages(switcher_page[i], 0);
- kfree(switcher_page);
+ __free_pages(switcher_pages[i], 0);
+ kfree(switcher_pages);
}
/*H:032
@@ -326,7 +326,7 @@ static int __init init(void)
goto out;
/* Now we set up the pagetable implementation for the Guests. */
- err = init_pagetables(switcher_page, SHARED_SWITCHER_PAGES);
+ err = init_pagetables(switcher_pages, SHARED_SWITCHER_PAGES);
if (err)
goto unmap;
OpenPOWER on IntegriCloud