diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-31 14:44:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-31 14:44:13 +0200 |
| commit | 102a7c3073c614023fbfdf82e40672444eef8f35 (patch) | |
| tree | 8f87b078fffbed570674438aa078a09299f105eb /tools | |
| parent | e2e0b056e0694f78cee23baa21aa7716e34e1c6a (diff) | |
| parent | fd1edb3aa2c1d92618d8f0c6d15d44ea41fcac6a (diff) | |
Merge branch 'perf/urgent' into auto-latest
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/builtin-record.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index db6adecf46f1..17d1dcb3c667 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -41,7 +41,7 @@ static u64 user_interval = ULLONG_MAX; static u64 default_interval = 0; static unsigned int page_size; -static unsigned int mmap_pages = 128; +static unsigned int mmap_pages = UINT_MAX; static unsigned int user_freq = UINT_MAX; static int freq = 1000; static int output; @@ -513,6 +513,10 @@ static int __cmd_record(int argc, const char **argv) if (have_tracepoints(&evsel_list->entries)) perf_header__set_feat(&session->header, HEADER_TRACE_INFO); + /* 512 kiB: default amount of unprivileged mlocked memory */ + if (mmap_pages == UINT_MAX) + mmap_pages = (512 * 1024) / page_size; + if (forks) { child_pid = fork(); if (child_pid < 0) { |