linux-next: build failure after merge of the final tree (xen tree related)

Hi all,
After merging the final tree, today's linux-next build (i386
defconfig) failed like this:
In file included from include/linux/hugetlb.h:297,
from arch/x86/mm/init-32.c:18:
arch/x86/include/asm/hugetlb.h: In function 'set-huge-pte-at':
arch/x86/include/asm/hugetlb.h:47: error: implicit declaration of function 'native-make-pmd'
arch/x86/include/asm/hugetlb.h:47: error: incompatible type for argument 2 of 'native-set-pmd'
arch/x86/include/asm/pgtable-2level.h:19: note: expected 'pmd-t' but argument is of type 'int'
Caused by commit e19a181db99f26dfb8c6fe21f6f7e5f0906ecff7 ("xen: Fix to
hugepages to work around new PWT handling").
I reverted that commit for today.
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/