14 files changed, 110 insertions, 92 deletions

diff --git a/include/asm-ia64/cpu.h b/include/asm-ia64/cpu.h
index e87fa3210a2b..fcca30b9f110 100644
--- a/include/asm-ia64/cpu.h
+++ b/include/asm-ia64/cpu.h
@@ -14,8 +14,8 @@ DECLARE_PER_CPU(struct ia64_cpu, cpu_devices);
 
 DECLARE_PER_CPU(int, cpu_state);
 
-extern int arch_register_cpu(int num);
 #ifdef CONFIG_HOTPLUG_CPU
+extern int arch_register_cpu(int num);
 extern void arch_unregister_cpu(int);
 #endif
 
diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h
index f1735a22d0ea..9f0df9bd46b7 100644
--- a/include/asm-ia64/dma-mapping.h
+++ b/include/asm-ia64/dma-mapping.h
@@ -23,10 +23,30 @@ dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,
 {
         dma_free_coherent(dev, size, cpu_addr, dma_handle);
 }
-#define dma_map_single          platform_dma_map_single
-#define dma_map_sg              platform_dma_map_sg
-#define dma_unmap_single        platform_dma_unmap_single
-#define dma_unmap_sg            platform_dma_unmap_sg
+#define dma_map_single_attrs    platform_dma_map_single_attrs
+static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr,
+                                        size_t size, int dir)
+{
+        return dma_map_single_attrs(dev, cpu_addr, size, dir, NULL);
+}
+#define dma_map_sg_attrs        platform_dma_map_sg_attrs
+static inline int dma_map_sg(struct device *dev, struct scatterlist *sgl,
+                             int nents, int dir)
+{
+        return dma_map_sg_attrs(dev, sgl, nents, dir, NULL);
+}
+#define dma_unmap_single_attrs  platform_dma_unmap_single_attrs
+static inline void dma_unmap_single(struct device *dev, dma_addr_t cpu_addr,
+                                    size_t size, int dir)
+{
+        return dma_unmap_single_attrs(dev, cpu_addr, size, dir, NULL);
+}
+#define dma_unmap_sg_attrs      platform_dma_unmap_sg_attrs
+static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
+                                int nents, int dir)
+{
+        return dma_unmap_sg_attrs(dev, sgl, nents, dir, NULL);
+}
 #define dma_sync_single_for_cpu platform_dma_sync_single_for_cpu
 #define dma_sync_sg_for_cpu     platform_dma_sync_sg_for_cpu
 #define dma_sync_single_for_device platform_dma_sync_single_for_device
diff --git a/include/asm-ia64/dmi.h b/include/asm-ia64/dmi.h
index f3efaa229525..00eb1b130b63 100644
--- a/include/asm-ia64/dmi.h
+++ b/include/asm-ia64/dmi.h
@@ -3,4 +3,9 @@
 
 #include <asm/io.h>
 
+/* Use normal IO mappings for DMI */
+#define dmi_ioremap ioremap
+#define dmi_iounmap(x,l) iounmap(x)
+#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
+
 #endif
diff --git a/include/asm-ia64/futex.h b/include/asm-ia64/futex.h
index 8a98a2654139..c7f0f062239c 100644
--- a/include/asm-ia64/futex.h
+++ b/include/asm-ia64/futex.h
@@ -2,9 +2,9 @@
 #define _ASM_FUTEX_H
 
 #include <linux/futex.h>
+#include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
 
 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
 do {                                                                    \
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h
index 4ebed77aa472..260a85ac9d6a 100644
--- a/include/asm-ia64/io.h
+++ b/include/asm-ia64/io.h
@@ -423,11 +423,6 @@ extern void __iomem * ioremap(unsigned long offset, unsigned long size);
 extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
 extern void iounmap (volatile void __iomem *addr);
 
-/* Use normal IO mappings for DMI */
-#define dmi_ioremap ioremap
-#define dmi_iounmap(x,l) iounmap(x)
-#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
-
 /*
  * String version of IO memory access ops:
  */
diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h
index c201a2020aa4..9f020eb825c5 100644
--- a/include/asm-ia64/machvec.h
+++ b/include/asm-ia64/machvec.h
@@ -22,6 +22,7 @@ struct pci_bus;
 struct task_struct;
 struct pci_dev;
 struct msi_desc;
+struct dma_attrs;
 
 typedef void ia64_mv_setup_t (char **);
 typedef void ia64_mv_cpu_init_t (void);
@@ -56,6 +57,11 @@ typedef void ia64_mv_dma_sync_sg_for_device (struct device *, struct scatterlist
 typedef int ia64_mv_dma_mapping_error (dma_addr_t dma_addr);
 typedef int ia64_mv_dma_supported (struct device *, u64);
 
+typedef dma_addr_t ia64_mv_dma_map_single_attrs (struct device *, void *, size_t, int, struct dma_attrs *);
+typedef void ia64_mv_dma_unmap_single_attrs (struct device *, dma_addr_t, size_t, int, struct dma_attrs *);
+typedef int ia64_mv_dma_map_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *);
+typedef void ia64_mv_dma_unmap_sg_attrs (struct device *, struct scatterlist *, int, int, struct dma_attrs *);
+
 /*
  * WARNING: The legacy I/O space is _architected_.  Platforms are
  * expected to follow this architected model (see Section 10.7 in the
@@ -136,10 +142,10 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);
 #  define platform_dma_init             ia64_mv.dma_init
 #  define platform_dma_alloc_coherent   ia64_mv.dma_alloc_coherent
 #  define platform_dma_free_coherent    ia64_mv.dma_free_coherent
-#  define platform_dma_map_single       ia64_mv.dma_map_single
-#  define platform_dma_unmap_single     ia64_mv.dma_unmap_single
-#  define platform_dma_map_sg           ia64_mv.dma_map_sg
-#  define platform_dma_unmap_sg         ia64_mv.dma_unmap_sg
+#  define platform_dma_map_single_attrs ia64_mv.dma_map_single_attrs
+#  define platform_dma_unmap_single_attrs       ia64_mv.dma_unmap_single_attrs
+#  define platform_dma_map_sg_attrs     ia64_mv.dma_map_sg_attrs
+#  define platform_dma_unmap_sg_attrs   ia64_mv.dma_unmap_sg_attrs
 #  define platform_dma_sync_single_for_cpu ia64_mv.dma_sync_single_for_cpu
 #  define platform_dma_sync_sg_for_cpu  ia64_mv.dma_sync_sg_for_cpu
 #  define platform_dma_sync_single_for_device ia64_mv.dma_sync_single_for_device
@@ -190,10 +196,10 @@ struct ia64_machine_vector {
         ia64_mv_dma_init *dma_init;
         ia64_mv_dma_alloc_coherent *dma_alloc_coherent;
         ia64_mv_dma_free_coherent *dma_free_coherent;
-        ia64_mv_dma_map_single *dma_map_single;
-        ia64_mv_dma_unmap_single *dma_unmap_single;
-        ia64_mv_dma_map_sg *dma_map_sg;
-        ia64_mv_dma_unmap_sg *dma_unmap_sg;
+        ia64_mv_dma_map_single_attrs *dma_map_single_attrs;
+        ia64_mv_dma_unmap_single_attrs *dma_unmap_single_attrs;
+        ia64_mv_dma_map_sg_attrs *dma_map_sg_attrs;
+        ia64_mv_dma_unmap_sg_attrs *dma_unmap_sg_attrs;
         ia64_mv_dma_sync_single_for_cpu *dma_sync_single_for_cpu;
         ia64_mv_dma_sync_sg_for_cpu *dma_sync_sg_for_cpu;
         ia64_mv_dma_sync_single_for_device *dma_sync_single_for_device;
@@ -240,10 +246,10 @@ struct ia64_machine_vector {
         platform_dma_init,                      \
         platform_dma_alloc_coherent,            \
         platform_dma_free_coherent,             \
-        platform_dma_map_single,                \
-        platform_dma_unmap_single,              \
-        platform_dma_map_sg,                    \
-        platform_dma_unmap_sg,                  \
+        platform_dma_map_single_attrs,          \
+        platform_dma_unmap_single_attrs,        \
+        platform_dma_map_sg_attrs,              \
+        platform_dma_unmap_sg_attrs,            \
         platform_dma_sync_single_for_cpu,       \
         platform_dma_sync_sg_for_cpu,           \
         platform_dma_sync_single_for_device,    \
@@ -292,9 +298,13 @@ extern ia64_mv_dma_init			swiotlb_init;
 extern ia64_mv_dma_alloc_coherent       swiotlb_alloc_coherent;
 extern ia64_mv_dma_free_coherent        swiotlb_free_coherent;
 extern ia64_mv_dma_map_single           swiotlb_map_single;
+extern ia64_mv_dma_map_single_attrs     swiotlb_map_single_attrs;
 extern ia64_mv_dma_unmap_single         swiotlb_unmap_single;
+extern ia64_mv_dma_unmap_single_attrs   swiotlb_unmap_single_attrs;
 extern ia64_mv_dma_map_sg               swiotlb_map_sg;
+extern ia64_mv_dma_map_sg_attrs         swiotlb_map_sg_attrs;
 extern ia64_mv_dma_unmap_sg             swiotlb_unmap_sg;
+extern ia64_mv_dma_unmap_sg_attrs       swiotlb_unmap_sg_attrs;
 extern ia64_mv_dma_sync_single_for_cpu  swiotlb_sync_single_for_cpu;
 extern ia64_mv_dma_sync_sg_for_cpu      swiotlb_sync_sg_for_cpu;
 extern ia64_mv_dma_sync_single_for_device swiotlb_sync_single_for_device;
@@ -340,17 +350,17 @@ extern ia64_mv_dma_supported		swiotlb_dma_supported;
 #ifndef platform_dma_free_coherent
 # define platform_dma_free_coherent     swiotlb_free_coherent
 #endif
-#ifndef platform_dma_map_single
-# define platform_dma_map_single        swiotlb_map_single
+#ifndef platform_dma_map_single_attrs
+# define platform_dma_map_single_attrs  swiotlb_map_single_attrs
 #endif
-#ifndef platform_dma_unmap_single
-# define platform_dma_unmap_single      swiotlb_unmap_single
+#ifndef platform_dma_unmap_single_attrs
+# define platform_dma_unmap_single_attrs        swiotlb_unmap_single_attrs
 #endif
-#ifndef platform_dma_map_sg
-# define platform_dma_map_sg            swiotlb_map_sg
+#ifndef platform_dma_map_sg_attrs
+# define platform_dma_map_sg_attrs      swiotlb_map_sg_attrs
 #endif
-#ifndef platform_dma_unmap_sg
-# define platform_dma_unmap_sg          swiotlb_unmap_sg
+#ifndef platform_dma_unmap_sg_attrs
+# define platform_dma_unmap_sg_attrs    swiotlb_unmap_sg_attrs
 #endif
 #ifndef platform_dma_sync_single_for_cpu
 # define platform_dma_sync_single_for_cpu       swiotlb_sync_single_for_cpu
diff --git a/include/asm-ia64/machvec_hpzx1.h b/include/asm-ia64/machvec_hpzx1.h
index e90daf9ce340..2f57f5144b9f 100644
--- a/include/asm-ia64/machvec_hpzx1.h
+++ b/include/asm-ia64/machvec_hpzx1.h
@@ -4,10 +4,10 @@
 extern ia64_mv_setup_t                  dig_setup;
 extern ia64_mv_dma_alloc_coherent       sba_alloc_coherent;
 extern ia64_mv_dma_free_coherent        sba_free_coherent;
-extern ia64_mv_dma_map_single           sba_map_single;
-extern ia64_mv_dma_unmap_single         sba_unmap_single;
-extern ia64_mv_dma_map_sg               sba_map_sg;
-extern ia64_mv_dma_unmap_sg             sba_unmap_sg;
+extern ia64_mv_dma_map_single_attrs     sba_map_single_attrs;
+extern ia64_mv_dma_unmap_single_attrs   sba_unmap_single_attrs;
+extern ia64_mv_dma_map_sg_attrs         sba_map_sg_attrs;
+extern ia64_mv_dma_unmap_sg_attrs       sba_unmap_sg_attrs;
 extern ia64_mv_dma_supported            sba_dma_supported;
 extern ia64_mv_dma_mapping_error        sba_dma_mapping_error;
 
@@ -23,10 +23,10 @@ extern ia64_mv_dma_mapping_error	sba_dma_mapping_error;
 #define platform_dma_init                       machvec_noop
 #define platform_dma_alloc_coherent             sba_alloc_coherent
 #define platform_dma_free_coherent              sba_free_coherent
-#define platform_dma_map_single                 sba_map_single
-#define platform_dma_unmap_single               sba_unmap_single
-#define platform_dma_map_sg                     sba_map_sg
-#define platform_dma_unmap_sg                   sba_unmap_sg
+#define platform_dma_map_single_attrs           sba_map_single_attrs
+#define platform_dma_unmap_single_attrs         sba_unmap_single_attrs
+#define platform_dma_map_sg_attrs               sba_map_sg_attrs
+#define platform_dma_unmap_sg_attrs             sba_unmap_sg_attrs
 #define platform_dma_sync_single_for_cpu        machvec_dma_sync_single
 #define platform_dma_sync_sg_for_cpu            machvec_dma_sync_sg
 #define platform_dma_sync_single_for_device     machvec_dma_sync_single
diff --git a/include/asm-ia64/machvec_hpzx1_swiotlb.h b/include/asm-ia64/machvec_hpzx1_swiotlb.h
index f00a34a148ff..a842cdda827b 100644
--- a/include/asm-ia64/machvec_hpzx1_swiotlb.h
+++ b/include/asm-ia64/machvec_hpzx1_swiotlb.h
@@ -4,10 +4,10 @@
 extern ia64_mv_setup_t                          dig_setup;
 extern ia64_mv_dma_alloc_coherent               hwsw_alloc_coherent;
 extern ia64_mv_dma_free_coherent                hwsw_free_coherent;
-extern ia64_mv_dma_map_single                   hwsw_map_single;
-extern ia64_mv_dma_unmap_single                 hwsw_unmap_single;
-extern ia64_mv_dma_map_sg                       hwsw_map_sg;
-extern ia64_mv_dma_unmap_sg                     hwsw_unmap_sg;
+extern ia64_mv_dma_map_single_attrs             hwsw_map_single_attrs;
+extern ia64_mv_dma_unmap_single_attrs           hwsw_unmap_single_attrs;
+extern ia64_mv_dma_map_sg_attrs                 hwsw_map_sg_attrs;
+extern ia64_mv_dma_unmap_sg_attrs               hwsw_unmap_sg_attrs;
 extern ia64_mv_dma_supported                    hwsw_dma_supported;
 extern ia64_mv_dma_mapping_error                hwsw_dma_mapping_error;
 extern ia64_mv_dma_sync_single_for_cpu          hwsw_sync_single_for_cpu;
@@ -28,10 +28,10 @@ extern ia64_mv_dma_sync_sg_for_device		hwsw_sync_sg_for_device;
 #define platform_dma_init                       machvec_noop
 #define platform_dma_alloc_coherent             hwsw_alloc_coherent
 #define platform_dma_free_coherent              hwsw_free_coherent
-#define platform_dma_map_single                 hwsw_map_single
-#define platform_dma_unmap_single               hwsw_unmap_single
-#define platform_dma_map_sg                     hwsw_map_sg
-#define platform_dma_unmap_sg                   hwsw_unmap_sg
+#define platform_dma_map_single_attrs           hwsw_map_single_attrs
+#define platform_dma_unmap_single_attrs         hwsw_unmap_single_attrs
+#define platform_dma_map_sg_attrs               hwsw_map_sg_attrs
+#define platform_dma_unmap_sg_attrs             hwsw_unmap_sg_attrs
 #define platform_dma_supported                  hwsw_dma_supported
 #define platform_dma_mapping_error              hwsw_dma_mapping_error
 #define platform_dma_sync_single_for_cpu        hwsw_sync_single_for_cpu
diff --git a/include/asm-ia64/machvec_sn2.h b/include/asm-ia64/machvec_sn2.h
index 61439a7f5b08..781308ea7b88 100644
--- a/include/asm-ia64/machvec_sn2.h
+++ b/include/asm-ia64/machvec_sn2.h
@@ -57,10 +57,10 @@ extern ia64_mv_readl_t __sn_readl_relaxed;
 extern ia64_mv_readq_t __sn_readq_relaxed;
 extern ia64_mv_dma_alloc_coherent       sn_dma_alloc_coherent;
 extern ia64_mv_dma_free_coherent        sn_dma_free_coherent;
-extern ia64_mv_dma_map_single           sn_dma_map_single;
-extern ia64_mv_dma_unmap_single         sn_dma_unmap_single;
-extern ia64_mv_dma_map_sg               sn_dma_map_sg;
-extern ia64_mv_dma_unmap_sg             sn_dma_unmap_sg;
+extern ia64_mv_dma_map_single_attrs     sn_dma_map_single_attrs;
+extern ia64_mv_dma_unmap_single_attrs   sn_dma_unmap_single_attrs;
+extern ia64_mv_dma_map_sg_attrs         sn_dma_map_sg_attrs;
+extern ia64_mv_dma_unmap_sg_attrs       sn_dma_unmap_sg_attrs;
 extern ia64_mv_dma_sync_single_for_cpu  sn_dma_sync_single_for_cpu;
 extern ia64_mv_dma_sync_sg_for_cpu      sn_dma_sync_sg_for_cpu;
 extern ia64_mv_dma_sync_single_for_device sn_dma_sync_single_for_device;
@@ -113,10 +113,10 @@ extern ia64_mv_pci_fixup_bus_t		sn_pci_fixup_bus;
 #define platform_dma_init               machvec_noop
 #define platform_dma_alloc_coherent     sn_dma_alloc_coherent
 #define platform_dma_free_coherent      sn_dma_free_coherent
-#define platform_dma_map_single         sn_dma_map_single
-#define platform_dma_unmap_single       sn_dma_unmap_single
-#define platform_dma_map_sg             sn_dma_map_sg
-#define platform_dma_unmap_sg           sn_dma_unmap_sg
+#define platform_dma_map_single_attrs   sn_dma_map_single_attrs
+#define platform_dma_unmap_single_attrs sn_dma_unmap_single_attrs
+#define platform_dma_map_sg_attrs       sn_dma_map_sg_attrs
+#define platform_dma_unmap_sg_attrs     sn_dma_unmap_sg_attrs
 #define platform_dma_sync_single_for_cpu sn_dma_sync_single_for_cpu
 #define platform_dma_sync_sg_for_cpu    sn_dma_sync_sg_for_cpu
 #define platform_dma_sync_single_for_device sn_dma_sync_single_for_device
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h
index 6da8069a0f77..2422ac61658a 100644
--- a/include/asm-ia64/thread_info.h
+++ b/include/asm-ia64/thread_info.h
@@ -101,7 +101,6 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk);
 #define TIF_SYSCALL_TRACE       2       /* syscall trace active */
 #define TIF_SYSCALL_AUDIT       3       /* syscall auditing active */
 #define TIF_SINGLESTEP          4       /* restore singlestep on return to user mode */
-#define TIF_RESTORE_SIGMASK     5       /* restore signal mask in do_signal() */
 #define TIF_NOTIFY_RESUME       6       /* resumption notification requested */
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE              17
@@ -114,7 +113,6 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk);
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
 #define _TIF_SINGLESTEP         (1 << TIF_SINGLESTEP)
 #define _TIF_SYSCALL_TRACEAUDIT (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 #define _TIF_NOTIFY_RESUME      (1 << TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1 << TIF_NEED_RESCHED)
