2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 4f28eba7fb8a..7323c19f354e 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/i386/kernel/cpu/proc.c
@@ -25,7 +25,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",
                /* AMD-defined */
-                "pni", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
                NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 2959ce703df9..2129cf9ba6b2 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -1076,7 +1076,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL,
                /* AMD-defined */
-                "pni", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
                NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
                NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",

diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index 4f28eba7fb8a..7323c19f354e 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c
@@ -25,7 +25,7 @@ static int show_cpuinfo(struct seq_file m, void v)
25	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",	25	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe",
26		26
27	/* AMD-defined */	27	/* AMD-defined */
28	"pni", NULL, NULL, NULL, NULL, NULL, NULL, NULL,	28	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
29	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,	29	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
30	NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,	30	NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
31	NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",	31	NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",


diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 2959ce703df9..2129cf9ba6b2 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c
@@ -1076,7 +1076,7 @@ static int show_cpuinfo(struct seq_file m, void v)
1076	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL,	1076	"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL,
1077		1077
1078	/* AMD-defined */	1078	/* AMD-defined */
1079	"pni", NULL, NULL, NULL, NULL, NULL, NULL, NULL,	1079	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
1080	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,	1080	NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
1081	NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,	1081	NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
1082	NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",	1082	NULL, "fxsr_opt", NULL, NULL, NULL, "lm", "3dnowext", "3dnow",