patch-2.4.0-test10 linux/arch/sh/mm/fault.c

• Lines: 47
• Date: Fri Oct 13 12:06:52 2000
• Orig file: v2.4.0-test9/linux/arch/sh/mm/fault.c
• Orig date: Sun Oct 8 10:50:11 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/sh/mm/fault.c linux/arch/sh/mm/fault.c
@@ -231,8 +231,11 @@
 		goto no_context;
 }
 
-static int __do_page_fault1(struct pt_regs *regs, unsigned long writeaccess,
-			    unsigned long address)
+/*
+ * Called with interrupt disabled.
+ */
+asmlinkage int __do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
+			       unsigned long address)
 {
 	pgd_t *dir;
 	pmd_t *pmd;
@@ -240,8 +243,6 @@
 	pte_t entry;
 
 	if (address >= VMALLOC_START && address < VMALLOC_END)
-		/* We can change the implementation of P3 area pte entries.
-		   set_pgdir and such. */
 		dir = pgd_offset_k(address);
 	else
 		dir = pgd_offset(current->mm, address);
@@ -273,23 +274,6 @@
 	set_pte(pte, entry);
 	update_mmu_cache(NULL, address, entry);
 	return 0;
-}
-
-/*
- * Called with interrupt disabled.
- */
-asmlinkage void __do_page_fault(struct pt_regs *regs, unsigned long writeaccess,
-				unsigned long address)
-{
-	/*
-	 * XXX: Could you please implement this (calling __do_page_fault1)
-	 * in assembler language in entry.S?
-	 */
-	if (__do_page_fault1(regs, writeaccess, address)  == 0)
-		/* Done. */
-		return;
-	sti();
-	do_page_fault(regs, writeaccess, address);
 }
 
 void update_mmu_cache(struct vm_area_struct * vma,