- bootmem-clean-up-alloc_bootmem_core-fix-new-alloc_bootmem_core.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     bootmem-clean-up-alloc_bootmem_core: Fix new alloc_bootmem_core
has been removed from the -mm tree.  Its filename was
     bootmem-clean-up-alloc_bootmem_core-fix-new-alloc_bootmem_core.patch

This patch was dropped because it was folded into bootmem-clean-up-alloc_bootmem_core.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: bootmem-clean-up-alloc_bootmem_core: Fix new alloc_bootmem_core
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>

Fix new alloc_bootmem_core() of bootmem-clean-up-alloc_bootmem_core.patch
in 2.6.26-rc5-mm3.

(min < goal) should be checked too.

Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/bootmem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/bootmem.c~bootmem-clean-up-alloc_bootmem_core-fix-new-alloc_bootmem_core mm/bootmem.c
--- a/mm/bootmem.c~bootmem-clean-up-alloc_bootmem_core-fix-new-alloc_bootmem_core
+++ a/mm/bootmem.c
@@ -462,7 +462,7 @@ static void * __init alloc_bootmem_core(
 
 	step = max(align >> PAGE_SHIFT, 1UL);
 
-	if (goal && goal < max)
+	if (goal && min < goal && goal < max)
 		start = ALIGN(goal, step);
 	else
 		start = ALIGN(min, step);
_

Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are

bootmem-clean-up-alloc_bootmem_core.patch
bootmem-clean-up-alloc_bootmem_core-fix-new-alloc_bootmem_core.patch
bootmem-respect-goal-more-likely.patch
bootmem-revisit-alloc_bootmem_section.patch
mm-make-register_page_bootmem_info_section-static.patch
memory-hotplugallocate-usemap-on-the-section-with-pgdat-take-4.patch
memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove.patch
memory-hotplug-dont-calculate-vm_total_pages-twice-when-rebuilding-zonelists-in-online_pages.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux