~ubuntu-branches/debian/stretch/grub2/stretch

« back to all changes in this revision

Viewing changes to loader/multiboot.c

Tags: upstream-1.98+20100705
ImportĀ upstreamĀ versionĀ 1.98+20100705

Show diffs side-by-side

added added

removed removed

Lines of Context:
136
136
      grub_multiboot_alloc_mbi = mbi_size;
137
137
    }
138
138
 
 
139
#ifdef GRUB_USE_MULTIBOOT2
 
140
  state.MULTIBOOT_MBI_REGISTER = ALIGN_UP (grub_multiboot_payload_dest
 
141
                                           + grub_multiboot_pure_size,
 
142
                                           MULTIBOOT_TAG_ALIGN);
 
143
#else
139
144
  state.MULTIBOOT_MBI_REGISTER = grub_multiboot_payload_dest
140
145
    + grub_multiboot_pure_size;
 
146
#endif
141
147
  err = grub_multiboot_make_mbi (grub_multiboot_payload_orig,
142
148
                                 grub_multiboot_payload_dest,
143
149
                                 grub_multiboot_pure_size, mbi_size);