2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>

	* loader/sparc64/ieee1275/linux.c (align_addr): Remove.
	(alloc_phys): Use ALIGN_UP instead of align_addr.

diff --git a/ChangeLog b/ChangeLog
index c9f64df01fcaaef96d87b98dbd4ade64fff99417..01067182ff668e4a64c6ca1c1f0450dbc61c252b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * loader/sparc64/ieee1275/linux.c (align_addr): Remove.
+       (alloc_phys): Use ALIGN_UP instead of align_addr.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * loader/sparc64/ieee1275/linux.c (alloc_phys): Correct bounds checking.

diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 51d82ddcc2128442681901f986ca0aa9f9b6b157..65f334ab391669e69cd2f81383713d33fe79ffb7 100644 (file)
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -173,12 +173,6 @@ grub_linux_unload (void)
 
 #define FOUR_MB        (4 * 1024 * 1024)
 
-static grub_addr_t
-align_addr(grub_addr_t val, grub_addr_t align)
-{
-  return (val + (align - 1)) & ~(align - 1);
-}
-
 static grub_addr_t
 alloc_phys (grub_addr_t size)
 {
@@ -192,27 +186,27 @@ alloc_phys (grub_addr_t size)
     if (type != 1)
       return 0;
 
-    addr = align_addr (addr, FOUR_MB);
+    addr = ALIGN_UP (addr, FOUR_MB);
     if (addr + size >= end)
       return 0;
 
     if (addr >= grub_phys_start && addr < grub_phys_end)
       {
-       addr = align_addr (grub_phys_end, FOUR_MB);
+       addr = ALIGN_UP (grub_phys_end, FOUR_MB);
        if (addr + size >= end)
          return 0;
       }
     if ((addr + size) >= grub_phys_start
        && (addr + size) < grub_phys_end)
       {
-       addr = align_addr (grub_phys_end, FOUR_MB);
+       addr = ALIGN_UP (grub_phys_end, FOUR_MB);
        if (addr + size >= end)
          return 0;
       }
 
     if (loaded)
       {
-       grub_addr_t linux_end = align_addr (linux_paddr + linux_size, FOUR_MB);
+       grub_addr_t linux_end = ALIGN_UP (linux_paddr + linux_size, FOUR_MB);
 
        if (addr >= linux_paddr && addr < linux_end)
          {