diff options
author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /scripts/gdb/linux/utils.py | |
parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
parent | 931830aa5c251e0803523213428f777a48bde254 (diff) |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'scripts/gdb/linux/utils.py')
-rw-r--r-- | scripts/gdb/linux/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gdb/linux/utils.py b/scripts/gdb/linux/utils.py index 128c306db3ee..0893b326a28b 100644 --- a/scripts/gdb/linux/utils.py +++ b/scripts/gdb/linux/utils.py | |||
@@ -83,7 +83,7 @@ def get_target_endianness(): | |||
83 | elif "big endian" in endian: | 83 | elif "big endian" in endian: |
84 | target_endianness = BIG_ENDIAN | 84 | target_endianness = BIG_ENDIAN |
85 | else: | 85 | else: |
86 | raise gdb.GdgError("unknown endianness '{0}'".format(str(endian))) | 86 | raise gdb.GdbError("unknown endianness '{0}'".format(str(endian))) |
87 | return target_endianness | 87 | return target_endianness |
88 | 88 | ||
89 | 89 | ||
@@ -151,6 +151,6 @@ def get_gdbserver_type(): | |||
151 | gdbserver_type = GDBSERVER_QEMU | 151 | gdbserver_type = GDBSERVER_QEMU |
152 | elif probe_kgdb(): | 152 | elif probe_kgdb(): |
153 | gdbserver_type = GDBSERVER_KGDB | 153 | gdbserver_type = GDBSERVER_KGDB |
154 | if not gdbserver_type is None and hasattr(gdb, 'events'): | 154 | if gdbserver_type is not None and hasattr(gdb, 'events'): |
155 | gdb.events.exited.connect(exit_handler) | 155 | gdb.events.exited.connect(exit_handler) |
156 | return gdbserver_type | 156 | return gdbserver_type |