← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/linuxefi_debug.patch/grub-core/loader/i386/efi/linux.c

  • Committer: Package Import Robot
  • Author(s): Ian Campbell, Colin Watson, Ian Campbell
  • Date: 2014-11-30 17:15:21 UTC
  • Revision ID: package-import@ubuntu.com-20141130171521-jtqle9j0ckcww9wy
Tags: 2.02~beta2-17
https://launchpad.net/bugs/1390766
http://bugs.debian.org/770412
http://bugs.debian.org/755256
[ Colin Watson ]
* Fix up some pointer-to-integer casts in linuxefi so that it can build on
  i386-efi.
* Backport from upstream:
  - Fix typo (gettext_print instead of gettext_printf) (LP: #1390766).

[ Ian Campbell ]
* Correct syntax error in grub-xen-host bootstrap configuration file.
* Log failure when grub-install fails in postinst, rather than failing the
  entire postinst. (Closes: #770412)
* Arrange to insmod xzio and lzopio when booting a kernel as a Xen guest.
  (Closes: #755256)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/linuxefi_debug.patch/grub-core/loader/i386/efi/linux.c
94
94
  grub_dl_unref (my_mod);
95
95
  loaded = 0;
96
96
  if (initrd_mem)
97
 
    grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(params->ramdisk_size));
 
97
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)initrd_mem, BYTES_TO_PAGES(params->ramdisk_size));
98
98
  if (linux_cmdline)
99
 
    grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(params->cmdline_size + 1));
 
99
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)linux_cmdline, BYTES_TO_PAGES(params->cmdline_size + 1));
100
100
  if (kernel_mem)
101
 
    grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
 
101
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
102
102
  if (params)
103
 
    grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384));
 
103
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)params, BYTES_TO_PAGES(16384));
104
104
  return GRUB_ERR_NONE;
105
105
}
106
106
 
148
148
    }
149
149
 
150
150
  params->ramdisk_size = size;
151
 
  params->ramdisk_image = (grub_uint32_t)(grub_uint64_t) initrd_mem;
 
151
  params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
152
152
 
153
153
  ptr = initrd_mem;
154
154
 
175
175
  grub_free (files);
176
176
 
177
177
  if (initrd_mem && grub_errno)
178
 
    grub_efi_free_pages((grub_efi_physical_address_t)initrd_mem, BYTES_TO_PAGES(size));
 
178
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)initrd_mem, BYTES_TO_PAGES(size));
179
179
 
180
180
  return grub_errno;
181
181
}
284
284
                              linux_cmdline + sizeof (LINUX_IMAGE) - 1,
285
285
                              lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
286
286
 
287
 
  lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline;
 
287
  lh.cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
288
288
 
289
289
  handover_offset = lh.handover_offset;
290
290
 
321
321
    {
322
322
      grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
323
323
      loaded = 1;
324
 
      lh.code32_start = (grub_uint32_t)(grub_uint64_t) kernel_mem;
 
324
      lh.code32_start = (grub_uint32_t)(grub_addr_t) kernel_mem;
325
325
    }
326
326
 
327
327
  memcpy(params, &lh, 2 * 512);
340
340
    }
341
341
 
342
342
  if (linux_cmdline && !loaded)
343
 
    grub_efi_free_pages((grub_efi_physical_address_t)linux_cmdline, BYTES_TO_PAGES(lh.cmdline_size + 1));
 
343
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)linux_cmdline, BYTES_TO_PAGES(lh.cmdline_size + 1));
344
344
 
345
345
  if (kernel_mem && !loaded)
346
 
    grub_efi_free_pages((grub_efi_physical_address_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
 
346
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)kernel_mem, BYTES_TO_PAGES(kernel_size));
347
347
 
348
348
  if (params && !loaded)
349
 
    grub_efi_free_pages((grub_efi_physical_address_t)params, BYTES_TO_PAGES(16384));
 
349
    grub_efi_free_pages((grub_efi_physical_address_t)(grub_addr_t)params, BYTES_TO_PAGES(16384));
350
350
 
351
351
  return grub_errno;
352
352
}