summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-02-07 17:14:08 -0800
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2015-11-06 11:19:56 +0100
commitd8eb1dde264c7b55d25209de26a08471e2f566f6 (patch)
treef8426acf8b54f8293ae898ec9adc38975257e0e2
parentefe8e3d77c938a1699f2cd0edf8b98c81f33efaf (diff)
defined(@array) is deprecated in Perl and gives off a warning. Restructure the code to remove that warning. [ hpa: it would be interesting to revert to the timeconst.bc script. It appears that the failures reported by akpm during testing of that script was due to a known broken version of make, not a problem with bc. The Makefile rules could probably be restructured to avoid the make bug, or it is probably old enough that it doesn't matter. ] Reported-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: <stable@vger.kernel.org> (cherry picked from commit 63a3f603413ffe82ad775f2d62a5afff87fd94a0) Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--kernel/timeconst.pl6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/timeconst.pl b/kernel/timeconst.pl
index eb51d76..3f42652 100644
--- a/kernel/timeconst.pl
+++ b/kernel/timeconst.pl
@@ -369,10 +369,8 @@ if ($hz eq '--can') {
die "Usage: $0 HZ\n";
}
- @val = @{$canned_values{$hz}};
- if (!defined(@val)) {
- @val = compute_values($hz);
- }
+ $cv = $canned_values{$hz};
+ @val = defined($cv) ? @$cv : compute_values($hz);
output($hz, @val);
}
exit 0;