[folded-merged] module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix
has been removed from the -mm tree.  Its filename was
     module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix.patch

This patch was dropped because it was folded into module-add-printk-formats-to-add-module-build-id-to-stacktraces.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/module.h |    1 +
 kernel/module.c        |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- a/include/linux/module.h~module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix
+++ a/include/linux/module.h
@@ -746,6 +746,7 @@ static inline const char *module_address
 					  unsigned long *symbolsize,
 					  unsigned long *offset,
 					  char **modname,
+					  const unsigned char **modbuildid,
 					  char *namebuf)
 {
 	return NULL;
--- a/kernel/module.c~module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix
+++ a/kernel/module.c
@@ -4275,7 +4275,8 @@ void * __weak dereference_module_functio
 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;
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

module-add-printk-formats-to-add-module-build-id-to-stacktraces.patch
module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix-fix.patch
mm.patch
lazy-tlb-allow-lazy-tlb-mm-refcounting-to-be-configurable-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux