Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
  code cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
  mm: Convert print_symbol to %pSR
  gfs2: Convert print_symbol to %pSR
  m32r: Convert print_symbol to %pSR
  iostats.txt: add easy-to-find description for field 6
  x86 cmpxchg.h: fix wrong comment
  treewide: Fix typo in printk and comments
  doc: devicetree: Fix various typos
  docbook: fix 8250 naming in device-drivers
  pata_pdc2027x: Fix compiler warning
  treewide: Fix typo in printks
  mei: Fix comments in drivers/misc/mei
  treewide: Fix typos in kernel messages
  pm44xx: Fix comment for "CONFIG_CPU_IDLE"
  doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
  mmzone: correct "pags" to "pages" in comment.
  kernel-parameters: remove outdated 'noresidual' parameter
  Remove spurious _H suffixes from ifdef comments
  sound: Remove stray pluses from Kconfig file
  radio-shark: Fix printk "CONFIG_LED_CLASS"
  doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
  ...

3 files changed, 9 insertions, 11 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 9b9aeef8e590..f8feeeca6686 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1761,7 +1761,7 @@ static struct hstate *kobj_to_node_hstate(struct kobject *kobj, int *nidp)
  * Unregister hstate attributes from a single node device.
  * No-op if no hstate attributes attached.
  */
-void hugetlb_unregister_node(struct node *node)
+static void hugetlb_unregister_node(struct node *node)
 {
         struct hstate *h;
         struct node_hstate *nhs = &node_hstates[node->dev.id];
@@ -1805,7 +1805,7 @@ static void hugetlb_unregister_all_nodes(void)
  * Register hstate attributes for a single node device.
  * No-op if attributes already registered.
  */
-void hugetlb_register_node(struct node *node)
+static void hugetlb_register_node(struct node *node)
 {
         struct hstate *h;
         struct node_hstate *nhs = &node_hstates[node->dev.id];
diff --git a/mm/memory.c b/mm/memory.c
index f7a1fba85d14..6dc1882fbd72 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -715,11 +715,11 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
          * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
          */
         if (vma->vm_ops)
-                print_symbol(KERN_ALERT "vma->vm_ops->fault: %s\n",
-                                (unsigned long)vma->vm_ops->fault);
+                printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
+                       vma->vm_ops->fault);
         if (vma->vm_file && vma->vm_file->f_op)
-                print_symbol(KERN_ALERT "vma->vm_file->f_op->mmap: %s\n",
-                                (unsigned long)vma->vm_file->f_op->mmap);
+                printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
+                       vma->vm_file->f_op->mmap);
         dump_stack();
         add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
 }
diff --git a/mm/slab.c b/mm/slab.c
index 856e4a192d25..96079244c860 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2040,11 +2040,9 @@ static void print_objinfo(struct kmem_cache *cachep, void *objp, int lines)
         }
 
         if (cachep->flags & SLAB_STORE_USER) {
-                printk(KERN_ERR "Last user: [<%p>]",
-                        *dbg_userword(cachep, objp));
-                print_symbol("(%s)",
-                                (unsigned long)*dbg_userword(cachep, objp));
-                printk("\n");
+                printk(KERN_ERR "Last user: [<%p>](%pSR)\n",
+                       *dbg_userword(cachep, objp),
+                       *dbg_userword(cachep, objp));
         }
         realobj = (char *)objp + obj_offset(cachep);
         size = cachep->object_size;