Merge branch 'master' into pr6429-comp-unwindsyms

* master:
  PR444886: add .../build/... to default debuginfo search path
  More signal cleanup.
  Fix problem handling SIG_CHLD
  Cleanup signal handling for staprun.
  PR6481: timer reset needs irqs reenabled
  Made runtime/task_finder.c improvements.
  PR6474: use position-independent-executable security c/ld-flags for stap* binaries
  2008-05-01  William Cohen  <wcohen@redhat.com>
  add git commit summary guidelines
  PR5648: Fix unaligned access warning on ia64.
  PR6008: Increase the limitation of the buffer size to 4095MB.
  PR5645: Fix sub-buffer size calculation and debug messages.

1 files changed, 2 insertions, 2 deletions

diff --git a/main.cxx b/main.cxx
index 3d72f9e6..0b7ad5f6 100644
--- a/main.cxx
+++ b/main.cxx
@@ -497,9 +497,9 @@ main (int argc, char * const argv [])
 
         case 's':
           s.buffer_size = atoi (optarg);
-          if (s.buffer_size < 1 || s.buffer_size > 64)
+          if (s.buffer_size < 1 || s.buffer_size > 4095)
             {
-              cerr << "Invalid buffer size (should be 1-64)." << endl;
+              cerr << "Invalid buffer size (should be 1-4095)." << endl;
 	      usage (s, 1);
             }
           break;