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

merge mainline into multiterm

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-07 21:34:43 +01:00
commit 44fcb2bc59
6 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
loader/i386/multiboot.c
View file

@ -27,6 +27,9 @@
* - APM table
*/
/* The bits in the required part of flags field we don't support. */
#define UNSUPPORTED_FLAGS 0x0000fffc
#include <grub/loader.h>
#include <grub/machine/loader.h>
#include <grub/multiboot.h>
@ -261,7 +264,7 @@ grub_multiboot (int argc, char *argv[])
goto fail;
}
if (header->flags & MULTIBOOT_UNSUPPORTED)
if (header->flags & UNSUPPORTED_FLAGS)
{
grub_error (GRUB_ERR_UNKNOWN_OS,
"unsupported flag: 0x%x", header->flags);