From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 2 Jun 2021 03:53:28 +0000 (+1000)
Subject: module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=da956650e40529254e6c09c93dc16b58f7707188;p=users%2Fjedix%2Flinux-maple.git

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 29d81547837d2..8a298d820dbce 100644
--- 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 7f73b3152943e..e9bca16243628 100644
--- 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;