← Back to branch summary

~hamo/ubuntu/precise/grub2/grub2.hi_res

« back to all changes in this revision

Viewing changes to grub-core/kern/efi/mm.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-01-11 17:11:44 UTC
  • mfrom: (1.17.12 upstream)
  • mto: (17.3.43 sid)
  • mto: This revision was merged to the branch mainline in revision 100.
  • Revision ID: james.westby@ubuntu.com-20110111171144-c4c3hc0jslqa1bxe
Tags: 1.99~20110111-1
http://bugs.debian.org/588293
https://launchpad.net/bugs/513528
https://launchpad.net/bugs/691878
http://bugs.debian.org/609584
https://launchpad.net/bugs/697493
http://bugs.debian.org/609671
* New Bazaar snapshot.
  - Don't check amount of low memory, as reportedly INT 12h can be broken
    and if low memory is too low we wouldn't have gotten into
    grub_machine_init anyway (closes: #588293, LP: #513528).
  - Submenu default support (LP: #691878).
  - Fix optimisation-dependent grub-mklayout crash (closes: #609584).
* branch_butter.patch: Don't free an uninitialised pointer if /proc is
  unmounted (LP: #697493).
* Add a po/LINGUAS file listing the translations we've synced from the TP
  (closes: #609671).

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/kern/efi/mm.c
52
52
  grub_efi_status_t status;
53
53
  grub_efi_boot_services_t *b;
54
54
 
55
 
#if GRUB_TARGET_SIZEOF_VOID_P < 8
 
55
#if 1
56
56
  /* Limit the memory access to less than 4GB for 32-bit platforms.  */
57
57
  if (address > 0xffffffff)
58
58
    return 0;
59
59
#endif
60
60
 
61
 
#if GRUB_TARGET_SIZEOF_VOID_P < 8 || defined (MCMODEL_SMALL)
 
61
#if 1
62
62
  if (address == 0)
63
63
    {
64
64
      type = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
251
251
       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
252
252
    {
253
253
      if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
254
 
#if GRUB_TARGET_SIZEOF_VOID_P < 8 || defined (MCMODEL_SMALL)
 
254
#if 1
255
255
          && desc->physical_start <= 0xffffffff
256
256
#endif
257
257
          && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000
267
267
              desc->physical_start = 0x100000;
268
268
            }
269
269
 
270
 
#if GRUB_TARGET_SIZEOF_VOID_P < 8 || defined (MCMODEL_SMALL)
 
270
#if 1
271
271
          if (BYTES_TO_PAGES (filtered_desc->physical_start)
272
272
              + filtered_desc->num_pages
273
273
              > BYTES_TO_PAGES (0x100000000LL))