x86: deprecate change_page_attr() for drivers

With the introduction of the new API, no driver or non-archcore code needs
to use c-p-a anymore, so this patch also deprecates the EXPORT_SYMBOL of CPA
(it's a horrible API after all).

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index f3c9510b8d92..19f7f7a0b36f 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -284,7 +284,7 @@ int change_page_attr(struct page *page, int numpages, pgprot_t prot)
 
         return change_page_attr_addr(addr, numpages, prot);
 }
-EXPORT_SYMBOL(change_page_attr);
+EXPORT_UNUSED_SYMBOL(change_page_attr); /* to be removed in 2.6.27 */
 
 /**
  * change_page_attr_set - Change page table attributes in the linear mapping.
diff --git a/include/asm-x86/cacheflush.h b/include/asm-x86/cacheflush.h
index 7b928d55c190..e79159bc0987 100644
--- a/include/asm-x86/cacheflush.h
+++ b/include/asm-x86/cacheflush.h
@@ -25,7 +25,8 @@
         memcpy(dst, src, len)
 
 void global_flush_tlb(void);
-int change_page_attr(struct page *page, int numpages, pgprot_t prot);
+int __deprecated_for_modules change_page_attr(struct page *page, int numpages,
+                                                                pgprot_t prot);
 int change_page_attr_addr(unsigned long addr, int numpages, pgprot_t prot);
 
 int set_pages_uc(struct page *page, int numpages);