@@ -126,13 +124,23 @@ extern void tsk_clear_notify_resume(struct task_struct *tsk);
 
 /* "work to do on user-return" bits */
 #define TIF_ALLWORK_MASK        (_TIF_SIGPENDING|_TIF_NOTIFY_RESUME|_TIF_SYSCALL_AUDIT|\
-                                 _TIF_NEED_RESCHED| _TIF_SYSCALL_TRACE|\
-                                 _TIF_RESTORE_SIGMASK)
+                                 _TIF_NEED_RESCHED|_TIF_SYSCALL_TRACE)
 /* like TIF_ALLWORK_BITS but sans TIF_SYSCALL_TRACE or TIF_SYSCALL_AUDIT */
 #define TIF_WORK_MASK           (TIF_ALLWORK_MASK&~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT))
 
 #define TS_POLLING              1       /* true if in idle loop and not sleeping */
+#define TS_RESTORE_SIGMASK      2       /* restore signal mask in do_signal() */
 
 #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
 
+#ifndef __ASSEMBLY__
+#define HAVE_SET_RESTORE_SIGMASK        1
+static inline void set_restore_sigmask(void)
+{
+        struct thread_info *ti = current_thread_info();
+        ti->status |= TS_RESTORE_SIGMASK;
+        set_bit(TIF_SIGPENDING, &ti->flags);
+}
+#endif  /* !__ASSEMBLY__ */
+
 #endif /* _ASM_IA64_THREAD_INFO_H */
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index f2f72ef2a897..32863b3bb1d3 100644
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -116,6 +116,8 @@ void build_cpu_to_node_map(void);
 #define smt_capable()                           (smp_num_siblings > 1)
 #endif
 
