---

yaml --- r: 199147 b: refs/heads/master c: 0e8dc25 h: refs/heads/master i: 199145: 77716ea 199143: 99c4cd2 v: v3
git-mirror · May 21, 2010 · 384db87 · 384db87
1 parent c5ba8d0
commit 384db87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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,