This makes 32 bit cpa similar to x86_64 and makes it easier for following PAT
patches.
Signed-off-by: Venkatesh Pallipadi <[EMAIL PROTECTED]>
Signed-off-by: Suresh Siddha <[EMAIL PROTECTED]>
Index: linux-2.6.git/arch/x86/mm/pageattr_32.c
===================================================================
--- linux-2.6.git.orig/arch/x86/mm/pageattr_32.c 2008-01-08
04:05:24.000000000 -0800
+++ linux-2.6.git/arch/x86/mm/pageattr_32.c 2008-01-08 05:10:44.000000000
-0800
@@ -153,15 +153,12 @@
list_add(&kpte_page->lru, &df_list);
}
-static int __change_page_attr(struct page *page, pgprot_t prot)
+static int __change_page_attr(unsigned long address, unsigned long pfn,
+ pgprot_t prot)
{
struct page *kpte_page;
- unsigned long address;
pte_t *kpte;
- BUG_ON(PageHighMem(page));
- address = (unsigned long)page_address(page);
-
kpte = lookup_address(address);
if (!kpte)
return -EINVAL;
@@ -172,7 +169,7 @@
if (pgprot_val(prot) != pgprot_val(PAGE_KERNEL)) {
if (!pte_huge(*kpte)) {
- set_pte_atomic(kpte, mk_pte(page, prot));
+ set_pte_atomic(kpte, pfn_pte(pfn, prot));
} else {
struct page *split;
pgprot_t ref_prot;
@@ -190,7 +187,7 @@
page_private(kpte_page)++;
} else {
if (!pte_huge(*kpte)) {
- set_pte_atomic(kpte, mk_pte(page, PAGE_KERNEL));
+ set_pte_atomic(kpte, pfn_pte(pfn, PAGE_KERNEL));
BUG_ON(page_private(kpte_page) == 0);
page_private(kpte_page)--;
} else
@@ -231,14 +228,15 @@
*
* Caller must call global_flush_tlb() after this.
*/
-int change_page_attr(struct page *page, int numpages, pgprot_t prot)
+int change_page_attr_addr(unsigned long address, int numpages, pgprot_t prot)
{
unsigned long flags;
int err = 0, i;
spin_lock_irqsave(&cpa_lock, flags);
- for (i = 0; i < numpages; i++, page++) {
- err = __change_page_attr(page, prot);
+ for (i = 0; i < numpages; i++, address += PAGE_SIZE) {
+ unsigned long pfn = __pa(address) >> PAGE_SHIFT;
+ err = __change_page_attr(address, pfn, prot);
if (err)
break;
}
@@ -248,6 +246,12 @@
}
EXPORT_SYMBOL(change_page_attr);
+int change_page_attr(struct page *page, int numpages, pgprot_t prot)
+{
+ unsigned long addr = (unsigned long)page_address(page);
+ return change_page_attr_addr(addr, numpages, prot);
+}
+
void global_flush_tlb(void)
{
struct page *pg, *next;
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
