← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to grub-core/loader/i386/multiboot_mbi.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
Import upstream version 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/loader/i386/multiboot_mbi.c
46
46
  int cmdline_size;
47
47
};
48
48
 
49
 
struct module *modules, *modules_last;
 
49
static struct module *modules, *modules_last;
50
50
static grub_size_t cmdline_size;
51
51
static grub_size_t total_modcmd;
52
52
static unsigned modcnt;
435
435
  bufsize = grub_multiboot_get_mbi_size ();
436
436
 
437
437
  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
438
 
                                          0, 0xffffffff - bufsize,
 
438
                                          0x10000, 0x100000 - bufsize,
439
439
                                          bufsize, 4,
440
440
                                          GRUB_RELOCATOR_PREFERENCE_NONE);
441
441
  if (err)