1 files changed, 8 insertions, 27 deletions

diff --git a/arch/sh/mm/pg-sh4.c b/arch/sh/mm/pg-sh4.c
index 07371ed7a313..3f98d2a4f936 100644
--- a/arch/sh/mm/pg-sh4.c
+++ b/arch/sh/mm/pg-sh4.c
@@ -6,22 +6,12 @@
  *
  * Released under the terms of the GNU GPL v2.0.
  */
-#include <linux/init.h>
-#include <linux/mman.h>
 #include <linux/mm.h>
-#include <linux/threads.h>
-#include <asm/addrspace.h>
-#include <asm/page.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/cache.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
+#include <linux/mutex.h>
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
 
-extern struct semaphore p3map_sem[];
+extern struct mutex p3map_mutex[];
 
 #define CACHE_ALIAS (cpu_data->dcache.alias_mask)
 
@@ -37,10 +27,6 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 clear_page(to);
         else {
-                pgprot_t pgprot = __pgprot(_PAGE_PRESENT |
-                                           _PAGE_RW | _PAGE_CACHABLE |
-                                           _PAGE_DIRTY | _PAGE_ACCESSED |
-                                           _PAGE_HW_SHARED | _PAGE_FLAGS_HARD);
                 unsigned long phys_addr = PHYSADDR(to);
                 unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
                 pgd_t *pgd = pgd_offset_k(p3_addr);
@@ -50,8 +36,8 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
                 pte_t entry;
                 unsigned long flags;
 
-                entry = pfn_pte(phys_addr >> PAGE_SHIFT, pgprot);
-                down(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                entry = pfn_pte(phys_addr >> PAGE_SHIFT, PAGE_KERNEL);
+                mutex_lock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
                 set_pte(pte, entry);
                 local_irq_save(flags);
                 __flush_tlb_page(get_asid(), p3_addr);
@@ -59,7 +45,7 @@ void clear_user_page(void *to, unsigned long address, struct page *page)
                 update_mmu_cache(NULL, p3_addr, entry);
                 __clear_user_page((void *)p3_addr, to);
                 pte_clear(&init_mm, p3_addr, pte);
-                up(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                mutex_unlock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
         }
 }
 
@@ -77,10 +63,6 @@ void copy_user_page(void *to, void *from, unsigned long address,
         if (((address ^ (unsigned long)to) & CACHE_ALIAS) == 0)
                 copy_page(to, from);
         else {
-                pgprot_t pgprot = __pgprot(_PAGE_PRESENT |
-                                           _PAGE_RW | _PAGE_CACHABLE |
-                                           _PAGE_DIRTY | _PAGE_ACCESSED |
-                                           _PAGE_HW_SHARED | _PAGE_FLAGS_HARD);
                 unsigned long phys_addr = PHYSADDR(to);
                 unsigned long p3_addr = P3SEG + (address & CACHE_ALIAS);
                 pgd_t *pgd = pgd_offset_k(p3_addr);
@@ -90,8 +72,8 @@ void copy_user_page(void *to, void *from, unsigned long address,
                 pte_t entry;
                 unsigned long flags;
 
-                entry = pfn_pte(phys_addr >> PAGE_SHIFT, pgprot);
-                down(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                entry = pfn_pte(phys_addr >> PAGE_SHIFT, PAGE_KERNEL);
+                mutex_lock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
                 set_pte(pte, entry);
                 local_irq_save(flags);
                 __flush_tlb_page(get_asid(), p3_addr);
@@ -99,7 +81,7 @@ void copy_user_page(void *to, void *from, unsigned long address,
                 update_mmu_cache(NULL, p3_addr, entry);
                 __copy_user_page((void *)p3_addr, from, to);
                 pte_clear(&init_mm, p3_addr, pte);
-                up(&p3map_sem[(address & CACHE_ALIAS)>>12]);
+                mutex_unlock(&p3map_mutex[(address & CACHE_ALIAS)>>12]);
         }
 }
 
@@ -122,4 +104,3 @@ inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t
         }
         return pte;
 }
-