Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
  mm: memory hotplug: Check if pages are correctly reserved on a per-section basis
  Revert "memory hotplug: Correct page reservation checking"
  Update email address for stable patch submission
  dynamic_debug: fix undefined reference to `__netdev_printk'
  dynamic_debug: use a single printk() to emit messages
  dynamic_debug: remove num_enabled accounting
  dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
  uio: Support physical addresses >32 bits on 32-bit systems
  sysfs: add unsigned long cast to prevent compile warning
  drivers: base: print rejected matches with DEBUG_DRIVER
  memory hotplug: Correct page reservation checking
  memory hotplug: Refuse to add unaligned memory regions
  remove the messy code file Documentation/zh_CN/SubmitChecklist
  ARM: mxc: convert device creation to use platform_device_register_full
  new helper to create platform devices with dma mask
  docs/driver-model: Update device class docs
  docs/driver-model: Document device.groups
  kobj_uevent: Ignore if some listeners cannot handle message
  dynamic_debug: make netif_dbg() call __netdev_printk()
  dynamic_debug: make netdev_dbg() call __netdev_printk()
  ...

2 files changed, 120 insertions, 55 deletions

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 79fc20b65e74..dcdade39e47f 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -10,6 +10,8 @@
  * Copyright (C) 2011 Bart Van Assche.  All Rights Reserved.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -29,6 +31,8 @@
 #include <linux/jump_label.h>
 #include <linux/hardirq.h>
 #include <linux/sched.h>
+#include <linux/device.h>
+#include <linux/netdevice.h>
 
 extern struct _ddebug __start___verbose[];
 extern struct _ddebug __stop___verbose[];
@@ -37,7 +41,6 @@ struct ddebug_table {
         struct list_head link;
         char *mod_name;
         unsigned int num_ddebugs;
-        unsigned int num_enabled;
         struct _ddebug *ddebugs;
 };
 
@@ -147,19 +150,13 @@ static void ddebug_change(const struct ddebug_query *query,
                         newflags = (dp->flags & mask) | flags;
                         if (newflags == dp->flags)
                                 continue;
-
-                        if (!newflags)
-                                dt->num_enabled--;
-                        else if (!dp->flags)
-                                dt->num_enabled++;
                         dp->flags = newflags;
                         if (newflags)
                                 dp->enabled = 1;
                         else
                                 dp->enabled = 0;
                         if (verbose)
-                                printk(KERN_INFO
-                                        "ddebug: changed %s:%d [%s]%s %s\n",
+                                pr_info("changed %s:%d [%s]%s %s\n",
                                         dp->filename, dp->lineno,
                                         dt->mod_name, dp->function,
                                         ddebug_describe_flags(dp, flagbuf,
@@ -169,7 +166,7 @@ static void ddebug_change(const struct ddebug_query *query,
         mutex_unlock(&ddebug_lock);
 
         if (!nfound && verbose)
-                printk(KERN_INFO "ddebug: no matches for query\n");
+                pr_info("no matches for query\n");
 }
 
 /*
@@ -214,10 +211,10 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
 
         if (verbose) {
                 int i;
-                printk(KERN_INFO "%s: split into words:", __func__);
+                pr_info("split into words:");
                 for (i = 0 ; i < nwords ; i++)
-                        printk(" \"%s\"", words[i]);
-                printk("\n");
+                        pr_cont(" \"%s\"", words[i]);
+                pr_cont("\n");
         }
 
         return nwords;
@@ -329,16 +326,15 @@ static int ddebug_parse_query(char *words[], int nwords,
                         }
                 } else {
                         if (verbose)
-                                printk(KERN_ERR "%s: unknown keyword \"%s\"\n",
-                                        __func__, words[i]);
+                                pr_err("unknown keyword \"%s\"\n", words[i]);
                         return -EINVAL;
                 }
         }
 
         if (verbose)
-                printk(KERN_INFO "%s: q->function=\"%s\" q->filename=\"%s\" "
-                       "q->module=\"%s\" q->format=\"%s\" q->lineno=%u-%u\n",
-                        __func__, query->function, query->filename,
+                pr_info("q->function=\"%s\" q->filename=\"%s\" "
+                        "q->module=\"%s\" q->format=\"%s\" q->lineno=%u-%u\n",
+                        query->function, query->filename,
                         query->module, query->format, query->first_lineno,
                         query->last_lineno);
 
@@ -367,7 +363,7 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp,
                 return -EINVAL;
         }
         if (verbose)
-                printk(KERN_INFO "%s: op='%c'\n", __func__, op);
+                pr_info("op='%c'\n", op);
 
         for ( ; *str ; ++str) {
                 for (i = ARRAY_SIZE(opt_array) - 1; i >= 0; i--) {
@@ -382,7 +378,7 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp,
         if (flags == 0)
                 return -EINVAL;
         if (verbose)
-                printk(KERN_INFO "%s: flags=0x%x\n", __func__, flags);
+                pr_info("flags=0x%x\n", flags);
 
         /* calculate final *flagsp, *maskp according to mask and op */
         switch (op) {
@@ -400,8 +396,7 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp,
                 break;
         }
         if (verbose)
-                printk(KERN_INFO "%s: *flagsp=0x%x *maskp=0x%x\n",
-                        __func__, *flagsp, *maskp);
+                pr_info("*flagsp=0x%x *maskp=0x%x\n", *flagsp, *maskp);
         return 0;
 }
 
@@ -426,40 +421,117 @@ static int ddebug_exec_query(char *query_string)
         return 0;
 }
 
+#define PREFIX_SIZE 64
+
+static int remaining(int wrote)
+{
+        if (PREFIX_SIZE - wrote > 0)
+                return PREFIX_SIZE - wrote;
+        return 0;
+}
+
+static char *dynamic_emit_prefix(const struct _ddebug *desc, char *buf)
+{
+        int pos_after_tid;
+        int pos = 0;
+
+        pos += snprintf(buf + pos, remaining(pos), "%s", KERN_DEBUG);
+        if (desc->flags & _DPRINTK_FLAGS_INCL_TID) {
+                if (in_interrupt())
+                        pos += snprintf(buf + pos, remaining(pos), "%s ",
+                                                "<intr>");
+                else
+                        pos += snprintf(buf + pos, remaining(pos), "[%d] ",
+                                                task_pid_vnr(current));
+        }
+        pos_after_tid = pos;
+        if (desc->flags & _DPRINTK_FLAGS_INCL_MODNAME)
+                pos += snprintf(buf + pos, remaining(pos), "%s:",
+                                        desc->modname);
+        if (desc->flags & _DPRINTK_FLAGS_INCL_FUNCNAME)
+                pos += snprintf(buf + pos, remaining(pos), "%s:",
+                                        desc->function);
+        if (desc->flags & _DPRINTK_FLAGS_INCL_LINENO)
+                pos += snprintf(buf + pos, remaining(pos), "%d:", desc->lineno);
+        if (pos - pos_after_tid)
+                pos += snprintf(buf + pos, remaining(pos), " ");
+        if (pos >= PREFIX_SIZE)