diff options
Diffstat (limited to 'driver/sysfs-crash-debugging.patch')
| -rw-r--r-- | driver/sysfs-crash-debugging.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch index ae74a878b41526..a1050f1dfc5b79 100644 --- a/driver/sysfs-crash-debugging.patch +++ b/driver/sysfs-crash-debugging.patch @@ -27,24 +27,24 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c -@@ -400,6 +400,7 @@ void die(const char * str, struct pt_reg +@@ -394,6 +394,7 @@ int __kprobes __die(const char * str, st #endif - printk("\n"); + printk("\n"); -+ sysfs_printk_last_file(); - if (notify_die(DIE_OOPS, str, regs, err, - current->thread.trap_no, SIGSEGV) != - NOTIFY_STOP) { ++ sysfs_printk_last_file(); + if (notify_die(DIE_OOPS, str, regs, err, + current->thread.trap_no, SIGSEGV) != + NOTIFY_STOP) { --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c -@@ -524,6 +524,7 @@ void __kprobes __die(const char * str, s +@@ -573,6 +573,7 @@ int __kprobes __die(const char * str, st printk("DEBUG_PAGEALLOC"); #endif printk("\n"); + sysfs_printk_last_file(); - notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); + if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) == NOTIFY_STOP) + return 1; show_registers(regs); - add_taint(TAINT_DIE); --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -16,10 +16,18 @@ |