4 files changed, 13 insertions, 8 deletions

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 89cfee07efa9..7e8c2844e093 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -58,6 +58,9 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 config ARCH_PHYS_ADDR_T_64BIT
         def_bool y
 
+config ARCH_DMA_ADDR_T_64BIT
+        def_bool y
+
 config LOCKDEP_SUPPORT
         def_bool y
 
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index 5b20c2874d51..9cd29884c09f 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -45,7 +45,8 @@ void ptrace_disable(struct task_struct *child)
         clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 }
 
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request,
+                 unsigned long addr, unsigned long data)
 {
         unsigned long __user *datap = (long __user __force *)data;
         unsigned long tmp;
@@ -57,7 +58,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         switch (request) {
 
         case PTRACE_PEEKUSR:  /* Read register from pt_regs. */
-                if (addr < 0 || addr >= PTREGS_SIZE)
+                if (addr >= PTREGS_SIZE)
                         break;
                 childreg = (char *)task_pt_regs(child) + addr;
 #ifdef CONFIG_COMPAT
@@ -76,7 +77,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 break;
 
         case PTRACE_POKEUSR:  /* Write register in pt_regs. */
-                if (addr < 0 || addr >= PTREGS_SIZE)
+                if (addr >= PTREGS_SIZE)
                         break;
                 childreg = (char *)task_pt_regs(child) + addr;
 #ifdef CONFIG_COMPAT
@@ -98,7 +99,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 if (!access_ok(VERIFY_WRITE, datap, PTREGS_SIZE))
                         break;
                 childregs = (long *)task_pt_regs(child);
-                for (i = 0; i < sizeof(struct pt_regs)/sizeof(long); ++i) {
+                for (i = 0; i < sizeof(struct pt_regs)/sizeof(unsigned long);
+                                ++i) {
                         ret = __put_user(childregs[i], &datap[i]);
                         if (ret != 0)
                                 break;
@@ -109,7 +111,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 if (!access_ok(VERIFY_READ, datap, PTREGS_SIZE))
                         break;
                 childregs = (long *)task_pt_regs(child);
-                for (i = 0; i < sizeof(struct pt_regs)/sizeof(long); ++i) {
+                for (i = 0; i < sizeof(struct pt_regs)/sizeof(unsigned long);
+                                ++i) {
                         ret = __get_user(childregs[i], &datap[i]);
                         if (ret != 0)
                                 break;
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index f3a50e74f9a4..ae51cad12da0 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -30,8 +30,6 @@
 #include <linux/timex.h>
 #include <asm/setup.h>
 #include <asm/sections.h>
-#include <asm/sections.h>
-#include <asm/cacheflush.h>
 #include <asm/cacheflush.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
index 8ef6595e162c..abb57331cf6e 100644
--- a/arch/tile/mm/highmem.c
+++ b/arch/tile/mm/highmem.c
@@ -241,7 +241,7 @@ void __kunmap_atomic(void *kvaddr)
                 pte_t pteval = *pte;
                 int idx, type;
 
-                type = kmap_atomic_idx_pop();
+                type = kmap_atomic_idx();
                 idx = type + KM_TYPE_NR*smp_processor_id();
 
                 /*
@@ -252,6 +252,7 @@ void __kunmap_atomic(void *kvaddr)
                 BUG_ON(!pte_present(pteval) && !pte_migrating(pteval));
                 kmap_atomic_unregister(pte_page(pteval), vaddr);
                 kpte_clear_flush(pte, vaddr);
+                kmap_atomic_idx_pop();
         } else {
                 /* Must be a lowmem page */
                 BUG_ON(vaddr < PAGE_OFFSET);