4 files changed, 17 insertions, 16 deletions

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index e0cb6370ed14..3e97483abcf0 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -1075,13 +1075,15 @@ out:
 }
 #endif
 
-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)
 {
         int ret;
+        unsigned long __user *datap = (unsigned long __user *) data;
 
         switch (request) {
                 case PTRACE_PEEKUSR:
-                        ret = ptrace_read_user(child, addr, (unsigned long __user *)data);
+                        ret = ptrace_read_user(child, addr, datap);
                         break;
 
                 case PTRACE_POKEUSR:
@@ -1089,34 +1091,34 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         break;
 
                 case PTRACE_GETREGS:
-                        ret = ptrace_getregs(child, (void __user *)data);
+                        ret = ptrace_getregs(child, datap);
                         break;
 
                 case PTRACE_SETREGS:
-                        ret = ptrace_setregs(child, (void __user *)data);
+                        ret = ptrace_setregs(child, datap);
                         break;
 
                 case PTRACE_GETFPREGS:
-                        ret = ptrace_getfpregs(child, (void __user *)data);
+                        ret = ptrace_getfpregs(child, datap);
                         break;
                 
                 case PTRACE_SETFPREGS:
-                        ret = ptrace_setfpregs(child, (void __user *)data);
+                        ret = ptrace_setfpregs(child, datap);
                         break;
 
 #ifdef CONFIG_IWMMXT
                 case PTRACE_GETWMMXREGS:
-                        ret = ptrace_getwmmxregs(child, (void __user *)data);
+                        ret = ptrace_getwmmxregs(child, datap);
                         break;
 
                 case PTRACE_SETWMMXREGS:
-                        ret = ptrace_setwmmxregs(child, (void __user *)data);
+                        ret = ptrace_setwmmxregs(child, datap);
                         break;
 #endif
 
                 case PTRACE_GET_THREAD_AREA:
                         ret = put_user(task_thread_info(child)->tp_value,
-                                       (unsigned long __user *) data);
+                                       datap);
                         break;
 
                 case PTRACE_SET_SYSCALL:
@@ -1126,21 +1128,21 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
 #ifdef CONFIG_CRUNCH
                 case PTRACE_GETCRUNCHREGS:
-                        ret = ptrace_getcrunchregs(child, (void __user *)data);
+                        ret = ptrace_getcrunchregs(child, datap);
                         break;
 
                 case PTRACE_SETCRUNCHREGS:
-                        ret = ptrace_setcrunchregs(child, (void __user *)data);
+                        ret = ptrace_setcrunchregs(child, datap);
                         break;
 #endif
 
 #ifdef CONFIG_VFP
                 case PTRACE_GETVFPREGS:
-                        ret = ptrace_getvfpregs(child, (void __user *)data);
+                        ret = ptrace_getvfpregs(child, datap);
                         break;
 
                 case PTRACE_SETVFPREGS:
-                        ret = ptrace_setvfpregs(child, (void __user *)data);
+                        ret = ptrace_setvfpregs(child, datap);
                         break;
 #endif
 
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 2f420210d406..9057d6fd1d31 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -28,7 +28,6 @@
 #include <linux/cnt32_to_63.h>
 
 #include <asm/mach/time.h>
-#include <asm/mach/time.h>
 #include <asm/localtimer.h>
 
 #include <mach/iomap.h>
diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
index c00f119babbf..c435fd9e1da9 100644
--- a/arch/arm/mm/highmem.c
+++ b/arch/arm/mm/highmem.c
@@ -89,7 +89,7 @@ void __kunmap_atomic(void *kvaddr)
         int idx, type;
 
         if (kvaddr >= (void *)FIXADDR_START) {
-                type = kmap_atomic_idx_pop();
+                type = kmap_atomic_idx();
                 idx = type + KM_TYPE_NR * smp_processor_id();
 
                 if (cache_is_vivt())
@@ -101,6 +101,7 @@ void __kunmap_atomic(void *kvaddr)
 #else
                 (void) idx;  /* to kill a warning */
 #endif
+                kmap_atomic_idx_pop();
         } else if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
                 /* this address was obtained through kmap_high_get() */
                 kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 5fbde4b8dc12..93a812672d9a 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -14,7 +14,6 @@
 #include <linux/dmaengine.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
-#include <linux/dmaengine.h>
 
 /* dev types for memcpy */
 #define STEDMA40_DEV_DST_MEMORY (-1)