From 8256a8d5d11e9c63cd13d97bef99b7154d2c6b95 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 24 Oct 2007 15:54:32 +0100 Subject: [PATCH] --- yaml --- r: 72771 b: refs/heads/master c: 82923663419d376b6c418d353231efb3f7c2b878 h: refs/heads/master i: 72769: c885f937e29187a42fe641f4e887de2a3968e9fb 72767: 28e14e1a3baa8603d24942b40e29199cc3c7881f v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/vpe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6fc14c933dc0..3c775cff4a82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e86b0bf0bd997aad4a5f67b1cba90db11ade6e3 +refs/heads/master: 82923663419d376b6c418d353231efb3f7c2b878 diff --git a/trunk/arch/mips/kernel/vpe.c b/trunk/arch/mips/kernel/vpe.c index df8cbe4c7c0d..436a64ff3989 100644 --- a/trunk/arch/mips/kernel/vpe.c +++ b/trunk/arch/mips/kernel/vpe.c @@ -942,8 +942,8 @@ static int vpe_elfload(struct vpe * v) if (phdr->p_type != PT_LOAD) continue; - memcpy((void *)phdr->p_vaddr, (char *)hdr + phdr->p_offset, phdr->p_filesz); - memset((void *)phdr->p_vaddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz); + memcpy((void *)phdr->p_paddr, (char *)hdr + phdr->p_offset, phdr->p_filesz); + memset((void *)phdr->p_paddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz); phdr++; }