diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:09:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:09:15 -0800 |
commit | e4528d696f0fbb8eda231e2696b9ce0660f1e814 (patch) | |
tree | 84d88ee57b17b1830e1f1f7adb14773fe15d58c4 /scripts/show_delta | |
parent | d72681d7c61f32a89147b8867cfb80e4ea119972 (diff) | |
parent | 6cf3a6eff77273a55b996a5a43f342b150cfba09 (diff) | |
download | op-kernel-dev-e4528d696f0fbb8eda231e2696b9ce0660f1e814.zip op-kernel-dev-e4528d696f0fbb8eda231e2696b9ce0660f1e814.tar.gz |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild changes from Michal Marek:
- make tags fixes again
- scripts/show_delta fix for newer python
- scripts/kernel-doc does not fail on unknown function prototype
- one less coccinelle check this time
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/tags.sh: remove obsolete __devinit[const|data]
scripts/kernel-doc: make unknown function prototype a Warning instead of an Error
show_delta: Update script to support python versions 2.5 through 3.3
scripts/coccinelle/api: remove devm_request_and_ioremap.cocci
scripts/tags.sh: Increase identifier list
Diffstat (limited to 'scripts/show_delta')
-rwxr-xr-x | scripts/show_delta | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/show_delta b/scripts/show_delta index 17df305..e25732b 100755 --- a/scripts/show_delta +++ b/scripts/show_delta @@ -13,7 +13,7 @@ import sys import string def usage(): - print """usage: show_delta [<options>] <filename> + print ("""usage: show_delta [<options>] <filename> This program parses the output from a set of printk message lines which have time data prefixed because the CONFIG_PRINTK_TIME option is set, or @@ -35,7 +35,7 @@ ex: $ dmesg >timefile will show times relative to the line in the kernel output starting with "NET4". -""" +""") sys.exit(1) # returns a tuple containing the seconds and text for each message line @@ -94,11 +94,11 @@ def main(): try: lines = open(filein,"r").readlines() except: - print "Problem opening file: %s" % filein + print ("Problem opening file: %s" % filein) sys.exit(1) if base_str: - print 'base= "%s"' % base_str + print ('base= "%s"' % base_str) # assume a numeric base. If that fails, try searching # for a matching line. try: @@ -117,13 +117,13 @@ def main(): # stop at first match break if not found: - print 'Couldn\'t find line matching base pattern "%s"' % base_str + print ('Couldn\'t find line matching base pattern "%s"' % base_str) sys.exit(1) else: base_time = 0.0 for line in lines: - print convert_line(line, base_time), + print (convert_line(line, base_time),) main() |