aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-21 13:46:33 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-21 13:46:33 +0200
commitcacf890694a36124ceddce44ff4c7b02d372ce7c (patch)
tree7bcf88d191854b9d8f325866149533043d1a1076 /arch
parent9326d61bf64c4293f834e86c11f52db5be9798d6 (diff)
Revert "introduce two APIs for page attribute"
This reverts commit 1ac2f7d55b7ee1613c90631e87fea22ec06781e5.
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/pageattr.c58
1 files changed, 8 insertions, 50 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 4adb33628de..5c06469a065 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -752,12 +752,12 @@ static inline int cache_attr(pgprot_t attr)
(_PAGE_PAT | _PAGE_PAT_LARGE | _PAGE_PWT | _PAGE_PCD);
}
-static int do_change_page_attr_set_clr(unsigned long addr, int numpages,
+static int change_page_attr_set_clr(unsigned long addr, int numpages,
pgprot_t mask_set, pgprot_t mask_clr,
- int force_split, int *tlb_flush)
+ int force_split)
{
struct cpa_data cpa;
- int ret, checkalias;
+ int ret, cache, checkalias;
/*
* Check, if we are requested to change a not supported
@@ -795,22 +795,9 @@ static int do_change_page_attr_set_clr(unsigned long addr, int numpages,
/*
* Check whether we really changed something:
*/
- *tlb_flush = cpa.flushtlb;
- cpa_fill_pool(NULL);
-
- return ret;
-}
-
-static int change_page_attr_set_clr(unsigned long addr, int numpages,
- pgprot_t mask_set, pgprot_t mask_clr,
- int force_split)
-{
- int cache, flush_cache = 0, ret;
-
- ret = do_change_page_attr_set_clr(addr, numpages, mask_set, mask_clr,
- force_split, &flush_cache);
- if (!flush_cache)
+ if (!cpa.flushtlb)
goto out;
+
/*
* No need to flush, when we did not set any of the caching
* attributes:
@@ -827,7 +814,10 @@ static int change_page_attr_set_clr(unsigned long addr, int numpages,
cpa_flush_range(addr, numpages, cache);
else
cpa_flush_all(cache);
+
out:
+ cpa_fill_pool(NULL);
+
return ret;
}
@@ -865,30 +855,6 @@ int set_memory_uc(unsigned long addr, int numpages)
}
EXPORT_SYMBOL(set_memory_uc);
-int set_memory_uc_noflush(unsigned long addr, int numpages)
-{
- int flush;
- /*
- * for now UC MINUS. see comments in ioremap_nocache()
- */
- if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
- _PAGE_CACHE_UC_MINUS, NULL))
- return -EINVAL;
- /*
- * for now UC MINUS. see comments in ioremap_nocache()
- */
- return do_change_page_attr_set_clr(addr, numpages,
- __pgprot(_PAGE_CACHE_UC_MINUS),
- __pgprot(0), 0, &flush);
-}
-EXPORT_SYMBOL(set_memory_uc_noflush);
-
-void set_memory_flush_all(void)
-{
- cpa_flush_all(1);
-}
-EXPORT_SYMBOL(set_memory_flush_all);
-
int _set_memory_wc(unsigned long addr, int numpages)
{
return change_page_attr_set(addr, numpages,
@@ -963,14 +929,6 @@ int set_pages_uc(struct page *page, int numpages)
}
EXPORT_SYMBOL(set_pages_uc);
-int set_pages_uc_noflush(struct page *page, int numpages)
-{
- unsigned long addr = (unsigned long)page_address(page);
-
- return set_memory_uc_noflush(addr, numpages);
-}
-EXPORT_SYMBOL(set_pages_uc_noflush);
-
int set_pages_wb(struct page *page, int numpages)
{
unsigned long addr = (unsigned long)page_address(page);