merge mainline into intwrap

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-29 23:21:21 +02:00
commit 069c9c5fda
137 changed files with 8057 additions and 3591 deletions

View file

@ -474,8 +474,6 @@ FUNCTION(grub_chainloader_real_boot)
pushl %edx
pushl %eax
call EXT_C(grub_dl_unload_all)
/* Turn off Gate A20 */
xorl %eax, %eax
call EXT_C(grub_gate_a20)
@ -491,8 +489,6 @@ FUNCTION(grub_chainloader_real_boot)
ljmp $0, $GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR
.code32
#include "../loader.S"
/*
* void grub_console_putchar (int c)
*