+extern void arch_fix_phys_package_id(int num, u32 slot);
+
 #define pcibus_to_cpumask(bus)  (pcibus_to_node(bus) == -1 ? \
                                         CPU_MASK_ALL : \
                                         node_to_cpumask(pcibus_to_node(bus)) \
diff --git a/include/asm-ia64/types.h b/include/asm-ia64/types.h
index 902850d12424..e36b3716e718 100644
--- a/include/asm-ia64/types.h
+++ b/include/asm-ia64/types.h
@@ -13,6 +13,8 @@
  *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
  */
 
+#include <asm-generic/int-l64.h>
+
 #ifdef __ASSEMBLY__
 # define __IA64_UL(x)           (x)
 # define __IA64_UL_CONST(x)     x
@@ -28,39 +30,10 @@
 typedef unsigned int umode_t;
 
 /*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-typedef __signed__ long __s64;
-typedef unsigned long __u64;
-
-/*
  * These aren't exported outside the kernel to avoid name space clashes
  */
 # ifdef __KERNEL__
 
-typedef __s8 s8;
-typedef __u8 u8;
-
-typedef __s16 s16;
-typedef __u16 u16;
-
-typedef __s32 s32;
-typedef __u32 u32;
-
-typedef __s64 s64;
-typedef __u64 u64;
-
 #define BITS_PER_LONG 64
 
 /* DMA addresses are 64-bits wide, in general.  */
