Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux.git] / scripts / decode_stacktrace.sh

diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh
index c332684e1b5ace1e4ea8a357ed83b5931e04cdfd..5206d99ddeb876e0456e6aa0d088e168219005a7 100755 (executable)
--- a/scripts/decode_stacktrace.sh
+++ b/scripts/decode_stacktrace.sh
@@ -139,7 +139,8 @@ handle_line() {
 
 while read line; do
        # Let's see if we have an address in the line
-       if [[ $line =~ \[\<([^]]+)\>\]  ]]; then
+       if [[ $line =~ \[\<([^]]+)\>\] ]] ||
+          [[ $line =~ [^+\ ]+\+0x[0-9a-f]+/0x[0-9a-f]+ ]]; then
                # Translate address to line numbers
                handle_line "$line"
        # Is it a code line?