Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 35983
b: refs/heads/master
c: dcf1030
h: refs/heads/master
i:
  35981: d46c234
  35979: 84c0839
  35975: 412b0ea
  35967: 235b6c1
v: v3
  • Loading branch information
Dave Jones authored and Andi Kleen committed Sep 26, 2006
1 parent 485d3b8 commit e52e3ef
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 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: 3222b36f46c22f46697a0a53fa8804153a32669f
refs/heads/master: dcf10307c3fff2bca4b104ad8fe4e3aa8dcb2ad1
4 changes: 2 additions & 2 deletions trunk/arch/i386/kernel/cpu/proc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)

/* Intel-defined (#2) */
"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,
"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
NULL, NULL, "dca", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

/* VIA/Cyrix/Centaur-defined */
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/x86_64/kernel/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)

/* Intel-defined (#2) */
"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,
"tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
NULL, NULL, "dca", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

/* VIA/Cyrix/Centaur-defined */
Expand Down

0 comments on commit e52e3ef

Please sign in to comment.