vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge mainline.

Browse source
This commit is contained in:
Manoel Rebelo Abranches 2011-05-05 12:12:22 -03:00
commit 90eb90e24c
263 changed files with 5295 additions and 865 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/i386/pc/chainloader.c
View file

@ -38,6 +38,8 @@
#include <grub/video.h>
#include <grub/mm.h>
GRUB_MOD_LICENSE ("GPLv3+");
static grub_dl_t my_mod;
static int boot_drive;
static void *boot_part_addr;

2
grub-core/loader/i386/pc/linux.c
View file

@ -36,6 +36,8 @@
#include <grub/i386/floppy.h>
#include <grub/lib/cmdline.h>
GRUB_MOD_LICENSE ("GPLv3+");
#define GRUB_LINUX_CL_OFFSET 0x9000
#define GRUB_LINUX_CL_END_OFFSET 0x90FF

2
grub-core/loader/i386/pc/ntldr.c
View file

@ -33,6 +33,8 @@
#include <grub/mm.h>
#include <grub/cpu/relocator.h>
GRUB_MOD_LICENSE ("GPLv3+");
static grub_dl_t my_mod;
static struct grub_relocator *rel;
static grub_uint32_t edx = 0xffffffff;