Merge commit 'v2.6.32-rc6' into next

1 files changed, 2 insertions, 0 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 37512e936235..a1b1d10912dc 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -686,6 +686,8 @@ static void handle_keypress(int c)
         switch (c) {
                 case 'd':
                         prompt_integer(&delay_secs, "Enter display delay");
+                        if (delay_secs < 1)
+                                delay_secs = 1;
                         break;
                 case 'e':
                         prompt_integer(&print_entries, "Enter display entries (lines)");