Re: 2.6.16-rc5-mm3

[Andrew Morton]

Martin Bligh <mbligh@xxxxxxxxxx> wrote:
>
> Martin Bligh wrote:
> > Andrew Morton wrote:
> > 
> >> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc5/2.6.16-rc5-mm3/ 
> >>
> >>
> >> - A relatively small number of changes, although we're up to 9MB of diff
> >>   in the various git trees.
> > 
> > 
> > E_NOT_COMPILING ;-) i386+NUMA at least
> > 
> > NUMA-Q + 
> > http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq
> > =
> > http://test.kernel.org/24793/debug/test.log.0
> > mm/built-in.o(.text+0x178dc): In function `check_huge_range':
> > mm/mempolicy.c:1832: undefined reference to `huge_pte_offset'
> > make: *** [.tmp_vmlinux1] Error 1
> > 03/07/06-12:25:56 Build the kernel. Failed rc = 2
> > 03/07/06-12:25:56 build: kernel build Failed rc = 1
> > 03/07/06-12:25:56 command complete: (2) rc=126
> > 
> > Much the same error on x440 +
> > http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/elm3b67
> > =
> > http://test.kernel.org/24791/debug/test.log.0
> 
> Oh, BTW ... I see that's also broken in -git9, but not -git8.
> 
> Presumably something didn't go via -mm for testing?
> 

No, it's just that we suck.  The numa-maps update got squeezed in at the
last minute.

I guess we do it this way - there's still code in there which will call
check_huge_range(), but it's inside if (0) {}.



--- devel/mm/mempolicy.c~numa_maps-update-fix	2006-03-07 12:48:38.000000000 -0800
+++ devel-akpm/mm/mempolicy.c	2006-03-07 12:49:22.000000000 -0800
@@ -1789,6 +1789,7 @@ static void gather_stats(struct page *pa
 	cond_resched();
 }
 
+#ifdef CONFIG_HUGETLB_PAGE
 static void check_huge_range(struct vm_area_struct *vma,
 		unsigned long start, unsigned long end,
 		struct numa_maps *md)
@@ -1814,6 +1815,7 @@ static void check_huge_range(struct vm_a
 		gather_stats(page, md, pte_dirty(*ptep));
 	}
 }
+#endif
 
 int show_numa_map(struct seq_file *m, void *v)
 {
_

-
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/