Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 23837
b: refs/heads/master
c: 9d95dd8
h: refs/heads/master
i:
  23835: 419533f
v: v3
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Mar 25, 2006
1 parent 60cd616 commit 6db6712
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c912c2db2f5c2467ba34e4e655008a14532a3900
refs/heads/master: 9d95dd849ccc43c4b21504e1829b5bed68cdb1bc
2 changes: 1 addition & 1 deletion trunk/arch/i386/kernel/cpu/proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

/* Intel-defined (#2) */
"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", NULL, "est",
"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
"tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86_64/kernel/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

/* Intel-defined (#2) */
"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", NULL, "est",
"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
"tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
Expand Down

0 comments on commit 6db6712

Please sign in to comment.