Move xen patchset to new version's subdir.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / kdump-dump_after_notifier.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/kdump-dump_after_notifier.patch b/src/patches/suse-2.6.27.31/patches.suse/kdump-dump_after_notifier.patch
new file mode 100644 (file)
index 0000000..50db84f
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.suse/kdump-dump_after_notifier.patch
@@ -0,0 +1,136 @@
+From: Takenori Nagano <t-nagano@ah.jp.nec.com>
+Subject: [PATCH] Add dump_after_notifier sysctl
+Patch-mainline: never
+References: 265764
+
+This patch adds dump_after_notifier sysctl to execute kdump after the notifier
+call chain. This basically makes it possible to execute KDB before kdump.
+
+Signed-off-by: Takenori Nagano <t-nagano@ah.jp.nec.com>
+Acked-by: Bernhard Walle <bwalle@suse.de>
+
+---
+ include/linux/kexec.h  |    2 ++
+ include/linux/sysctl.h |    1 +
+ kernel/kexec.c         |   29 +++++++++++++++++++++++++++++
+ kernel/panic.c         |    5 ++++-
+ kernel/sysctl_check.c  |    1 +
+ 5 files changed, 37 insertions(+), 1 deletion(-)
+
+--- a/include/linux/kexec.h
++++ b/include/linux/kexec.h
+@@ -154,6 +154,7 @@ unsigned long paddr_vmcoreinfo_note(void
+ 
+ extern struct kimage *kexec_image;
+ extern struct kimage *kexec_crash_image;
++extern int dump_after_notifier;
+ 
+ #ifndef kexec_flush_icache_page
+ #define kexec_flush_icache_page(page)
+@@ -208,5 +209,6 @@ struct pt_regs;
+ struct task_struct;
+ static inline void crash_kexec(struct pt_regs *regs) { }
+ static inline int kexec_should_crash(struct task_struct *p) { return 0; }
++#define dump_after_notifier 0
+ #endif /* CONFIG_KEXEC */
+ #endif /* LINUX_KEXEC_H */
+--- a/include/linux/sysctl.h
++++ b/include/linux/sysctl.h
+@@ -164,6 +164,7 @@ enum
+       KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
+       KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
+       KERN_KDB=77,            /* int: kdb on/off */
++      KERN_DUMP_AFTER_NOTIFIER=78, /* int: kdump after panic_notifier (SUSE only) */
+ };
+ 
+ 
+--- a/kernel/kexec.c
++++ b/kernel/kexec.c
+@@ -30,6 +30,7 @@
+ #include <linux/pm.h>
+ #include <linux/cpu.h>
+ #include <linux/console.h>
++#include <linux/sysctl.h>
+ 
+ #include <asm/page.h>
+ #include <asm/uaccess.h>
+@@ -45,6 +46,7 @@
+ 
+ /* Per cpu memory for storing cpu states in case of system crash. */
+ note_buf_t* crash_notes;
++int dump_after_notifier;
+ 
+ /* vmcoreinfo stuff */
+ unsigned char vmcoreinfo_data[VMCOREINFO_BYTES];
+@@ -1151,6 +1153,30 @@ void crash_save_cpu(struct pt_regs *regs
+       final_note(buf);
+ }
+ 
++#ifdef CONFIG_SYSCTL
++static ctl_table dump_after_notifier_table[] = {
++      {
++              .ctl_name = KERN_DUMP_AFTER_NOTIFIER,
++              .procname = "dump_after_notifier",
++              .data = &dump_after_notifier,
++              .maxlen = sizeof(int),
++              .mode = 0644,
++              .proc_handler = &proc_dointvec,
++      },
++      { .ctl_name = 0 }
++};
++
++static ctl_table kexec_sys_table[] = {
++      {
++              .ctl_name = CTL_KERN,
++              .procname = "kernel",
++              .mode = 0555,
++              .child = dump_after_notifier_table,
++      },
++      { .ctl_name = 0 }
++};
++#endif
++
+ static int __init crash_notes_memory_init(void)
+ {
+       /* Allocate memory for saving cpu registers. */
+@@ -1160,6 +1186,9 @@ static int __init crash_notes_memory_ini
+               " states failed\n");
+               return -ENOMEM;
+       }
++#ifdef CONFIG_SYSCTL
++      register_sysctl_table(kexec_sys_table);
++#endif
+       return 0;
+ }
+ module_init(crash_notes_memory_init)
+--- a/kernel/panic.c
++++ b/kernel/panic.c
+@@ -95,7 +95,8 @@ NORET_TYPE void panic(const char * fmt, 
+        * everything else.
+        * Do we want to call this before we try to display a message?
+        */
+-      crash_kexec(NULL);
++      if (!dump_after_notifier)
++              crash_kexec(NULL);
+ 
+ #ifdef CONFIG_SMP
+       /*
+@@ -108,6 +109,8 @@ NORET_TYPE void panic(const char * fmt, 
+ 
+       atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
+ 
++      crash_kexec(NULL);
++
+       if (!panic_blink)
+               panic_blink = no_blink;
+ 
+--- a/kernel/sysctl_check.c
++++ b/kernel/sysctl_check.c
+@@ -106,6 +106,7 @@ static const struct trans_ctl_table tran
+       { KERN_PANIC_ON_NMI,            "panic_on_unrecovered_nmi" },
+       { KERN_SETUID_DUMPABLE,         "suid_dumpable" },
+       { KERN_KDB,                     "kdb" },
++      { KERN_DUMP_AFTER_NOTIFIER,     "dump_after_notifier" },
+       {}
+ };
+