4 files changed, 39 insertions, 11 deletions

diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index 4779f474f9..9179e82203 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -76,6 +76,7 @@ EXPORT_SYMBOL(__const_udelay);
 
         /* networking */
 EXPORT_SYMBOL(csum_partial);
+EXPORT_SYMBOL(csum_partial_copy_from_user);
 EXPORT_SYMBOL(csum_partial_copy_nocheck);
 EXPORT_SYMBOL(__csum_ipv6_magic);
 
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index bdbd7da992..f56d48c451 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -41,11 +41,11 @@
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/kthread.h>
+#include <linux/io.h>
 
 #include <asm/dma.h>
 #include <asm/ecard.h>
 #include <asm/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mmu_context.h>
 #include <asm/mach/irq.h>
@@ -958,6 +958,31 @@ void ecard_release_resources(struct expansion_card *ec)
 }
 EXPORT_SYMBOL(ecard_release_resources);
 
+void ecard_setirq(struct expansion_card *ec, const struct expansion_card_ops *ops, void *irq_data)
+{
+        ec->irq_data = irq_data;
+        barrier();
+        ec->ops = ops;
+}
+EXPORT_SYMBOL(ecard_setirq);
+
+void __iomem *ecardm_iomap(struct expansion_card *ec, unsigned int res,
+                           unsigned long offset, unsigned long maxsize)
+{
+        unsigned long start = ecard_resource_start(ec, res);
+        unsigned long end = ecard_resource_end(ec, res);
+
+        if (offset > (end - start))
+                return NULL;
+
+        start += offset;
+        if (maxsize && end - start > maxsize)
+                end = start + maxsize;
+        
+        return devm_ioremap(&ec->dev, start, end - start);
+}
+EXPORT_SYMBOL(ecardm_iomap);
+
 /*
  * Probe for an expansion card.
  *
@@ -1133,6 +1158,14 @@ static int ecard_drv_remove(struct device *dev)
         drv->remove(ec);
         ecard_release(ec);
 
+        /*
+         * Restore the default operations.  We ensure that the
+         * ops are set before we change the data.
+         */
+        ec->ops = &ecard_default_ops;
+        barrier();
+        ec->irq_data = NULL;
+
         return 0;
 }
 
diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c
index 77ef35efaa..398d0c0511 100644
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
@@ -52,21 +52,15 @@ static int save_trace(struct stackframe *frame, void *d)
         return trace->nr_entries >= trace->max_entries;
 }
 
-void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
+void save_stack_trace(struct stack_trace *trace)
 {
         struct stack_trace_data data;
         unsigned long fp, base;
 
         data.trace = trace;
         data.skip = trace->skip;
-
-        if (task) {
-                base = (unsigned long)task_stack_page(task);
-                fp = 0; /* FIXME */
-        } else {
-                base = (unsigned long)task_stack_page(current);
-                asm("mov %0, fp" : "=r" (fp));
-        }
+        base = (unsigned long)task_stack_page(current);
+        asm("mov %0, fp" : "=r" (fp));
 
         walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data);
 }
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index d0540e4eaf..1533d3ecd7 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -512,7 +512,7 @@ void __init time_init(void)
 
 #ifdef CONFIG_NO_IDLE_HZ
         if (system_timer->dyn_tick)
-                system_timer->dyn_tick->lock = SPIN_LOCK_UNLOCKED;
+                spin_lock_init(&system_timer->dyn_tick->lock);
 #endif
 }