Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:

 - some of the rest of MM

 - various misc things

 - dynamic-debug updates

 - checkpatch

 - some epoll speedups

 - autofs

 - rapidio

 - lib/, lib/lzo/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (83 commits)
  samples/mic/mpssd/mpssd.h: remove duplicate header
  kernel/fork.c: remove duplicated include
  include/linux/relay.h: fix percpu annotation in struct rchan
  arch/nios2/mm/fault.c: remove duplicate include
  unicore32: stop printing the virtual memory layout
  MAINTAINERS: fix GTA02 entry and mark as orphan
  mm: create the new vm_fault_t type
  arm, s390, unicore32: remove oneliner wrappers for memblock_alloc()
  arch: simplify several early memory allocations
  openrisc: simplify pte_alloc_one_kernel()
  sh: prefer memblock APIs returning virtual address
  microblaze: prefer memblock API returning virtual address
  powerpc: prefer memblock APIs returning virtual address
  lib/lzo: separate lzo-rle from lzo
  lib/lzo: implement run-length encoding
  lib/lzo: fast 8-byte copy on arm64
  lib/lzo: 64-bit CTZ on arm64
  lib/lzo: tidy-up ifdefs
  ipc/sem.c: replace kvmalloc/memset with kvzalloc and use struct_size
  ipc: annotate implicit fall through
  ...

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index dbf2b457e47e..7bdf98c37e91 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -847,17 +847,19 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n,
                              const char *name)
 {
         struct ddebug_table *dt;
-        const char *new_name;
 
         dt = kzalloc(sizeof(*dt), GFP_KERNEL);
-        if (dt == NULL)
-                return -ENOMEM;
-        new_name = kstrdup_const(name, GFP_KERNEL);
-        if (new_name == NULL) {
-                kfree(dt);
+        if (dt == NULL) {
+                pr_err("error adding module: %s\n", name);
                 return -ENOMEM;
         }
-        dt->mod_name = new_name;
+        /*
+         * For built-in modules, name lives in .rodata and is
+         * immortal. For loaded modules, name points at the name[]
+         * member of struct module, which lives at least as long as
+         * this struct ddebug_table.
+         */
+        dt->mod_name = name;
         dt->num_ddebugs = n;
         dt->ddebugs = tab;
 
@@ -868,7 +870,6 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n,
         vpr_info("%u debug prints in module %s\n", n, dt->mod_name);
         return 0;
 }
-EXPORT_SYMBOL_GPL(ddebug_add_module);
 
 /* helper for ddebug_dyndbg_(boot|module)_param_cb */
 static int ddebug_dyndbg_param_cb(char *param, char *val,
@@ -913,7 +914,6 @@ int ddebug_dyndbg_module_param_cb(char *param, char *val, const char *module)
 static void ddebug_table_free(struct ddebug_table *dt)
 {
         list_del_init(&dt->link);
-        kfree_const(dt->mod_name);
         kfree(dt);
 }
 
@@ -930,15 +930,15 @@ int ddebug_remove_module(const char *mod_name)
 
         mutex_lock(&ddebug_lock);
         list_for_each_entry_safe(dt, nextdt, &ddebug_tables, link) {
-                if (!strcmp(dt->mod_name, mod_name)) {
+                if (dt->mod_name == mod_name) {
                         ddebug_table_free(dt);
                         ret = 0;
+                        break;
                 }
         }
         mutex_unlock(&ddebug_lock);
         return ret;
 }
-EXPORT_SYMBOL_GPL(ddebug_remove_module);
 
 static void ddebug_remove_all_tables(void)
 {