Subject: [merged] x86-mm-memblock-switch-to-use-numa_no_node.patch removed from -mm tree
To: grygorii.strashko@xxxxxx,hpa@xxxxxxxxx,mingo@xxxxxxxxxx,rientjes@xxxxxxxxxx,santosh.shilimkar@xxxxxx,sfr@xxxxxxxxxxxxxxxx,tglx@xxxxxxxxxxxxx,tj@xxxxxxxxxx,yinghai@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 22 Jan 2014 12:14:30 -0800
The patch titled
Subject: x86/mm: memblock: switch to use NUMA_NO_NODE
has been removed from the -mm tree. Its filename was
x86-mm-memblock-switch-to-use-numa_no_node.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Grygorii Strashko <grygorii.strashko@xxxxxx>
Subject: x86/mm: memblock: switch to use NUMA_NO_NODE
Update X86 code to use NUMA_NO_NODE instead of MAX_NUMNODES while calling
memblock APIs, because memblock API will be changed to use NUMA_NO_NODE
and will produce warning during boot otherwise.
See:
https://lkml.org/lkml/2013/12/9/898
Signed-off-by: Grygorii Strashko <grygorii.strashko@xxxxxx>
Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Acked-by: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/check.c | 2 +-
arch/x86/kernel/e820.c | 2 +-
arch/x86/mm/memtest.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/x86/kernel/check.c~x86-mm-memblock-switch-to-use-numa_no_node arch/x86/kernel/check.c
--- a/arch/x86/kernel/check.c~x86-mm-memblock-switch-to-use-numa_no_node
+++ a/arch/x86/kernel/check.c
@@ -91,7 +91,7 @@ void __init setup_bios_corruption_check(
corruption_check_size = round_up(corruption_check_size, PAGE_SIZE);
- for_each_free_mem_range(i, MAX_NUMNODES, &start, &end, NULL) {
+ for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL) {
start = clamp_t(phys_addr_t, round_up(start, PAGE_SIZE),
PAGE_SIZE, corruption_check_size);
end = clamp_t(phys_addr_t, round_down(end, PAGE_SIZE),
diff -puN arch/x86/kernel/e820.c~x86-mm-memblock-switch-to-use-numa_no_node arch/x86/kernel/e820.c
--- a/arch/x86/kernel/e820.c~x86-mm-memblock-switch-to-use-numa_no_node
+++ a/arch/x86/kernel/e820.c
@@ -1120,7 +1120,7 @@ void __init memblock_find_dma_reserve(vo
nr_pages += end_pfn - start_pfn;
}
- for_each_free_mem_range(u, MAX_NUMNODES, &start, &end, NULL) {
+ for_each_free_mem_range(u, NUMA_NO_NODE, &start, &end, NULL) {
start_pfn = min_t(unsigned long, PFN_UP(start), MAX_DMA_PFN);
end_pfn = min_t(unsigned long, PFN_DOWN(end), MAX_DMA_PFN);
if (start_pfn < end_pfn)
diff -puN arch/x86/mm/memtest.c~x86-mm-memblock-switch-to-use-numa_no_node arch/x86/mm/memtest.c
--- a/arch/x86/mm/memtest.c~x86-mm-memblock-switch-to-use-numa_no_node
+++ a/arch/x86/mm/memtest.c
@@ -74,7 +74,7 @@ static void __init do_one_pass(u64 patte
u64 i;
phys_addr_t this_start, this_end;
- for_each_free_mem_range(i, MAX_NUMNODES, &this_start, &this_end, NULL) {
+ for_each_free_mem_range(i, NUMA_NO_NODE, &this_start, &this_end, NULL) {
this_start = clamp_t(phys_addr_t, this_start, start, end);
this_end = clamp_t(phys_addr_t, this_end, start, end);
if (this_start < this_end) {
_
Patches currently in -mm which might be from grygorii.strashko@xxxxxx are
origin.patch
mm-nobootmem-free_all_bootmem-again.patch
rtc-rtc-twl-use-devm_-functions.patch
rtc-rtc-vr41xx-use-devm_-functions.patch
linux-next.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
