diff -aurpN -X /home/fletch/.diff.exclude 680-ivtv/arch/ia64/lib/dec_and_lock.c 690-map_hugetlb/arch/ia64/lib/dec_and_lock.c
--- 680-ivtv/arch/ia64/lib/dec_and_lock.c	Wed Feb 11 10:17:28 2004
+++ 690-map_hugetlb/arch/ia64/lib/dec_and_lock.c	Wed Feb 11 10:17:33 2004
@@ -18,6 +18,7 @@
  * operations have to be done atomically, so that the count doesn't drop to zero without
  * acquiring the spinlock first.
  */
+#ifndef ATOMIC_DEC_AND_LOCK
 int
 atomic_dec_and_lock (atomic_t *refcount, spinlock_t *lock)
 {
@@ -38,5 +39,6 @@ atomic_dec_and_lock (atomic_t *refcount,
 	} while (cmpxchg(&refcount->counter, old, new) != old);
 	return 0;
 }
+#endif
 
 EXPORT_SYMBOL(atomic_dec_and_lock);
diff -aurpN -X /home/fletch/.diff.exclude 680-ivtv/include/asm-ia64/mman.h 690-map_hugetlb/include/asm-ia64/mman.h
--- 680-ivtv/include/asm-ia64/mman.h	Wed Feb  4 23:03:34 2004
+++ 690-map_hugetlb/include/asm-ia64/mman.h	Wed Feb 11 10:17:33 2004
@@ -18,6 +18,11 @@
 
 #define MAP_SHARED	0x01		/* Share changes */
 #define MAP_PRIVATE	0x02		/* Changes are private */
+#ifdef CONFIG_HUGETLB_PAGE
+#define MAP_HUGETLB	0x04
+#else
+#define MAP_HUGETLB	0x00
+#endif
 #define MAP_TYPE	0x0f		/* Mask for type of mapping */
 #define MAP_FIXED	0x10		/* Interpret addr exactly */
 #define MAP_ANONYMOUS	0x20		/* don't use a file */
diff -aurpN -X /home/fletch/.diff.exclude 680-ivtv/include/asm-x86_64/mman.h 690-map_hugetlb/include/asm-x86_64/mman.h
--- 680-ivtv/include/asm-x86_64/mman.h	Mon Nov 17 18:28:59 2003
+++ 690-map_hugetlb/include/asm-x86_64/mman.h	Wed Feb 11 10:17:33 2004
@@ -11,6 +11,11 @@
 
 #define MAP_SHARED	0x01		/* Share changes */
 #define MAP_PRIVATE	0x02		/* Changes are private */
+#ifdef CONFIG_HUGETLB_PAGE
+#define MAP_HUGETLB	0x04
+#else
+#define MAP_HUGETLB	0x00
+#endif
 #define MAP_TYPE	0x0f		/* Mask for type of mapping */
 #define MAP_FIXED	0x10		/* Interpret addr exactly */
 #define MAP_ANONYMOUS	0x20		/* don't use a file */