Merge commit 'v2.6.31-rc7' into x86/cleanups

Merge reason: we were on -rc1 before - go up to -rc7

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index ae1d67cc090c..627767d6169b 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -129,12 +129,12 @@ static pte_t do_dcache_icache_coherency(pte_t pte)
         page = pfn_to_page(pfn);
 
         if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags)) {
-                pr_debug("do_dcache_icache_coherency... flushing\n");
+                pr_devel("do_dcache_icache_coherency... flushing\n");
                 flush_dcache_icache_page(page);
                 set_bit(PG_arch_1, &page->flags);
         }
         else
-                pr_debug("do_dcache_icache_coherency... already clean\n");
+                pr_devel("do_dcache_icache_coherency... already clean\n");
         return __pte(pte_val(pte) | _PAGE_HWEXEC);
 }