mac80211: fix deauth before assoc

[safe/jmp/linux-2.6] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 934fb37..13d966b 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -10,6 +10,7 @@
  */
 #include <linux/debug_locks.h>
 #include <linux/interrupt.h>
+#include <linux/kmsg_dump.h>
 #include <linux/kallsyms.h>
 #include <linux/notifier.h>
 #include <linux/module.h>
@@ -35,15 +36,36 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list);
 
 EXPORT_SYMBOL(panic_notifier_list);
 
-static long no_blink(long time)
-{
-       return 0;
-}
-
 /* Returns how long it waited in ms */
 long (*panic_blink)(long time);
 EXPORT_SYMBOL(panic_blink);
 
+static void panic_blink_one_second(void)
+{
+       static long i = 0, end;
+
+       if (panic_blink) {
+               end = i + MSEC_PER_SEC;
+
+               while (i < end) {
+                       i += panic_blink(i);
+                       mdelay(1);
+                       i++;
+               }
+       } else {
+               /*
+                * When running under a hypervisor a small mdelay may get
+                * rounded up to the hypervisor timeslice. For example, with
+                * a 1ms in 10ms hypervisor timeslice we might inflate a
+                * mdelay(1) loop by 10x.
+                *
+                * If we have nothing to blink, spin on 1 second calls to
+                * mdelay to avoid this.
+                */
+               mdelay(MSEC_PER_SEC);
+       }
+}
+
 /**
  *     panic - halt the system
  *     @fmt: The text string to print
@@ -81,6 +103,8 @@ NORET_TYPE void panic(const char * fmt, ...)
         */
        crash_kexec(NULL);
 
+       kmsg_dump(KMSG_DUMP_PANIC);
+
        /*
         * Note smp_send_stop is the usual smp shutdown function, which
         * unfortunately means it may not be hardened to work in a panic
@@ -90,8 +114,7 @@ NORET_TYPE void panic(const char * fmt, ...)
 
        atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
 
-       if (!panic_blink)
-               panic_blink = no_blink;
+       bust_spinlocks(0);
 
        if (panic_timeout > 0) {
                /*
@@ -100,11 +123,9 @@ NORET_TYPE void panic(const char * fmt, ...)
                 */
                printk(KERN_EMERG "Rebooting in %d seconds..", panic_timeout);
 
-               for (i = 0; i < panic_timeout*1000; ) {
+               for (i = 0; i < panic_timeout; i++) {
                        touch_nmi_watchdog();
-                       i += panic_blink(i);
-                       mdelay(1);
-                       i++;
+                       panic_blink_one_second();
                }
                /*
                 * This will not be a clean reboot, with everything
@@ -130,13 +151,10 @@ NORET_TYPE void panic(const char * fmt, ...)
        }
 #endif
        local_irq_enable();
-       for (i = 0; ; ) {
+       while (1) {
                touch_softlockup_watchdog();
-               i += panic_blink(i);
-               mdelay(1);
-               i++;
+               panic_blink_one_second();
        }
-       bust_spinlocks(0);
 }
 
 EXPORT_SYMBOL(panic);
@@ -177,7 +195,7 @@ static const struct tnt tnts[] = {
  *  'W' - Taint on warning.
  *  'C' - modules from drivers/staging are loaded.
  *
- *     The string is overwritten by the next call to print_taint().
+ *     The string is overwritten by the next call to print_tainted().
  */
 const char *print_tainted(void)
 {
@@ -221,7 +239,7 @@ void add_taint(unsigned flag)
         * post-warning case.
         */
        if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off())
-               printk(KERN_WARNING "Disabling lockdep due to kernel taint\n");
+               printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
 
        set_bit(flag, &tainted_mask);
 }
@@ -301,6 +319,7 @@ int oops_may_print(void)
  */
 void oops_enter(void)
 {
+       tracing_off();
        /* can't trust the integrity of the kernel anymore: */
        debug_locks_off();
        do_oops_enter_exit();
@@ -337,37 +356,50 @@ void oops_exit(void)
 {
        do_oops_enter_exit();
        print_oops_end_marker();
+       kmsg_dump(KMSG_DUMP_OOPS);
 }
 
 #ifdef WANT_WARN_ON_SLOWPATH
-void warn_slowpath(const char *file, int line, const char *fmt, ...)
-{
+struct slowpath_args {
+       const char *fmt;
        va_list args;
-       char function[KSYM_SYMBOL_LEN];
-       unsigned long caller = (unsigned long)__builtin_return_address(0);
-       const char *board;
+};
 
-       sprint_symbol(function, caller);
+static void warn_slowpath_common(const char *file, int line, void *caller, struct slowpath_args *args)
+{
+       const char *board;
 
        printk(KERN_WARNING "------------[ cut here ]------------\n");
-       printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
-               line, function);
+       printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
        board = dmi_get_system_info(DMI_PRODUCT_NAME);
        if (board)
                printk(KERN_WARNING "Hardware name: %s\n", board);
 
-       if (fmt) {
-               va_start(args, fmt);
-               vprintk(fmt, args);
-               va_end(args);
-       }
+       if (args)
+               vprintk(args->fmt, args->args);
 
        print_modules();
        dump_stack();
        print_oops_end_marker();
        add_taint(TAINT_WARN);
 }
-EXPORT_SYMBOL(warn_slowpath);
+
+void warn_slowpath_fmt(const char *file, int line, const char *fmt, ...)
+{
+       struct slowpath_args args;
+
+       args.fmt = fmt;
+       va_start(args.args, fmt);
+       warn_slowpath_common(file, line, __builtin_return_address(0), &args);
+       va_end(args.args);
+}
+EXPORT_SYMBOL(warn_slowpath_fmt);
+
+void warn_slowpath_null(const char *file, int line)
+{
+       warn_slowpath_common(file, line, __builtin_return_address(0), NULL);
+}
+EXPORT_SYMBOL(warn_slowpath_null);
 #endif
 
 #ifdef CONFIG_CC_STACKPROTECTOR