rpms/grub/devel grub-low-memory.patch,1.1,1.2

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2427

Modified Files:
	grub-low-memory.patch 
Log Message:
Fix an error generating the patch.


grub-low-memory.patch:

Index: grub-low-memory.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-low-memory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-low-memory.patch	16 Apr 2009 20:38:11 -0000	1.1
+++ grub-low-memory.patch	16 Apr 2009 21:03:10 -0000	1.2
@@ -6,9 +6,9 @@
 during early boot.
 
 diff -urpN grub-0.97/efi/x86_64/loader/linux.c.lowmem grub-0.97/efi/x86_64/loader/linux.c
---- grub-0.97/efi/x86_64/loader/linux.c.lowmem	2009-04-16 15:31:45.000000000 -0400
-+++ grub-0.97/efi/x86_64/loader/linux.c	2009-04-16 16:14:25.000000000 -0400
-@@ -169,6 +169,7 @@ allocate_pages (grub_size_t real_size, g
+--- grub-0.97/efi/x86_64/loader/linux.c.lowmem	2009-04-16 16:56:32.000000000 -0400
++++ grub-0.97/efi/x86_64/loader/linux.c	2009-04-16 16:57:38.000000000 -0400
+@@ -169,16 +169,24 @@ allocate_pages (grub_size_t real_size, g
  	  && desc->num_pages >= real_mode_pages)
  	{
  	  grub_efi_physical_address_t physical_end;
@@ -16,10 +16,9 @@
  
            physical_end = desc->physical_start + (desc->num_pages << 12);
  
-@@ -176,10 +177,17 @@ allocate_pages (grub_size_t real_size, g
+           grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n",
                          (unsigned) desc->physical_start,
                          (unsigned) physical_end);
- 
 -          addr = physical_end - real_size - mmap_size;
 +          addr = physical_end - allocsize;
            if (addr < 0x10000)
@@ -32,6 +31,6 @@
 +          if (addr > 0x40000000 - allocsize)
 +            addr = 0x40000000 - allocsize;
 +
-           grub_printf ("trying to allocate %u pages at %x\n",
+           grub_dprintf ("linux", "trying to allocate %u pages at %x\n",
                          (unsigned) real_mode_pages, (unsigned) addr);
            real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages);