trivial highpte patch

diff -urN linux-bk/arch/i386/mm/init.c linux/arch/i386/mm/init.c
@@ -634,11 +634,7 @@
 	struct page *pte;
    
    	do {
-#if CONFIG_HIGHPTE
-		pte = alloc_pages(GFP_KERNEL | __GFP_HIGHMEM, 0);
-#else
-		pte = alloc_pages(GFP_KERNEL, 0);
-#endif
+		pte = alloc_pages(GFP_USERPTE, 0);
 		if (pte)
 			clear_highpage(pte);
 		else {

diff -urN linux-bk/arch/ppc/mm/pgtable.c linux/arch/ppc/mm/pgtable.c
@@ -95,13 +95,8 @@
 {
 	struct page *pte;
 	int timeout = 0;
-#ifdef CONFIG_HIGHPTE
-	int flags = GFP_KERNEL | __GFP_HIGHMEM;
-#else
-	int flags = GFP_KERNEL;
-#endif
 
-	while ((pte = alloc_pages(flags, 0)) == NULL) {
+	while ((pte = alloc_pages(GFP_USERPTE, 0)) == NULL) {
 		if (++timeout >= 10)
 			return NULL;
 		set_current_state(TASK_UNINTERRUPTIBLE);

diff -urN linux-bk/include/linux/gfp.h linux/include/linux/gfp.h
@@ -28,6 +28,12 @@
 #define GFP_NFS		(__GFP_HIGH | __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
 #define GFP_KSWAPD	(             __GFP_WAIT | __GFP_IO | __GFP_HIGHIO | __GFP_FS)
 
+#ifdef CONFIG_HIGHPTE
+#define GFP_USERPTE	(GFP_KERNEL | __GFP_HIGHMEM)
+#else
+#define GFP_USERPTE	(GFP_KERNEL)
+#endif
+
 /* Flag - indicates that the buffer will be suitable for DMA.  Ignored on some
    platforms, used as appropriate on others */