diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-18 15:33:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-18 15:33:34 -0700 |
| commit | 9b7a6012897c8eff3a206a5c3c974ad4e1989fe2 (patch) | |
| tree | 877bb956c15131b360a34dfb611519d2a75413fb | |
| parent | 44ab72f449717b491da35d3cd23389412ca7a655 (diff) | |
| download | patches-9b7a6012897c8eff3a206a5c3c974ad4e1989fe2.tar.gz | |
dynamic debugging merge
| -rw-r--r-- | driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch | 19 | ||||
| -rw-r--r-- | f.patch | 26 | ||||
| -rw-r--r-- | series | 1 |
3 files changed, 11 insertions, 35 deletions
diff --git a/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch b/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch index 867a3ccdbd9dbc..c0f6bd58fe38a8 100644 --- a/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch +++ b/driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch @@ -73,18 +73,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Documentation/kernel-parameters.txt | 5 include/asm-generic/vmlinux.lds.h | 10 include/linux/device.h | 6 - include/linux/dynamic_printk.h | 96 ++++++++ + include/linux/dynamic_printk.h | 93 ++++++++ include/linux/kernel.h | 7 include/linux/module.h | 4 kernel/module.c | 22 + lib/Kconfig.debug | 55 ++++ lib/Makefile | 2 - lib/dynamic_printk.c | 412 ++++++++++++++++++++++++++++++++++++ + lib/dynamic_printk.c | 418 ++++++++++++++++++++++++++++++++++++ net/netfilter/nf_conntrack_pptp.c | 2 scripts/Makefile.lib | 11 scripts/basic/Makefile | 2 scripts/basic/hash.c | 64 +++++ - 14 files changed, 692 insertions(+), 6 deletions(-) + 14 files changed, 695 insertions(+), 6 deletions(-) --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -136,13 +136,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #else --- /dev/null +++ b/include/linux/dynamic_printk.h -@@ -0,0 +1,96 @@ +@@ -0,0 +1,93 @@ +#ifndef _DYNAMIC_PRINTK_H +#define _DYNAMIC_PRINTK_H + -+#include <linux/string.h> -+#include <linux/hash.h> -+ +#define DYNAMIC_DEBUG_HASH_BITS 6 +#define DEBUG_HASH_TABLE_SIZE (1 << DYNAMIC_DEBUG_HASH_BITS) + @@ -331,7 +328,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto cleanup; --- /dev/null +++ b/lib/dynamic_printk.c -@@ -0,0 +1,412 @@ +@@ -0,0 +1,418 @@ +/* + * lib/dynamic_printk.c + * @@ -622,6 +619,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + num_enabled++; + dynamic_enabled = DYNAMIC_ENABLED_SOME; + err = 0; ++ printk(KERN_DEBUG ++ "debugging enabled for module %s", ++ elem->name); + } else if (!value && (elem->enable == 1)) { + elem->enable = 0; + num_enabled--; @@ -638,6 +638,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + dynamic_enabled = + DYNAMIC_ENABLED_NONE; + err = 0; ++ printk(KERN_DEBUG ++ "debugging disabled for module " ++ "%s", elem->name); + } + } + } diff --git a/f.patch b/f.patch deleted file mode 100644 index 4fba7f3be76ed1..00000000000000 --- a/f.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- - lib/dynamic_printk.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/lib/dynamic_printk.c -+++ b/lib/dynamic_printk.c -@@ -288,6 +288,9 @@ static ssize_t pr_debug_write(struct fil - num_enabled++; - dynamic_enabled = DYNAMIC_ENABLED_SOME; - err = 0; -+ printk(KERN_DEBUG -+ "debugging enabled for module %s", -+ elem->name); - } else if (!value && (elem->enable == 1)) { - elem->enable = 0; - num_enabled--; -@@ -304,6 +307,9 @@ static ssize_t pr_debug_write(struct fil - dynamic_enabled = - DYNAMIC_ENABLED_NONE; - err = 0; -+ printk(KERN_DEBUG -+ "debugging disabled for module " -+ "%s", elem->name); - } - } - } @@ -133,4 +133,3 @@ usb/usb-gotemp.patch #ns/module-usb-serial.patch #ns/modpost -f.patch |