Forráskód Böngészése

x86: Fix copying of Real-Mode code into RAM

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Graeme Russ 15 éve
szülő
commit
153c2d9f23
2 módosított fájl, 2 hozzáadás és 2 törlés
  1. 1 1
      arch/i386/lib/bios_setup.c
  2. 1 1
      arch/i386/lib/realmode.c

+ 1 - 1
arch/i386/lib/bios_setup.c

@@ -141,7 +141,7 @@ static void setvector(int vector, u16 segment, void *handler)
 
 int bios_setup(void)
 {
-	ulong i386boot_bios      = (ulong)&_i386boot_bios;
+	ulong i386boot_bios      = (ulong)&_i386boot_bios + gd->reloc_off;
 	ulong i386boot_bios_size = (ulong)&_i386boot_bios_size;
 
 	static int done=0;

+ 1 - 1
arch/i386/lib/realmode.c

@@ -37,7 +37,7 @@ extern char realmode_enter;
 
 int realmode_setup(void)
 {
-	ulong i386boot_realmode      = (ulong)&_i386boot_realmode;
+	ulong i386boot_realmode      = (ulong)&_i386boot_realmode + gd->reloc_off;
 	ulong i386boot_realmode_size = (ulong)&_i386boot_realmode_size;
 
 	/* copy the realmode switch code */