Re: compile fix 2.6.15-rc1-mm1 + EXPERIMENTAL+ CONFIG_SPARSEMEM +X86_PC

[Tim Schmielau]

On Fri, 18 Nov 2005, Andrew Morton wrote:

> KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> wrote:
> > 
> > This is a compile fix for
> > X86_PC && EXPERIMENTAL && CONFIG_SPARSEMEM=y && !CONFIG_NEED_MULTIPLE_NODES
> > 
> > BTW, on x86, it looks I can select CONFIG_NUMA=y but will not set
> > CONFIG_NEED_MULTIPLE_NODES. It this expected ?
> > 
> 
> This patch is difficult for me to handle, because I don't know which
> patches it fixes - probably it fixes two separate ones and needs to become
> two patches.  Usually it's obvious which patches are being fixed. 
> Sometimes reporters will tell me which patch is being fixed (extra nice!). 
> In this case, it's unobvious.

The first (pfn_to_nid()) part very much looks like it is due to my
dont-include-schedh-from-modh.patch.

> Please always include the text of the error messages when fixing compile
> errors.

Indeed, that would help me to tell.

> > Index: linux-2.6.15-rc1-mm1/include/linux/mmzone.h
> > ===================================================================
> > --- linux-2.6.15-rc1-mm1.orig/include/linux/mmzone.h
> > +++ linux-2.6.15-rc1-mm1/include/linux/mmzone.h
> > @@ -596,12 +596,13 @@ static inline int pfn_valid(unsigned lon
> >   		return 0;
> >   	return valid_section(__nr_to_section(pfn_to_section_nr(pfn)));
> >   }
> > -
> > +#ifdef CONFIG_NEED_MULTIPLE_NODES
> >   #define pfn_to_nid(pfn)							\
> >   ({									\
> >    	unsigned long __pfn = (pfn);                                    \
> >   	page_to_nid(pfn_to_page(pfn));					\
> >   })
> > +#endif
> > 
> >   #define early_pfn_valid(pfn)	pfn_valid(pfn)
> >   void sparse_init(void);
> > Index: linux-2.6.15-rc1-mm1/drivers/base/memory.c
> > ===================================================================
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/