[PATCH] ia64 4-level pgtable fix

Fix a 4-level page table bug that slipped through (introduced by me,
not Andi).

Compiles and boots on ia64 and 2-level i386.
Signed-off-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

include/asm-ia64/pgtable.h

@@ -104,7 +104,7 @@
 #define PMD_SHIFT	(PAGE_SHIFT + (PAGE_SHIFT-3))
 #define PMD_SIZE	(1UL << PMD_SHIFT)
 #define PMD_MASK	(~(PMD_SIZE-1))
-#define PTRS_PER_PMD	(__IA64_UL(1) << (PAGE_SHIFT-3))
+#define PTRS_PER_PMD	(1UL << (PAGE_SHIFT-3))
 
 /*
  * Definitions for third level:

mm/memory.c

@@ -1941,7 +1941,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct * vma,
 }
 
 #ifndef __ARCH_HAS_4LEVEL_HACK
-#if (PTRS_PER_PGD > 1)
+#if (PTRS_PER_PUD > 1)
 /*
  * Allocate page upper directory.
  *
@@ -1975,7 +1975,7 @@ pud_t fastcall *__pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long addr
 }
 #endif
 
-#if (PTRS_PER_PUD > 1)
+#if (PTRS_PER_PMD > 1)
 /*
  * Allocate page middle directory.
  *