patch-2.3.7 linux/arch/sparc64/kernel/ptrace.c

• Lines: 63
• Date: Thu Jun 17 01:08:50 1999
• Orig file: v2.3.6/linux/arch/sparc64/kernel/ptrace.c
• Orig date: Mon Jun 7 11:15:33 1999

diff -u --recursive --new-file v2.3.6/linux/arch/sparc64/kernel/ptrace.c linux/arch/sparc64/kernel/ptrace.c
@@ -34,7 +34,7 @@
  * and that it is in the task area before calling this: this routine does
  * no checking.
  */
-static pte_t *get_page(struct task_struct * tsk,
+static pte_t *ptrace_get_page(struct task_struct * tsk,
 	struct vm_area_struct * vma, unsigned long addr, int write)
 {
 	pgd_t * pgdir;
@@ -121,7 +121,7 @@
 	pte_t * pgtable;
 	unsigned long page, retval;
 	
-	if (!(pgtable = get_page (tsk, vma, addr, 0))) return 0;
+	if (!(pgtable = ptrace_get_page (tsk, vma, addr, 0))) return 0;
 	page = pte_page(*pgtable);
 /* this is a hack for non-kernel-mapped video buffers and similar */
 	if (MAP_NR(page) >= max_mapnr)
@@ -138,7 +138,7 @@
 	pte_t *pgtable;
 	unsigned long page;
 
-	if (!(pgtable = get_page (tsk, vma, addr, 1))) return;
+	if (!(pgtable = ptrace_get_page (tsk, vma, addr, 1))) return;
 	page = pte_page(*pgtable);
 /* this is a hack for non-kernel-mapped video buffers and similar */
 	flush_cache_page(vma, addr);
@@ -166,7 +166,7 @@
 	unsigned long page;
 	unsigned int retval;
 	
-	if (!(pgtable = get_page (tsk, vma, addr, 0))) return 0;
+	if (!(pgtable = ptrace_get_page (tsk, vma, addr, 0))) return 0;
 	page = pte_page(*pgtable);
 /* this is a hack for non-kernel-mapped video buffers and similar */
 	if (MAP_NR(page) >= max_mapnr)
@@ -183,7 +183,7 @@
 	pte_t *pgtable;
 	unsigned long page;
 
-	if (!(pgtable = get_page (tsk, vma, addr, 1))) return;
+	if (!(pgtable = ptrace_get_page (tsk, vma, addr, 1))) return;
 	page = pte_page(*pgtable);
 /* this is a hack for non-kernel-mapped video buffers and similar */
 	flush_cache_page(vma, addr);
@@ -941,7 +941,7 @@
 				pt_error_return(regs, EIO);
 				goto flush_and_out;
 			}
-			pgtable = get_page (child, vma, src, 0);
+			pgtable = ptrace_get_page (child, vma, src, 0);
 			up(&child->mm->mmap_sem);
 			if (src & ~PAGE_MASK) {
 				curlen = PAGE_SIZE - (src & ~PAGE_MASK);
@@ -988,7 +988,7 @@
 				pt_error_return(regs, EIO);
 				goto flush_and_out;
 			}
-			pgtable = get_page (child, vma, dest, 1);
+			pgtable = ptrace_get_page (child, vma, dest, 1);
 			up(&child->mm->mmap_sem);
 			if (dest & ~PAGE_MASK) {
 				curlen = PAGE_SIZE - (dest & ~PAGE_MASK);