Merge 4.15-rc3 into driver-core-next

We want the fixes and changes in here for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/module.c b/kernel/module.c
index f0411a271765..dea01ac9cb74 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4157,7 +4157,7 @@ static int m_show(struct seq_file *m, void *p)
 {
         struct module *mod = list_entry(p, struct module, list);
         char buf[MODULE_FLAGS_BUF_SIZE];
-        unsigned long value;
+        void *value;
 
         /* We always ignore unformed modules. */
         if (mod->state == MODULE_STATE_UNFORMED)
@@ -4173,8 +4173,8 @@ static int m_show(struct seq_file *m, void *p)
                    mod->state == MODULE_STATE_COMING ? "Loading" :
                    "Live");
         /* Used by oprofile and other similar tools. */
-        value = m->private ? 0 : (unsigned long)mod->core_layout.base;
-        seq_printf(m, " 0x" KALLSYM_FMT, value);
+        value = m->private ? NULL : mod->core_layout.base;
+        seq_printf(m, " 0x%px", value);
 
         /* Taints info */
         if (mod->taints)