diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 06:28:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 06:28:22 -0700 |
| commit | fe83d996a57d531befd6e154b407f439b830cb3b (patch) | |
| tree | c99e72f616aa4736a68d8ab2eebb5425de78dca2 | |
| parent | 4c2bf7d0bb2e0975c03869cbcd2a629e2210b4f2 (diff) | |
| download | patches-fe83d996a57d531befd6e154b407f439b830cb3b.tar.gz | |
linux-next bugs fixed
| -rw-r--r-- | driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch | 173 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | usb/usb-gadget-rndis-fix-up-coding-style-issues-in-the-file.patch | 2 |
3 files changed, 1 insertions, 175 deletions
diff --git a/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch b/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch deleted file mode 100644 index 493ef623f4025e..00000000000000 --- a/driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch +++ /dev/null @@ -1,173 +0,0 @@ -From trenn@suse.de Wed Sep 1 11:46:46 2010 -From: Thomas Renninger <trenn@suse.de> -To: penberg@cs.helsinki.fi, jbaron@redhat.com, greg@kroah.com -Cc: trenn@suse.de, greg@kroah.com -Subject: Dynamic Debug: Introduce global fake module param module.ddebug -Date: Fri, 6 Aug 2010 16:11:04 +0200 -Message-Id: <1281103864-18860-5-git-send-email-trenn@suse.de> - - -Dynamic Debug allows enabling of pr_debug or KERN_DEBUG messages at runtime. -This is controlled via /sys/kernel/debug/dynamic_debug/control. -One major drawback is that the whole initialization of a module cannot be -tracked, because ddebug is only aware of debug strings of loaded modules. -But this is the most interesting part... - -This patch introduces a fake module parameter module.ddebug(not shown in -/sys/module/*/parameters, thus it does not use any resources/memory). - -If a module passes ddebug as a module parameter (e.g. via module.ddebug -kernel boot param or via "modprobe module ddebug"), all debug strings of this -module get activated by issuing "module module_name +p" internally -(not via sysfs) when the module gets loaded. - -Possible enhancements for the future if ddebug might get extended with -further flags: -module.ddebug=flags -Then module.ddebug="p" would be the same as module.ddebug, but if there -is a "x" ddebug flag added, one could pass: -module.ddebug="xp" -which would result in such a dynamic debug query: -module module_name +xp - -Modules must not use "ddebug" as module parameter or it will get ignored. -If it's tried, a warning will show up at module load time that it will get -ignored (this is the only part which got added late and is compile tested only). - -Tested with (additional added pr_debug messages): -options hp-wmi ddebug -in modprobe.conf --> works and pr_debug messages issued at module initialization time show -up. Also "p" flag gets set for the whole hp-wmi module: -grep hp-wmi /sys/../dynamic_debug/control - -Signed-off-by: Thomas Renninger <trenn@suse.de> -Acked-by: Jason Baron <jbaron@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/dynamic-debug-howto.txt | 28 +++++++++++++++++++++++++++- - include/linux/dynamic_debug.h | 5 +++++ - kernel/params.c | 17 ++++++++++++++++- - lib/dynamic_debug.c | 2 +- - 4 files changed, 49 insertions(+), 3 deletions(-) - ---- a/Documentation/dynamic-debug-howto.txt -+++ b/Documentation/dynamic-debug-howto.txt -@@ -213,7 +213,7 @@ Note also that there is no convenient sy - the flags at once, you need to use "-psc". - - --Debug messages during boot process -+Debug Messages during Boot Process - ================================== - - To be able to activate debug messages during the boot process, -@@ -232,6 +232,32 @@ PCI (or other devices) initialization al - this boot parameter for debugging purposes. - - -+Debug Messages at Module Initialization Time -+============================================ -+ -+Enabling debug messages inside a module is only possible if the module itself -+is loaded already. If you unload a module, the dynamic debug flags associated -+to its debug messages are lost. -+Therefore, enabling debug messages that get processed at module initialization -+time through the <debugfs>/dynamic_debug/control interface is not possible. -+Instead, a "ddebug" module paramter can be passed: -+ -+ - via kernel boot parameter: -+ module.ddebug -+ -+ - as an ordinary module parameter via modprobe -+ modprobe module ddebug -+ -+ - or the parameter can be used permanently via modprobe.conf(.local) -+ options module ddebug -+ -+The ddebug option is not implemented as an ordinary module parameter and thus -+will not show up in /sys/module/module_name/parameters/ddebug -+The settings can get reverted through the sysfs interface again when the -+module got loaded as soon as debug messages are not needed anymore: -+echo "module module_name -p" > <debugfs>/dynamic_debug/control -+as described in the "Command Language Reference" chapter above. -+ - Examples - ======== - ---- a/include/linux/dynamic_debug.h -+++ b/include/linux/dynamic_debug.h -@@ -41,6 +41,7 @@ int ddebug_add_module(struct _ddebug *ta - - #if defined(CONFIG_DYNAMIC_DEBUG) - extern int ddebug_remove_module(const char *mod_name); -+extern int ddebug_exec_query(char *query_string); - - #define __dynamic_dbg_enabled(dd) ({ \ - int __ret = 0; \ -@@ -77,6 +78,10 @@ static inline int ddebug_remove_module(c - { - return 0; - } -+static inline int ddebug_exec_query(char *query_string) -+{ -+ return 0; -+} - - #define dynamic_pr_debug(fmt, ...) \ - do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0) ---- a/kernel/params.c -+++ b/kernel/params.c -@@ -24,6 +24,7 @@ - #include <linux/err.h> - #include <linux/slab.h> - #include <linux/ctype.h> -+#include <linux/dynamic_debug.h> - - #if 0 - #define DEBUGP printk -@@ -175,10 +176,17 @@ int parse_args(const char *name, - unsigned num, - int (*unknown)(char *param, char *val)) - { -- char *param, *val; -+ char *param, *val, ddebug[1024]; -+ int i; - - DEBUGP("Parsing ARGS: %s\n", args); - -+ for (i = 0; i < num; i++) { -+ if (parameq("ddebug", params[i].name)) -+ pr_warning("Module %s uses reserved keyword *ddebug* as" -+ "parameter which will get ignored\n", name); -+ } -+ - /* Chew leading spaces */ - args = skip_spaces(args); - -@@ -187,6 +195,13 @@ int parse_args(const char *name, - int irq_was_disabled; - - args = next_arg(args, ¶m, &val); -+ -+ if (parameq(param, "ddebug")) { -+ snprintf(ddebug, 1024, "module %s +p", name); -+ ddebug_exec_query(ddebug); -+ continue; -+ } -+ - irq_was_disabled = irqs_disabled(); - ret = parse_one(param, val, params, num, unknown); - if (irq_was_disabled && !irqs_disabled()) { ---- a/lib/dynamic_debug.c -+++ b/lib/dynamic_debug.c -@@ -429,7 +429,7 @@ static int ddebug_parse_flags(const char - return 0; - } - --static int ddebug_exec_query(char *query_string) -+int ddebug_exec_query(char *query_string) - { - unsigned int flags = 0, mask = 0; - struct ddebug_query query; @@ -42,7 +42,6 @@ staging.current/staging-vt6655-fix-buffer-overflow.patch driver-core/dynamic-debug-split-out-query-string-parsing-setup-from-proc_write.patch driver-core/dynamic-debug-introduce-ddebug_query-boot-parameter.patch driver-core/dynamic-debug-initialize-dynamic-debug-earlier-via-arch_initcall.patch -driver-core/dynamic-debug-introduce-global-fake-module-param-module.ddebug.patch driver-core/driver-core-platform-use-drv-driver.bus-instead-of-assuming-platform_bus_type.patch driver-core/uio-do-not-use-pci-resources-before-pci_enable_device.patch driver-core/driver-core-platform_bus-allow-runtime-override-of-dev_pm_ops.patch diff --git a/usb/usb-gadget-rndis-fix-up-coding-style-issues-in-the-file.patch b/usb/usb-gadget-rndis-fix-up-coding-style-issues-in-the-file.patch index 794f516608e6cf..5d6002db88485b 100644 --- a/usb/usb-gadget-rndis-fix-up-coding-style-issues-in-the-file.patch +++ b/usb/usb-gadget-rndis-fix-up-coding-style-issues-in-the-file.patch @@ -984,7 +984,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - (void *)(rndis_per_dev_params + i)))) - { - pr_debug("%s :remove entries", __func__); -+ (void *)(rndis_per_dev_params + i)) ++ (void *)(rndis_per_dev_params + i)); + if (!rndis_connect_state[i]) { + pr_debug("%s: remove entries", __func__); while (i) { |