| Message ID | 4C581C99.8090201@austin.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, 03 Aug 2010 08:41:45 -0500 Nathan Fontenot <nfont@austin.ibm.com> wrote: > Update the find_memory_block declaration to to take a struct mem_section * > so that it matches the definition. > > Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Hmm...my mmotm-0727 has this definition in memory.h... extern struct memory_block *find_memory_block(struct mem_section *); What patch makes it unsigned long ?
On 08/04/2010 11:59 PM, KAMEZAWA Hiroyuki wrote: > On Tue, 03 Aug 2010 08:41:45 -0500 > Nathan Fontenot <nfont@austin.ibm.com> wrote: > >> Update the find_memory_block declaration to to take a struct mem_section * >> so that it matches the definition. >> >> Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com> > > Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > > Hmm...my mmotm-0727 has this definition in memory.h... > > extern struct memory_block *find_memory_block(struct mem_section *); > > What patch makes it unsigned long ? > I was basing the patches on the latest mainline tree. Looks like can drop this patch in the next version of the patchset. -Nathan
Index: linux-2.6/include/linux/memory.h =================================================================== --- linux-2.6.orig/include/linux/memory.h 2010-08-02 13:58:41.000000000 -0500 +++ linux-2.6/include/linux/memory.h 2010-08-02 14:01:15.000000000 -0500 @@ -116,7 +116,7 @@ extern int memory_dev_init(void); extern int remove_memory_block(unsigned long, struct mem_section *, int); extern int memory_notify(unsigned long val, void *v); extern int memory_isolate_notify(unsigned long val, void *v); -extern struct memory_block *find_memory_block(unsigned long); +extern struct memory_block *find_memory_block(struct mem_section *); extern int memory_is_hidden(struct mem_section *); #define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<<PAGE_SHIFT) enum mem_add_context { BOOT, HOTPLUG };
Update the find_memory_block declaration to to take a struct mem_section * so that it matches the definition. Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com> --- include/linux/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)