From 384db875d48a9f5939f7cb184899b4eca5590bec Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 21 May 2010 14:19:24 -0300 Subject: [PATCH] --- yaml --- r: 199147 b: refs/heads/master c: 0e8dc2597487848bb076d6b3d8440c85dde521e7 h: refs/heads/master i: 199145: 77716ea697c386ea0d893c5ec2b458b4f1cc34da 199143: 99c4cd216b2c856b238d21d37b24ec91971f5d35 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pf_in.c | 2 +- trunk/tools/perf/builtin-report.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0ec49c87b7f..f5716bc8d924 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 841bca1393d315d79077f272c2918423e36dc364 +refs/heads/master: 0e8dc2597487848bb076d6b3d8440c85dde521e7 diff --git a/trunk/arch/x86/mm/pf_in.c b/trunk/arch/x86/mm/pf_in.c index 308e32570d84..df3d5c861cda 100644 --- a/trunk/arch/x86/mm/pf_in.c +++ b/trunk/arch/x86/mm/pf_in.c @@ -34,7 +34,7 @@ /* IA32 Manual 3, 2-1 */ static unsigned char prefix_codes[] = { 0xF0, 0xF2, 0xF3, 0x2E, 0x36, 0x3E, 0x26, 0x64, - 0x65, 0x66, 0x67 + 0x65, 0x2E, 0x3E, 0x66, 0x67 }; /* IA32 Manual 3, 3-432*/ static unsigned int reg_rop[] = { diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c index a7b8760e401c..2c39bd358975 100644 --- a/trunk/tools/perf/builtin-report.c +++ b/trunk/tools/perf/builtin-report.c @@ -484,7 +484,9 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) { argc = parse_options(argc, argv, options, report_usage, 0); - if (strcmp(input_name, "-") != 0) + if (dump_trace) + setup_pager(); + else if (strcmp(input_name, "-") != 0) setup_browser(); /* * Only in the newt browser we are doing integrated annotation,