|
@@ -14,7 +14,7 @@
|
|
|
|
|
|
pte_t* pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
|
|
|
{
|
|
|
- pte_t *pte, p;
|
|
|
+ pte_t *pte = NULL, *p;
|
|
|
int color = ADDR_COLOR(address);
|
|
|
int i;
|
|
|
|
|
@@ -23,16 +23,16 @@ pte_t* pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
|
|
|
if (likely(p)) {
|
|
|
struct page *page;
|
|
|
|
|
|
- for (i = 0; i < COLOR_SIZE; i++, p++) {
|
|
|
- page = virt_to_page(pte);
|
|
|
+ for (i = 0; i < COLOR_SIZE; i++) {
|
|
|
+ page = virt_to_page(p);
|
|
|
|
|
|
set_page_count(page, 1);
|
|
|
- ClearPageCompound(page);
|
|
|
|
|
|
if (ADDR_COLOR(p) == color)
|
|
|
pte = p;
|
|
|
else
|
|
|
free_page(p);
|
|
|
+ p += PTRS_PER_PTE;
|
|
|
}
|
|
|
clear_page(pte);
|
|
|
}
|
|
@@ -49,7 +49,7 @@ int flush;
|
|
|
|
|
|
struct page* pte_alloc_one(struct mm_struct *mm, unsigned long address)
|
|
|
{
|
|
|
- struct page *page, p;
|
|
|
+ struct page *page = NULL, *p;
|
|
|
int color = ADDR_COLOR(address);
|
|
|
|
|
|
p = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
|
|
@@ -57,12 +57,12 @@ struct page* pte_alloc_one(struct mm_struct *mm, unsigned long address)
|
|
|
if (likely(p)) {
|
|
|
for (i = 0; i < PAGE_ORDER; i++) {
|
|
|
set_page_count(p, 1);
|
|
|
- ClearPageCompound(p);
|
|
|
|
|
|
- if (PADDR_COLOR(page_address(pg)) == color)
|
|
|
+ if (PADDR_COLOR(page_address(p)) == color)
|
|
|
page = p;
|
|
|
else
|
|
|
- free_page(p);
|
|
|
+ __free_page(p);
|
|
|
+ p++;
|
|
|
}
|
|
|
clear_highpage(page);
|
|
|
}
|