summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMichal Ludvig <michal@logix.cz>2006-06-23 02:04:32 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 07:42:59 -0700
commit224f611c1639cb6c134a934dae7f7b9f0ac3b540 (patch)
treec5fb2f73e606dc172528f15947cef1d9c0df9e13 /arch
parent7e04a1183eac3e6b3570a154c8677fd9184b51e7 (diff)
downloadlinux-3.10-224f611c1639cb6c134a934dae7f7b9f0ac3b540.tar.gz
linux-3.10-224f611c1639cb6c134a934dae7f7b9f0ac3b540.tar.bz2
linux-3.10-224f611c1639cb6c134a934dae7f7b9f0ac3b540.zip
[PATCH] x86: VIA C7 CPU flags
New CPU flags for next generation of crypto engine as found in VIA C7 processors. Signed-off-by: Michal Ludvig <michal@logix.cz> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/cpu/proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index f94cdb7aca5..a19fcb262db 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -52,7 +52,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
/* VIA/Cyrix/Centaur-defined */
NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ "ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,