2010-01-07 Robert Millan <rmh.grub@aybabtu.com>

	* include/multiboot.h (MULTIBOOT_UNSUPPORTED): Moved from here ...
	* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): ... to here.  Update
	all users.

diff --git a/ChangeLog b/ChangeLog
index a5823bd8fc4be25c6b5781aa5af2d8f9799efe36..d7b84f6b3883aadfd403a0f02c4664388c9d1f7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * include/multiboot.h (MULTIBOOT_UNSUPPORTED): Moved from here ...
+       * loader/i386/multiboot.c (UNSUPPORTED_FLAGS): ... to here.  Update
+       all users.
+
 2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
 2010-01-07  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/include/multiboot.h b/include/multiboot.h
index 587f50832c0d40cb7ca3fb2adf17b8b70d598368..da7afd9b3b6d93b731795025919cb544eac84342 100644 (file)
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -31,9 +31,6 @@
 /* This should be in %eax.  */
 #define MULTIBOOT_BOOTLOADER_MAGIC             0x2BADB002
 
-/* The bits in the required part of flags field we don't support.  */
-#define MULTIBOOT_UNSUPPORTED                  0x0000fffc
-
 /* Alignment of multiboot modules.  */
 #define MULTIBOOT_MOD_ALIGN                    0x00001000
 

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index a52b8d5d6c45cdcb389b4df2ad792881d04af40e..f4869594ecaf2362b77ddc599eda0c1c375d45ab 100644 (file)
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -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);