From 93300cd754a2bbdb2bf4d3859ba774535f73ebe7 Mon Sep 17 00:00:00 2001 From: Todd Broch Date: Tue, 18 Jan 2011 10:05:21 -0800 Subject: [PATCH 1/2] Revert "build_kernel_image: enable nmi watchdog" This reverts commit ea621903e927acf77889bcda4fa71636f4af7158. TEST=grep dmesg for clock & nmi to make sure things look ok. Run example program to make sure result of clock_getres call tv_nsec = 1 again BUG=chromium-os:10720 Change-Id: Ife23fc7d08420788d4c165957d739ec2ce974969 Review URL: http://codereview.chromium.org/6274006 --- build_kernel_image.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build_kernel_image.sh b/build_kernel_image.sh index 6387431547..08cca4c726 100755 --- a/build_kernel_image.sh +++ b/build_kernel_image.sh @@ -146,7 +146,6 @@ cros_secure kern_guid=%U tpm_tis.force=1 tpm_tis.interrupts=0 -nmi_watchdog=1 EOF WORK="${WORK} ${FLAGS_working_dir}/config.txt" From 3d0a18e6763d12d91a57752c8bf84070eafbad96 Mon Sep 17 00:00:00 2001 From: "J. Richard Barnette" Date: Tue, 18 Jan 2011 16:57:52 -0800 Subject: [PATCH 2/2] Fix showbootdata handling when invoked with options but no arguments Change-Id: Ieacacae968f45325b7a164d1a38b8cd27272d367 BUG=chromium-os:10519 TEST=see bug description Review URL: http://codereview.chromium.org/6085003 --- bootperf-bin/showbootdata | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bootperf-bin/showbootdata b/bootperf-bin/showbootdata index b5261d12bb..a38c0bbd8a 100755 --- a/bootperf-bin/showbootdata +++ b/bootperf-bin/showbootdata @@ -107,10 +107,9 @@ def main(argv): keylist.extend(kl.split(',')) else: keylist = None + if not args: + args = ["."] printfunc(args, use_timestats, keylist) if __name__ == "__main__": - if len(sys.argv) > 1: - main(sys.argv[1:]) - else: - main(["."]) + main(sys.argv[1:])