x86: fix warning about nodeid
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 x86: fix warning about nodeid
Impact: cleanup
Ingo found there warning about nodeid with some configs.
try to use for_each_online_node for non numa too. in that case nodeid will be 0. also move out boundary checking from setup_node_bootmem(), so non-numa config will not check it.
--- arch/x86/mm/init_32.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
arch/x86/mm/init_32.c +14 -9
@@ -806,11 +806,6 @@ static unsigned long __init setup_node_b {unsigned long bootmap_size; -if (start_pfn > max_low_pfn) -return bootmap; -if (end_pfn > max_low_pfn) - end_pfn = max_low_pfn; -/* don't touch min_low_pfn */ bootmap_size = init_bootmem_node(NODE_DATA(nodeid), bootmap >> PAGE_SHIFT,
@@ -843,13 +838,23 @@ void __init setup_bootmem_allocator(void max_pfn_mapped<<PAGE_SHIFT);printk (KERN_INFO " low ram: 0 - %08lx\n" , max_low_pfn<<PAGE_SHIFT ); +for_each_online_node (nodeid) { +unsigned long start_pfn, end_pfn; +#ifdef CONFIG_NEED_MULTIPLE_NODES -for_each_online_node (nodeid) - bootmap =setup_node_bootmem (nodeid, node_start_pfn[nodeid], - node_end_pfn[nodeid], bootmap); + start_pfn = node_start_pfn[nodeid]; + end_pfn = node_end_pfn[nodeid]; +if (start_pfn > max_low_pfn) +continue ; +if (end_pfn > max_low_pfn) + end_pfn = max_low_pfn;#else - bootmap =setup_node_bootmem (0 ,0 , max_low_pfn, bootmap); + start_pfn =0 ; + end_pfn = max_low_pfn;#endif + bootmap =setup_node_bootmem (nodeid, start_pfn, end_pfn, + bootmap); + } after_bootmem =1 ; }
Commit-ID: 5ed346892ca84c1fa36182b17ad117f72f6b5328 Gitweb: http://git.kernel.org/tip/5ed346892ca84c1fa36182b17ad117f72f6b5328 Author: "Yinghai Lu" <[email protected]> AuthorDate: Thu, 5 Mar 2009 12:04:57 -0800 Commit: Ingo Molnar <[email protected]> CommitDate: Fri, 6 Mar 2009 16:25:45 +0100
x86: fix warning about nodeid
Impact: cleanup
Ingo found there warning about nodeid with some configs.
try to use for_each_online_node for non numa too. in that case nodeid will be 0.
also move out boundary checking from setup_node_bootmem(), so non-numa config will not check it.
LKML-Reference: <[email protected]>
--- arch/x86/mm/init_32.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-)
arch/x86/mm/init_32.c +14 -9
@@ -754,11 +754,6 @@ static unsigned long __init setup_node_bootmem(int nodeid, {unsigned long bootmap_size; -if (start_pfn > max_low_pfn) -return bootmap; -if (end_pfn > max_low_pfn) - end_pfn = max_low_pfn; -/* don't touch min_low_pfn */ bootmap_size = init_bootmem_node(NODE_DATA(nodeid), bootmap >> PAGE_SHIFT,
@@ -791,13 +786,23 @@ void __init setup_bootmem_allocator(void) max_pfn_mapped<<PAGE_SHIFT);printk (KERN_INFO " low ram: 0 - %08lx\n" , max_low_pfn<<PAGE_SHIFT ); +for_each_online_node (nodeid) { +unsigned long start_pfn, end_pfn; +#ifdef CONFIG_NEED_MULTIPLE_NODES -for_each_online_node (nodeid) - bootmap =setup_node_bootmem (nodeid, node_start_pfn[nodeid], - node_end_pfn[nodeid], bootmap); + start_pfn = node_start_pfn[nodeid]; + end_pfn = node_end_pfn[nodeid]; +if (start_pfn > max_low_pfn) +continue ; +if (end_pfn > max_low_pfn) + end_pfn = max_low_pfn;#else - bootmap =setup_node_bootmem (0 ,0 , max_low_pfn, bootmap); + start_pfn =0 ; + end_pfn = max_low_pfn;#endif + bootmap =setup_node_bootmem (nodeid, start_pfn, end_pfn, + bootmap); + } after_bootmem =1 ; }
Commit-ID: e954ef20c29b7af07a8cb5452f14fb69e3d9d2b2 Gitweb: http://git.kernel.org/tip/e954ef20c29b7af07a8cb5452f14fb69e3d9d2b2 Author: "Yinghai Lu" <[email protected]> AuthorDate: Thu, 5 Mar 2009 12:04:57 -0800 Commit: Ingo Molnar <[email protected]> CommitDate: Sun, 8 Mar 2009 19:34:17 +0100
x86: fix warning about nodeid
Impact: cleanup
Ingo found there warning about nodeid with some configs.
try to use for_each_online_node for non numa too. in that case nodeid will be 0.
also move out boundary checking from setup_node_bootmem(), so non-numa config will not check it.
LKML-Reference: <[email protected]>
--- arch/x86/mm/init_32.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-)
arch/x86/mm/init_32.c +14 -9
@@ -806,11 +806,6 @@ static unsigned long __init setup_node_bootmem(int nodeid, {unsigned long bootmap_size; -if (start_pfn > max_low_pfn) -return bootmap; -if (end_pfn > max_low_pfn) - end_pfn = max_low_pfn; -/* don't touch min_low_pfn */ bootmap_size = init_bootmem_node(NODE_DATA(nodeid), bootmap >> PAGE_SHIFT,
@@ -843,13 +838,23 @@ void __init setup_bootmem_allocator(void) max_pfn_mapped<<PAGE_SHIFT);printk (KERN_INFO " low ram: 0 - %08lx\n" , max_low_pfn<<PAGE_SHIFT ); +for_each_online_node (nodeid) { +unsigned long start_pfn, end_pfn; +#ifdef CONFIG_NEED_MULTIPLE_NODES -for_each_online_node (nodeid) - bootmap =setup_node_bootmem (nodeid, node_start_pfn[nodeid], - node_end_pfn[nodeid], bootmap); + start_pfn = node_start_pfn[nodeid]; + end_pfn = node_end_pfn[nodeid]; +if (start_pfn > max_low_pfn) +continue ; +if (end_pfn > max_low_pfn) + end_pfn = max_low_pfn;#else - bootmap =setup_node_bootmem (0 ,0 , max_low_pfn, bootmap); + start_pfn =0 ; + end_pfn = max_low_pfn;#endif + bootmap =setup_node_bootmem (nodeid, start_pfn, end_pfn, + bootmap); + } after_bootmem =1 ; }