diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /kernel/ptrace.c | |
parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) |
Merge with 2.4.0-test11.
Diffstat (limited to 'kernel/ptrace.c')
-rw-r--r-- | kernel/ptrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 87dea8254..957355ef4 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -24,7 +24,7 @@ static int access_one_page(struct mm_struct * mm, struct vm_area_struct * vma, u pgd_t * pgdir; pmd_t * pgmiddle; pte_t * pgtable; - unsigned long maddr; + char *maddr; struct page *page; repeat: @@ -54,13 +54,13 @@ repeat: if (write) { maddr = kmap(page); - memcpy((char *)maddr + (addr & ~PAGE_MASK), buf, len); + memcpy(maddr + (addr & ~PAGE_MASK), buf, len); flush_page_to_ram(page); flush_icache_page(vma, page, addr); kunmap(page); } else { maddr = kmap(page); - memcpy(buf, (char *)maddr + (addr & ~PAGE_MASK), len); + memcpy(buf, maddr + (addr & ~PAGE_MASK), len); flush_page_to_ram(page); kunmap(page); } |