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

merge mainline into net

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-24 22:20:50 +02:00
commit 8f72becdef
45 changed files with 2702 additions and 1144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/i386/pc/freedos.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 ebx = 0xffffffff;

10
grub-core/loader/i386/xnu.c
View file

@ -452,11 +452,11 @@ grub_cpu_xnu_fill_devprop (void)
}
devprop = grub_xnu_create_value (&(efikey->first_child), "device-properties");
if (devprop)
{
devprop->data = grub_malloc (total_length);
devprop->datasize = total_length;
}
if (!devprop)
return grub_errno;
devprop->data = grub_malloc (total_length);
devprop->datasize = total_length;
ptr = devprop->data;
head = ptr;

2
grub-core/loader/ia64/efi/linux.c
View file

@ -31,6 +31,8 @@
#include <grub/efi/efi.h>
#include <grub/elf.h>
GRUB_MOD_LICENSE ("GPLv3+");
#define ALIGN_MIN (256*1024*1024)
#define GRUB_ELF_SEARCH 1024