7 files changed, 93 insertions, 55 deletions

diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index f73d62e8ab60..688b7b1ee416 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -179,3 +179,5 @@ EXPORT_SYMBOL(_find_next_zero_bit_be);
 EXPORT_SYMBOL(_find_first_bit_be);
 EXPORT_SYMBOL(_find_next_bit_be);
 #endif
+
+EXPORT_SYMBOL(copy_page);
diff --git a/arch/arm/kernel/arthur.c b/arch/arm/kernel/arthur.c
index 0ee2e9819631..321c5291d05f 100644
--- a/arch/arm/kernel/arthur.c
+++ b/arch/arm/kernel/arthur.c
@@ -90,3 +90,5 @@ static void __exit arthur_exit(void)
 
 module_init(arthur_init);
 module_exit(arthur_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c
index 64c420805e6f..42a1a1415fa6 100644
--- a/arch/arm/kernel/atags.c
+++ b/arch/arm/kernel/atags.c
@@ -1,5 +1,4 @@
 #include <linux/slab.h>
-#include <linux/kexec.h>
 #include <linux/proc_fs.h>
 #include <asm/setup.h>
 #include <asm/types.h>
@@ -7,9 +6,8 @@
 
 struct buffer {
         size_t size;
-        char *data;
+        char data[];
 };
-static struct buffer tags_buffer;
 
 static int
 read_buffer(char* page, char** start, off_t off, int count,
@@ -29,58 +27,57 @@ read_buffer(char* page, char** start, off_t off, int count,
         return count;
 }
 
-
-static int
-create_proc_entries(void)
-{
-        struct proc_dir_entry* tags_entry;
-
-        tags_entry = create_proc_read_entry("atags", 0400, NULL, read_buffer, &tags_buffer);
-        if (!tags_entry)
-                return -ENOMEM;
-
-        return 0;
-}
-
-
-static char __initdata atags_copy_buf[KEXEC_BOOT_PARAMS_SIZE];
-static char __initdata *atags_copy;
+#define BOOT_PARAMS_SIZE 1536
+static char __initdata atags_copy[BOOT_PARAMS_SIZE];
 
 void __init save_atags(const struct tag *tags)
 {
-        atags_copy = atags_copy_buf;
-        memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE);
+        memcpy(atags_copy, tags, sizeof(atags_copy));
 }
 
-
 static int __init init_atags_procfs(void)
 {
-        struct tag *tag;
-        int error;
+        /*
+         * This cannot go into save_atags() because kmalloc and proc don't work
+         * yet when it is called.
+         */
+        struct proc_dir_entry *tags_entry;
+        struct tag *tag = (struct tag *)atags_copy;
+        struct buffer *b;
+        size_t size;
 
-        if (!atags_copy) {
-                printk(KERN_WARNING "Exporting ATAGs: No saved tags found\n");
-                return -EIO;
+        if (tag->hdr.tag != ATAG_CORE) {
+                printk(KERN_INFO "No ATAGs?");
+                return -EINVAL;
         }
 
-        for (tag = (struct tag *) atags_copy; tag->hdr.size; tag = tag_next(tag))
+        for (; tag->hdr.size; tag = tag_next(tag))
                 ;
 
-        tags_buffer.size = ((char *) tag - atags_copy) + sizeof(tag->hdr);
-        tags_buffer.data = kmalloc(tags_buffer.size, GFP_KERNEL);
-        if (tags_buffer.data == NULL)
-                return -ENOMEM;
-        memcpy(tags_buffer.data, atags_copy, tags_buffer.size);
-
-        error = create_proc_entries();
-        if (error) {
-                printk(KERN_ERR "Exporting ATAGs: not enough memory\n");
-                kfree(tags_buffer.data);
-                tags_buffer.size = 0;
-                tags_buffer.data = NULL;
-        }
+        /* include the terminating ATAG_NONE */
+        size = (char *)tag - atags_copy + sizeof(struct tag_header);
 
-        return error;
-}
+        WARN_ON(tag->hdr.tag != ATAG_NONE);
+
+        b = kmalloc(sizeof(*b) + size, GFP_KERNEL);
+        if (!b)
+                goto nomem;
 
+        b->size = size;
+        memcpy(b->data, atags_copy, size);
+
+        tags_entry = create_proc_read_entry("atags", 0400,
+                        NULL, read_buffer, b);
+
+        if (!tags_entry)
+                goto nomem;
+
+        return 0;
+
+nomem:
+        kfree(b);
+        printk(KERN_ERR "Exporting ATAGs: not enough memory\n");
+
+        return -ENOMEM;
+}
 arch_initcall(init_atags_procfs);
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index a53c0aba5c14..8bfd299bfe77 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -680,7 +680,7 @@ static int __init ecard_probeirqhw(void)
 #define IO_EC_MEMC8_BASE 0
 #endif
 
-unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed)
+static unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed)
 {
         unsigned long address = 0;
         int slot = ec->slot_no;
@@ -1002,7 +1002,7 @@ ecard_probe(int slot, card_type_t type)
         }
 
         rc = -ENODEV;
