module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix

fix build with CONFIG_MODULES=n, tweak code layout

Cc: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/include/linux/module.h b/include/linux/module.h
index 29d81547837d240fcea937ae1599b7b640647e89..8a298d820dbce63195f0c7238f719e8744b7679c 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -746,6 +746,7 @@ static inline const char *module_address_lookup(unsigned long addr,
                                          unsigned long *symbolsize,
                                          unsigned long *offset,
                                          char **modname,
+                                         const unsigned char **modbuildid,
                                          char *namebuf)
 {
        return NULL;

diff --git a/kernel/module.c b/kernel/module.c
index 7f73b3152943e0bc40219075e992332d0bf6cca1..e9bca16243628d0626a6d29a47597df6acc1762d 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4271,7 +4271,8 @@ void * __weak dereference_module_function_descriptor(struct module *mod,
 const char *module_address_lookup(unsigned long addr,
                            unsigned long *size,
                            unsigned long *offset,
-                           char **modname, const unsigned char **modbuildid,
+                           char **modname,
+                           const unsigned char **modbuildid,
                            char *namebuf)
 {
        const char *ret = NULL;