git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
xtensa
/
mm
/
pgtable.c
diff --git
a/arch/xtensa/mm/pgtable.c
b/arch/xtensa/mm/pgtable.c
index
7d28914
..
e5e119c
100644
(file)
--- a/
arch/xtensa/mm/pgtable.c
+++ b/
arch/xtensa/mm/pgtable.c
@@
-14,21
+14,25
@@
pte_t* pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{
pte_t* pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{
- pte_t *pte
= NULL, *
p;
+ pte_t *pte
,
p;
int color = ADDR_COLOR(address);
int i;
p = (pte_t*) __get_free_pages(GFP_KERNEL|__GFP_REPEAT, COLOR_ORDER);
if (likely(p)) {
int color = ADDR_COLOR(address);
int i;
p = (pte_t*) __get_free_pages(GFP_KERNEL|__GFP_REPEAT, COLOR_ORDER);
if (likely(p)) {
- split_page(virt_to_page(p), COLOR_ORDER);
+ struct page *page;
+
+ for (i = 0; i < COLOR_SIZE; i++, p++) {
+ page = virt_to_page(pte);
+
+ set_page_count(page, 1);
+ ClearPageCompound(page);
- for (i = 0; i < COLOR_SIZE; i++) {
if (ADDR_COLOR(p) == color)
pte = p;
else
free_page(p);
if (ADDR_COLOR(p) == color)
pte = p;
else
free_page(p);
- p += PTRS_PER_PTE;
}
clear_page(pte);
}
}
clear_page(pte);
}
@@
-45,20
+49,20
@@
int flush;
struct page* pte_alloc_one(struct mm_struct *mm, unsigned long address)
{
struct page* pte_alloc_one(struct mm_struct *mm, unsigned long address)
{
- struct page *page
= NULL, *
p;
+ struct page *page
,
p;
int color = ADDR_COLOR(address);
p = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
if (likely(p)) {
int color = ADDR_COLOR(address);
p = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
if (likely(p)) {
- split_page(p, COLOR_ORDER);
-
for (i = 0; i < PAGE_ORDER; i++) {
for (i = 0; i < PAGE_ORDER; i++) {
- if (PADDR_COLOR(page_address(p)) == color)
+ set_page_count(p, 1);
+ ClearPageCompound(p);
+
+ if (PADDR_COLOR(page_address(pg)) == color)
page = p;
else
page = p;
else
- __free_page(p);
- p++;
+ free_page(p);
}
clear_highpage(page);
}
}
clear_highpage(page);
}