diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2013-04-22 00:40:38 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-04-22 02:01:35 -0400 |
commit | 856c608827928d29f80605e85fc3f8f0ab3af4fb (patch) | |
tree | 8c1433d23aa1de7d9386fb5192c7239ab6f215a1 /drivers/lguest/page_tables.c | |
parent | c215a8b9eb17739c01d59faa7db9d1ef162a82a8 (diff) |
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/page_tables.c')
-rw-r--r-- | drivers/lguest/page_tables.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index 27cbb186a911..21685580eb9f 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
@@ -1084,7 +1084,7 @@ static void free_switcher_pte_pages(void) | |||
1084 | * Currently the Switcher is less than a page long, so "pages" is always 1. | 1084 | * Currently the Switcher is less than a page long, so "pages" is always 1. |
1085 | */ | 1085 | */ |
1086 | static __init void populate_switcher_pte_page(unsigned int cpu, | 1086 | static __init void populate_switcher_pte_page(unsigned int cpu, |
1087 | struct page *switcher_page[], | 1087 | struct page *switcher_pages[], |
1088 | unsigned int pages) | 1088 | unsigned int pages) |
1089 | { | 1089 | { |
1090 | unsigned int i; | 1090 | unsigned int i; |
@@ -1092,7 +1092,7 @@ static __init void populate_switcher_pte_page(unsigned int cpu, | |||
1092 | 1092 | ||
1093 | /* The first entries are easy: they map the Switcher code. */ | 1093 | /* The first entries are easy: they map the Switcher code. */ |
1094 | for (i = 0; i < pages; i++) { | 1094 | for (i = 0; i < pages; i++) { |
1095 | set_pte(&pte[i], mk_pte(switcher_page[i], | 1095 | set_pte(&pte[i], mk_pte(switcher_pages[i], |
1096 | __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED))); | 1096 | __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED))); |
1097 | } | 1097 | } |
1098 | 1098 | ||
@@ -1100,14 +1100,14 @@ static __init void populate_switcher_pte_page(unsigned int cpu, | |||
1100 | i = pages + cpu*2; | 1100 | i = pages + cpu*2; |
1101 | 1101 | ||
1102 | /* First page (Guest registers) is writable from the Guest */ | 1102 | /* First page (Guest registers) is writable from the Guest */ |
1103 | set_pte(&pte[i], pfn_pte(page_to_pfn(switcher_page[i]), | 1103 | set_pte(&pte[i], pfn_pte(page_to_pfn(switcher_pages[i]), |
1104 | __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED|_PAGE_RW))); | 1104 | __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED|_PAGE_RW))); |
1105 | 1105 | ||
1106 | /* | 1106 | /* |
1107 | * The second page contains the "struct lguest_ro_state", and is | 1107 | * The second page contains the "struct lguest_ro_state", and is |
1108 | * read-only. | 1108 | * read-only. |
1109 | */ | 1109 | */ |
1110 | set_pte(&pte[i+1], pfn_pte(page_to_pfn(switcher_page[i+1]), | 1110 | set_pte(&pte[i+1], pfn_pte(page_to_pfn(switcher_pages[i+1]), |
1111 | __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED))); | 1111 | __pgprot(_PAGE_PRESENT|_PAGE_ACCESSED))); |
1112 | } | 1112 | } |
1113 | 1113 | ||
@@ -1128,7 +1128,7 @@ static __init void populate_switcher_pte_page(unsigned int cpu, | |||
1128 | * At boot or module load time, init_pagetables() allocates and populates | 1128 | * At boot or module load time, init_pagetables() allocates and populates |
1129 | * the Switcher PTE page for each CPU. | 1129 | * the Switcher PTE page for each CPU. |
1130 | */ | 1130 | */ |
1131 | __init int init_pagetables(struct page **switcher_page, unsigned int pages) | 1131 | __init int init_pagetables(struct page **switcher_pages, unsigned int pages) |
1132 | { | 1132 | { |
1133 | unsigned int i; | 1133 | unsigned int i; |
1134 | 1134 | ||
@@ -1138,7 +1138,7 @@ __init int init_pagetables(struct page **switcher_page, unsigned int pages) | |||
1138 | free_switcher_pte_pages(); | 1138 | free_switcher_pte_pages(); |
1139 | return -ENOMEM; | 1139 | return -ENOMEM; |
1140 | } | 1140 | } |
1141 | populate_switcher_pte_page(i, switcher_page, pages); | 1141 | populate_switcher_pte_page(i, switcher_pages, pages); |
1142 | } | 1142 | } |
1143 | return 0; | 1143 | return 0; |
1144 | } | 1144 | } |