Attachment 148947 Details for Bug 226701 – revised kernel side patch with balanced parens

[patch] revised kernel side patch with balanced parens

netdump-kernel.patch (text/plain), 2.14 KB, created by Bryn M. Reeves on 2007-02-28 18:04:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-02-28 18:04:21 UTC

Size: 2.14 KB

patch

obsolete

>Index: linux-2.6.9/kernel/dump.c
>===================================================================
>--- linux-2.6.9.orig/kernel/dump.c
>+++ linux-2.6.9/kernel/dump.c
>@@ -287,7 +287,9 @@ EXPORT_SYMBOL_GPL(diskdump_unregister_ho
> 
> void (*netdump_func) (struct pt_regs *regs) = NULL;
> int netdump_mode = 0;
>+int netdump_emit_printks = 1;
> EXPORT_SYMBOL_GPL(netdump_mode);
>+EXPORT_SYMBOL_GPL(netdump_emit_printks);
> 
> /*
>  * Try crashdump. Diskdump is first, netdump is second.
>Index: linux-2.6.9/drivers/net/netdump.c
>===================================================================
>--- linux-2.6.9.orig/drivers/net/netdump.c
>+++ linux-2.6.9/drivers/net/netdump.c
>@@ -285,6 +285,7 @@ static void netdump_startup_handshake(st
> 	req_t *req = NULL;
> 	int i;
> 
>+	netdump_emit_printks = 0;
> repeat:
> 	sprintf(tmp,
>    	    "task_struct:0x%lx page_offset:0x%llx netdump_magic:0x%llx\n",
>@@ -473,14 +474,16 @@ static asmlinkage void netpoll_netdump(s
> 			reply.nr = req->nr;
> 			reply.info = 0;
> 
>-			send_netdump_msg(&np, tmp, strlen(tmp), &reply);
>-
> 			netdump_mode = 0;
>+			netdump_emit_printks = 1;
> 			if (regs)
> 				show_regs(regs);
> 			show_state();
> 			show_mem();
> 			netdump_mode = 1;
>+			netdump_emit_printks = 0;
>+
>+			send_netdump_msg(&np, tmp, strlen(tmp), &reply);
> 			break;
> 
> 		default:
>Index: linux-2.6.9/drivers/net/netconsole.c
>===================================================================
>--- linux-2.6.9.orig/drivers/net/netconsole.c
>+++ linux-2.6.9/drivers/net/netconsole.c
>@@ -118,7 +118,7 @@ static void write_msg(struct console *co
> 	if (!np.dev && !netlog_np.dev)
> 		return;
> 
>-	if (unlikely(crashdump_mode()))
>+	if (unlikely(!netdump_emit_printks))
> 		return;
> 
> 	local_irq_save(flags);
>Index: linux-2.6.9/include/linux/kernel.h
>===================================================================
>--- linux-2.6.9.orig/include/linux/kernel.h
>+++ linux-2.6.9/include/linux/kernel.h
>@@ -154,6 +154,7 @@ struct pt_regs;
> extern void try_crashdump(struct pt_regs *);
> extern void (*netdump_func) (struct pt_regs *regs);
> extern int netdump_mode;
>+extern int netdump_emit_printks;
> extern void (*diskdump_func) (struct pt_regs *regs);
> extern int diskdump_mode;
>

Actions: View | Diff

Attachments on bug 226701: 147064 | 147065 | 148441 | 148827 | 148828 | 148947 | 149359