Merge git://git.infradead.org/~dwmw2/mtd-2.6.33

* git://git.infradead.org/~dwmw2/mtd-2.6.33:
  mtd: tests: fix read, speed and stress tests on NOR flash
  mtd: Really add ARM pismo support
  kmsg_dump: Dump on crash_kexec as well

diff --combined kernel/kexec.c
index a9a93d9ee7a78e70068bca678826873376afd8a7,ae217488fef86b074b35c8236c3f3ec33f9e3ae0..ef077fb73155f8b9e7a6e96197554feacd735f4b
--- 1/kernel/kexec.c
--- 2/kernel/kexec.c
+++ b/kernel/kexec.c
@@@ -21,7 -21,7 +21,7 @@@
  #include <linux/hardirq.h>
  #include <linux/elf.h>
  #include <linux/elfcore.h>
 -#include <linux/utsrelease.h>
 +#include <generated/utsrelease.h>
  #include <linux/utsname.h>
  #include <linux/numa.h>
  #include <linux/suspend.h>
@@@ -32,6 -32,7 +32,7 @@@
  #include <linux/console.h>
  #include <linux/vmalloc.h>
  #include <linux/swap.h>
+ #include <linux/kmsg_dump.h>
  
  #include <asm/page.h>
  #include <asm/uaccess.h>
@@@ -1074,6 -1075,9 +1075,9 @@@ void crash_kexec(struct pt_regs *regs
        if (mutex_trylock(&kexec_mutex)) {
                if (kexec_crash_image) {
                        struct pt_regs fixed_regs;
+ 
+                       kmsg_dump(KMSG_DUMP_KEXEC);
+ 
                        crash_setup_regs(&fixed_regs, regs);
                        crash_save_vmcoreinfo();
                        machine_crash_shutdown(&fixed_regs);

diff --combined kernel/printk.c
index 17463ca2e2292038027318222177979f83ee6bdb,2c9dc0b03a5e6880048af5058a7a9082fbc0770e..1751c456b71ff6ee071f729a8375009e979faf7e
--- 1/kernel/printk.c
--- 2/kernel/printk.c
+++ b/kernel/printk.c
@@@ -1412,7 -1412,7 +1412,7 @@@ static LIST_HEAD(dump_list)
  
  /**
   * kmsg_dump_register - register a kernel log dumper.
 - * @dump: pointer to the kmsg_dumper structure
 + * @dumper: pointer to the kmsg_dumper structure
   *
   * Adds a kernel log dumper to the system. The dump callback in the
   * structure will be called when the kernel oopses or panics and must be
@@@ -1442,7 -1442,7 +1442,7 @@@ EXPORT_SYMBOL_GPL(kmsg_dump_register)
  
  /**
   * kmsg_dump_unregister - unregister a kmsg dumper.
 - * @dump: pointer to the kmsg_dumper structure
 + * @dumper: pointer to the kmsg_dumper structure
   *
   * Removes a dump device from the system. Returns zero on success and
   * %-EINVAL otherwise.
@@@ -1467,6 -1467,7 +1467,7 @@@ EXPORT_SYMBOL_GPL(kmsg_dump_unregister)
  static const char const *kmsg_reasons[] = {
        [KMSG_DUMP_OOPS]        = "oops",
        [KMSG_DUMP_PANIC]       = "panic",
+       [KMSG_DUMP_KEXEC]       = "kexec",
  };
  
  static const char *kmsg_to_str(enum kmsg_dump_reason reason)