From: Dave Hansen <haveblue@us.ibm.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jesse Barnes <jbarnes@engr.sgi.com>
Subject: Re: [PATCH] don't pass mem_map into init functions
Date: Thu, 05 Aug 2004 11:55:46 -0700 [thread overview]
Message-ID: <1091732146.31490.161.camel@nighthawk> (raw)
In-Reply-To: <20040804214250.2de3dd81.akpm@osdl.org>
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
On Wed, 2004-08-04 at 21:42, Andrew Morton wrote:
> You wanna take a shot at fixing this up please?
>
> arch/sparc64/mm/init.c: In function `paging_init':
> arch/sparc64/mm/init.c:1589: warning: passing arg 4 of `free_area_init_node' makes integer from pointer without a cast
> arch/sparc64/mm/init.c:1589: warning: passing arg 5 of `free_area_init_node' makes pointer from integer without a cast
> arch/sparc64/mm/init.c:1589: error: too many arguments to function `free_area_init_node'
Looks like I missed a couple of architectures. This patch, on top of my
previous one and Jesse's should clean up the rest.
-- Dave
[-- Attachment #2: B2-init-no-mem_map-morearches.patch --]
[-- Type: text/x-patch, Size: 5132 bytes --]
---
memhotplug-dave/arch/arm/mm/init.c | 2 +-
memhotplug-dave/arch/ia64/mm/contig.c | 2 +-
memhotplug-dave/arch/mips/sgi-ip27/ip27-memory.c | 2 +-
memhotplug-dave/arch/parisc/mm/init.c | 2 +-
memhotplug-dave/arch/sparc/mm/srmmu.c | 2 +-
memhotplug-dave/arch/sparc/mm/sun4c.c | 2 +-
memhotplug-dave/arch/sparc64/mm/init.c | 2 +-
memhotplug-dave/arch/x86_64/mm/numa.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff -puN arch/arm/mm/init.c~B2-init-no-mem_map-morearches arch/arm/mm/init.c
--- memhotplug/arch/arm/mm/init.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/arm/mm/init.c Thu Aug 5 09:41:06 2004
@@ -502,7 +502,7 @@ void __init paging_init(struct meminfo *
*/
arch_adjust_zones(node, zone_size, zhole_size);
- free_area_init_node(node, pgdat, NULL, zone_size,
+ free_area_init_node(node, pgdat, zone_size,
bdata->node_boot_start >> PAGE_SHIFT, zhole_size);
}
diff -puN arch/ia64/mm/contig.c~B2-init-no-mem_map-morearches arch/ia64/mm/contig.c
--- memhotplug/arch/ia64/mm/contig.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/ia64/mm/contig.c Thu Aug 5 09:41:06 2004
@@ -267,7 +267,7 @@ paging_init (void)
efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
if (max_gap < LARGE_GAP) {
vmem_map = (struct page *) 0;
- free_area_init_node(0, &contig_page_data, NULL, zones_size, 0,
+ free_area_init_node(0, &contig_page_data, zones_size, 0,
zholes_size);
mem_map = contig_page_data.node_mem_map;
} else {
diff -puN arch/mips/sgi-ip27/ip27-memory.c~B2-init-no-mem_map-morearches arch/mips/sgi-ip27/ip27-memory.c
--- memhotplug/arch/mips/sgi-ip27/ip27-memory.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/mips/sgi-ip27/ip27-memory.c Thu Aug 5 09:41:06 2004
@@ -225,7 +225,7 @@ void __init paging_init(void)
pfn_t end_pfn = node_getmaxclick(node) + 1;
zones_size[ZONE_DMA] = end_pfn - start_pfn;
- free_area_init_node(node, NODE_DATA(node), NULL,
+ free_area_init_node(node, NODE_DATA(node),
zones_size, start_pfn, NULL);
if (end_pfn > max_low_pfn)
diff -puN arch/parisc/mm/init.c~B2-init-no-mem_map-morearches arch/parisc/mm/init.c
--- memhotplug/arch/parisc/mm/init.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/parisc/mm/init.c Thu Aug 5 09:41:06 2004
@@ -761,7 +761,7 @@ void __init paging_init(void)
unsigned long zones_size[MAX_NR_ZONES] = { 0, 0, 0, };
zones_size[ZONE_DMA] = pmem_ranges[i].pages;
- free_area_init_node(i,NODE_DATA(i),NULL,zones_size,
+ free_area_init_node(i,NODE_DATA(i),zones_size,
(pmem_ranges[i].start_pfn << PAGE_SHIFT),0);
}
diff -puN arch/sparc/mm/srmmu.c~B2-init-no-mem_map-morearches arch/sparc/mm/srmmu.c
--- memhotplug/arch/sparc/mm/srmmu.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/sparc/mm/srmmu.c Thu Aug 5 09:41:06 2004
@@ -1341,7 +1341,7 @@ void __init srmmu_paging_init(void)
zones_size[ZONE_HIGHMEM] = npages;
zholes_size[ZONE_HIGHMEM] = npages - calc_highpages();
- free_area_init_node(0, &contig_page_data, NULL, zones_size,
+ free_area_init_node(0, &contig_page_data, zones_size,
pfn_base, zholes_size);
mem_map = contig_page_data.node_mem_map;
}
diff -puN arch/sparc/mm/sun4c.c~B2-init-no-mem_map-morearches arch/sparc/mm/sun4c.c
--- memhotplug/arch/sparc/mm/sun4c.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/sparc/mm/sun4c.c Thu Aug 5 09:41:06 2004
@@ -2114,7 +2114,7 @@ void __init sun4c_paging_init(void)
zones_size[ZONE_HIGHMEM] = npages;
zholes_size[ZONE_HIGHMEM] = npages - calc_highpages();
- free_area_init_node(0, &contig_page_data, NULL, zones_size,
+ free_area_init_node(0, &contig_page_data, zones_size,
pfn_base, zholes_size);
mem_map = contig_page_data.node_mem_map;
}
diff -puN arch/sparc64/mm/init.c~B2-init-no-mem_map-morearches arch/sparc64/mm/init.c
--- memhotplug/arch/sparc64/mm/init.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/sparc64/mm/init.c Thu Aug 5 09:41:06 2004
@@ -1585,7 +1585,7 @@ void __init paging_init(void)
zones_size[ZONE_DMA] = npages;
zholes_size[ZONE_DMA] = npages - pages_avail;
- free_area_init_node(0, &contig_page_data, NULL, zones_size,
+ free_area_init_node(0, &contig_page_data, zones_size,
phys_base >> PAGE_SHIFT, zholes_size);
mem_map = contig_page_data.node_mem_map;
}
diff -puN arch/x86_64/mm/numa.c~B2-init-no-mem_map-morearches arch/x86_64/mm/numa.c
--- memhotplug/arch/x86_64/mm/numa.c~B2-init-no-mem_map-morearches Thu Aug 5 09:41:06 2004
+++ memhotplug-dave/arch/x86_64/mm/numa.c Thu Aug 5 09:41:06 2004
@@ -136,7 +136,7 @@ void __init setup_node_zones(int nodeid)
zones[ZONE_NORMAL] = end_pfn - start_pfn;
}
- free_area_init_node(nodeid, NODE_DATA(nodeid), NULL, zones,
+ free_area_init_node(nodeid, NODE_DATA(nodeid), zones,
start_pfn, NULL);
}
_
next prev parent reply other threads:[~2004-08-05 18:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-04 1:01 [PATCH] don't pass mem_map into init functions Dave Hansen
2004-08-04 18:48 ` Jesse Barnes
2004-08-05 4:42 ` Andrew Morton
2004-08-05 18:55 ` Dave Hansen [this message]
2004-08-05 21:13 ` Andrew Morton
2004-08-05 23:58 ` Dave Hansen
-- strict thread matches above, loose matches on Subject: below --
2004-07-28 20:55 Dave Hansen
2004-07-28 21:58 ` Jesse Barnes
2004-07-28 21:58 ` Jesse Barnes
2004-07-28 22:01 ` Jesse Barnes
2004-07-28 22:01 ` Jesse Barnes
2004-07-28 22:19 ` Dave Hansen
2004-07-28 22:39 ` Jesse Barnes
2004-07-28 23:18 ` Dave Hansen
2004-07-28 23:18 ` Dave Hansen
2004-07-29 1:33 ` Jesse Barnes
2004-07-29 1:33 ` Jesse Barnes
2004-07-29 23:10 ` Dave Hansen
2004-07-29 23:10 ` Dave Hansen
2004-07-30 14:29 ` Martin J. Bligh
2004-07-30 14:29 ` Martin J. Bligh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1091732146.31490.161.camel@nighthawk \
--to=haveblue@us.ibm.com \
--cc=akpm@osdl.org \
--cc=jbarnes@engr.sgi.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.