diff --git a/include/asm-ia64/unaligned.h b/include/asm-ia64/unaligned.h
index bb8559888103..7bddc7f58584 100644
--- a/include/asm-ia64/unaligned.h
+++ b/include/asm-ia64/unaligned.h
@@ -1,6 +1,11 @@
 #ifndef _ASM_IA64_UNALIGNED_H
 #define _ASM_IA64_UNALIGNED_H
 
-#include <asm-generic/unaligned.h>
+#include <linux/unaligned/le_struct.h>
+#include <linux/unaligned/be_byteshift.h>
+#include <linux/unaligned/generic.h>
+
+#define get_unaligned   __get_unaligned_le
+#define put_unaligned   __put_unaligned_le
 
 #endif /* _ASM_IA64_UNALIGNED_H */
diff --git a/include/asm-ia64/uncached.h b/include/asm-ia64/uncached.h
index b82d923b73c1..13d7e65ca3cc 100644
--- a/include/asm-ia64/uncached.h
+++ b/include/asm-ia64/uncached.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2005 Silicon Graphics, Inc.  All rights reserved.
+ * Copyright (C) 2001-2008 Silicon Graphics, Inc.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -8,5 +8,5 @@
  * Prototypes for the uncached page allocator
  */
 
-extern unsigned long uncached_alloc_page(int nid);
-extern void uncached_free_page(unsigned long);
+extern unsigned long uncached_alloc_page(int starting_nid, int n_pages);
+extern void uncached_free_page(unsigned long uc_addr, int n_pages);