diff options
| author | Andi Kleen | 2006-03-25 16:31:22 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-03-25 18:10:57 +0100 |
| commit | 9d95dd849ccc43c4b21504e1829b5bed68cdb1bc (patch) | |
| tree | 8c0040e2207e026512a536927155fdcdd6bda008 | |
| parent | [PATCH] x86_64: free_bootmem_node needs __pa in allocate_aperture (diff) | |
| download | kernel-qcow2-linux-9d95dd849ccc43c4b21504e1829b5bed68cdb1bc.tar.gz kernel-qcow2-linux-9d95dd849ccc43c4b21504e1829b5bed68cdb1bc.tar.xz kernel-qcow2-linux-9d95dd849ccc43c4b21504e1829b5bed68cdb1bc.zip | |
[PATCH] i386/x86-64: List Intel LaGrange AKA SMX in /proc/cpuinfo
Spec just got published so we know the CPUID bit.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/cpu/proc.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index 5cfbd8011698..f94cdb7aca50 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c @@ -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, diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 8acf5313e835..db70090a08f7 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -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, |