From e079197cd69226aa21d2c53fb76b35559d3c07c1 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sat, 4 Sep 1999 01:09:14 +0000
Subject: [PATCH] fix the elf loading.

---
 ChangeLog     | 5 +++++
 THANKS        | 1 +
 stage2/boot.c | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b93ebe71..988e5f616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-09-03  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* stage2/boot.c (load_image): Use PHDR->P_PADDR instead of
+	PHDR->P_VADDR. Reported by Ramon van Handel <vhandel@chem.vu.nl>.
+	
 1999-09-03  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* docs/help2man: Upgraded to 1.013.
diff --git a/THANKS b/THANKS
index 8b1275dd8..0ad69e5d6 100644
--- a/THANKS
+++ b/THANKS
@@ -22,5 +22,6 @@ Miles Bader <miles@gnu.org>
 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
 Pavel Roskin <pavel_roskin@geocities.com>
 Peter Astrand <altic@lysator.liu.se>
+Ramon van Handel <vhandel@chem.vu.nl>
 Takehiro Suzuki <takehiro@coral.ocn.ne.jp>
 VaX#n8 <vax@linkdead.paranoia.com>
diff --git a/stage2/boot.c b/stage2/boot.c
index edef168ad..ce6b66bd9 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -420,9 +420,9 @@ load_image (char *kernel, char *arg)
 	      filesiz = phdr->p_filesz;
 	      
 	      if (type == 'f')
-		memaddr = RAW_ADDR (phdr->p_vaddr & 0xFFFFFF);
+		memaddr = RAW_ADDR (phdr->p_paddr & 0xFFFFFF);
 	      else
-		memaddr = RAW_ADDR (phdr->p_vaddr);
+		memaddr = RAW_ADDR (phdr->p_paddr);
 	      
 	      memsiz = phdr->p_memsz;
 	      if (memaddr < RAW_ADDR (0x100000))