-        if ((ec->podaddr = ecard_address(ec, type, ECARD_SYNC)) == 0)
+        if ((ec->podaddr = __ecard_address(ec, type, ECARD_SYNC)) == 0)
                 goto nodev;
 
         cid.r_zero = 1;
@@ -1141,10 +1141,10 @@ static int ecard_drv_probe(struct device *dev)
 
         id = ecard_match_device(drv->id_table, ec);
 
-        ecard_claim(ec);
+        ec->claimed = 1;
         ret = drv->probe(ec, id);
         if (ret)
-                ecard_release(ec);
+                ec->claimed = 0;
         return ret;
 }
 
@@ -1154,7 +1154,7 @@ static int ecard_drv_remove(struct device *dev)
         struct ecard_driver *drv = ECARD_DRV(dev->driver);
 
         drv->remove(ec);
-        ecard_release(ec);
+        ec->claimed = 0;
 
         /*
          * Restore the default operations.  We ensure that the
@@ -1182,7 +1182,7 @@ static void ecard_drv_shutdown(struct device *dev)
         if (dev->driver) {
                 if (drv->shutdown)
                         drv->shutdown(ec);
-                ecard_release(ec);
+                ec->claimed = 0;
         }
 
         /*
@@ -1239,7 +1239,6 @@ static int ecard_bus_init(void)
 postcore_initcall(ecard_bus_init);
 
 EXPORT_SYMBOL(ecard_readchunk);
-EXPORT_SYMBOL(__ecard_address);
 EXPORT_SYMBOL(ecard_register_driver);
 EXPORT_SYMBOL(ecard_remove_driver);
 EXPORT_SYMBOL(ecard_bus_type);
diff --git a/arch/arm/kernel/ecard.h b/arch/arm/kernel/ecard.h
index d7c2dacf935d..4642d436be2a 100644
--- a/arch/arm/kernel/ecard.h
+++ b/arch/arm/kernel/ecard.h
@@ -54,3 +54,16 @@ struct ex_chunk_dir {
 #define c_len(x)        ((x)->r_len[0]|((x)->r_len[1]<<8)|((x)->r_len[2]<<16))
 #define c_start(x)      ((x)->r_start)
 };
+
+typedef enum ecard_type {               /* Cards address space          */
+        ECARD_IOC,
+        ECARD_MEMC,
+        ECARD_EASI
+} card_type_t;
+
+typedef enum {                          /* Speed for ECARD_IOC space    */
+        ECARD_SLOW       = 0,
+        ECARD_MEDIUM     = 1,
+        ECARD_FAST       = 2,
+        ECARD_SYNC       = 3
+} card_speed_t;
diff --git a/arch/arm/kernel/init_task.c b/arch/arm/kernel/init_task.c
index bd4ef53bc6b9..8b8c9d38a761 100644
--- a/arch/arm/kernel/init_task.c
+++ b/arch/arm/kernel/init_task.c
@@ -13,7 +13,6 @@
 #include <asm/pgtable.h>
 
 static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
 static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
 static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
 struct mm_struct init_mm = INIT_MM(init_mm);
diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c
index ae31deb2d065..90e0c35ae60d 100644
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
@@ -36,6 +36,7 @@ EXPORT_SYMBOL(walk_stackframe);
 #ifdef CONFIG_STACKTRACE
 struct stack_trace_data {
         struct stack_trace *trace;
+        unsigned int no_sched_functions;
         unsigned int skip;
 };
 
@@ -43,27 +44,52 @@ static int save_trace(struct stackframe *frame, void *d)
 {
         struct stack_trace_data *data = d;
         struct stack_trace *trace = data->trace;
+        unsigned long addr = frame->lr;
 
+        if (data->no_sched_functions && in_sched_functions(addr))
+                return 0;
         if (data->skip) {
                 data->skip--;
                 return 0;
         }
 
-        trace->entries[trace->nr_entries++] = frame->lr;
+        trace->entries[trace->nr_entries++] = addr;
 
         return trace->nr_entries >= trace->max_entries;
 }
 
-void save_stack_trace(struct stack_trace *trace)
+void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
 {
         struct stack_trace_data data;
         unsigned long fp, base;
 
         data.trace = trace;
         data.skip = trace->skip;
-        base = (unsigned long)task_stack_page(current);
-        asm("mov %0, fp" : "=r" (fp));
+        base = (unsigned long)task_stack_page(tsk);
+
+        if (tsk != current) {
+#ifdef CONFIG_SMP
+                /*
+                 * What guarantees do we have here that 'tsk'
+                 * is not running on another CPU?
+                 */
+                BUG();
+#else
+                data.no_sched_functions = 1;
+                fp = thread_saved_fp(tsk);
+#endif
+        } else {
+                data.no_sched_functions = 0;
+                asm("mov %0, fp" : "=r" (fp));
+        }
 
         walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data);
+        if (trace->nr_entries < trace->max_entries)
+                trace->entries[trace->nr_entries++] = ULONG_MAX;
+}
+
+void save_stack_trace(struct stack_trace *trace)
+{
+        save_stack_trace_tsk(current, trace);
 }
 #endif