ia64: Sync up with 2.5.31.

include/asm-ia64/dma.h

@@ -2,8 +2,8 @@
 #define _ASM_IA64_DMA_H
 
 /*
- * Copyright (C) 1998-2001 Hewlett-Packard Co
- * Copyright (C) 1998-2001 David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1998-2002 Hewlett-Packard Co
+ *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
 #include <linux/config.h>
@@ -18,4 +18,6 @@ extern unsigned long MAX_DMA_ADDRESS;
 # define isa_dma_bridge_buggy 	(0)
 #endif
 
+#define free_dma(x)
+
 #endif /* _ASM_IA64_DMA_H */

include/asm-ia64/processor.h

@@ -223,7 +223,7 @@ struct thread_struct {
 	__u64 map_base;			/* base address for get_unmapped_area() */
 	__u64 task_size;		/* limit for task size */
 	struct siginfo *siginfo;	/* current siginfo struct for ptrace() */
-	__u64 last_fph_cpu;		/* CPU that may hold the contents of f32-f127 */
+	int last_fph_cpu;		/* CPU that may hold the contents of f32-f127 */
 
 #ifdef CONFIG_IA32_SUPPORT
 	__u64 eflag;			/* IA32 EFLAGS reg */