On Wed, 2005-09-07 at 02:37 -0700, Andrew Morton wrote: > Dave Hansen <[EMAIL PROTECTED]> wrote: > > > > --- memhotplug/include/asm-x86_64/mmzone.h~C0-kill-local_mapnr > > 2005-08-18 14:59:43.000000000 -0700 > > +++ memhotplug-dave/include/asm-x86_64/mmzone.h 2005-08-18 > > 14:59:43.000000000 -0700 > > @@ -38,8 +38,6 @@ static inline __attribute__((pure)) int > > > > #ifdef CONFIG_DISCONTIGMEM > > > > -#define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) > > -#define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) > > > > /* AK: this currently doesn't deal with invalid addresses. We'll see > > if the 2.5 kernel doesn't pass them > > _ > > What's this bit doing here? It breaks the x86_64 build all over the place. > > I'll drop that chunk and see how we go...
That could have easily been some merge borkage on my part. I don't think that hunk is valid, so dropping it is the right move. -- Dave - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
