remove gdb patch from 4.4 series

diff --git a/queue-4.4/scripts-gdb-account-for-changes-in-module-data-structure.patch b/queue-4.4/scripts-gdb-account-for-changes-in-module-data-structure.patch
deleted file mode 100644 (file)
index d6833c5..0000000
--- a/queue-4.4/scripts-gdb-account-for-changes-in-module-data-structure.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ad4db3b24a93e52a92ad8f9b0273a9416f202c23 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Tue, 22 Mar 2016 14:27:39 -0700
-Subject: scripts/gdb: account for changes in module data structure
-
-From: Jan Kiszka <jan.kiszka@siemens.com>
-
-commit ad4db3b24a93e52a92ad8f9b0273a9416f202c23 upstream.
-
-Commit 7523e4dc5057 ("module: use a structure to encapsulate layout.")
-factored out the module_layout structure.  Adjust the symbol loader and
-the lsmod command to this.
-
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
-Reviewed-by: Kieran Bingham <kieran.bingham@linaro.org>
-Tested-by: Kieran Bingham <kieran.bingham@linaro.org> (qemu-{ARM,x86})
-Cc: Rusty Russell <rusty@rustcorp.com.au>
-Cc: Jiri Kosina <jkosina@suse.cz>
-Cc: Jason Wessel <jason.wessel@windriver.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- scripts/gdb/linux/modules.py |    5 +++--
- scripts/gdb/linux/symbols.py |    2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
---- a/scripts/gdb/linux/modules.py
-+++ b/scripts/gdb/linux/modules.py
-@@ -73,10 +73,11 @@ class LxLsmod(gdb.Command):
-                 "        " if utils.get_long_type().sizeof == 8 else ""))
- 
-         for module in module_list():
-+            layout = module['core_layout']
-             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
--                address=str(module['module_core']).split()[0],
-+                address=str(layout['base']).split()[0],
-                 name=module['name'].string(),
--                size=str(module['core_size']),
-+                size=str(layout['size']),
-                 ref=str(module['refcnt']['counter'])))
- 
-             source_list = module['source_list']
---- a/scripts/gdb/linux/symbols.py
-+++ b/scripts/gdb/linux/symbols.py
-@@ -108,7 +108,7 @@ lx-symbols command."""
- 
-     def load_module_symbols(self, module):
-         module_name = module['name'].string()
--        module_addr = str(module['module_core']).split()[0]
-+        module_addr = str(module['core_layout']['base']).split()[0]
- 
-         module_file = self._get_module_file(module_name)
-         if not module_file and not self.module_files_updated:

diff --git a/queue-4.4/series b/queue-4.4/series
index 2790a9e091d68efa2c5e872bfd896b4d8a4e14d7..7fdf1fc620b689218b997666012c305f34e6b63f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -150,7 +150,6 @@ md-raid5-preserve-stripe_preread_active-in-break_stripe_batch_list.patch
 md-multipath-don-t-hardcopy-bio-in-.make_request-path.patch
 fuse-do-not-use-iocb-after-it-may-have-been-freed.patch
 fuse-add-reference-counting-for-fuse_io_priv.patch
-scripts-gdb-account-for-changes-in-module-data-structure.patch
 fs-coredump-prevent-fsuid-0-dumps-into-user-controlled-directories.patch
 rapidio-rionet-fix-deadlock-on-smp.patch
 ipr-fix-out-of-bounds-null-overwrite.patch