~ubuntu-branches/ubuntu/wily/grub2/wily-proposed

« back to all changes in this revision

Viewing changes to include/multiboot2.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Zielcke, Robert Millan, Felix Zielcke
  • Date: 2010-01-26 19:26:25 UTC
  • mfrom: (1.13.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126192625-coq6czap2ofjollf
Tags: 1.98~20100126-1
* New Bazaar snapshot.
  - Includes mipsel-yeeloong port.

[ Robert Millan ]
* config.in: Lower priority of grub2/linux_cmdline_default.

[ Felix Zielcke ]
* Drop `CFLAGS=-O0' workaround on powerpc. Should be fixed correctly now.
* Ship grub-bin2h and grub-script-check in grub-common.
* Terminate NEWS.Debian with a blank line like lintian would suggest
  if that check would be working correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
233
233
  multiboot_uint64_t len;
234
234
#define MULTIBOOT_MEMORY_AVAILABLE              1
235
235
#define MULTIBOOT_MEMORY_RESERVED               2
 
236
#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
 
237
#define MULTIBOOT_MEMORY_NVS                    4
236
238
  multiboot_uint32_t type;
237
239
} __attribute__((packed));
238
240
typedef struct multiboot_mmap_entry multiboot_memory_map_t;