Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1579287

[PATCH 3/6] x86/cpu: proc - remove "wp" status line in cpuinfo

Show all headers | View raw

As of commit a5c2a893dbd4 ("x86, 386 removal: Remove
CONFIG_X86_WP_WORKS_OK") the kernel won't boot if CR0.WP isn't working
correctly. This makes a process reading this file always see "wp : yes"
here -- otherwise there would be no process to begin with ;)

As this status line in /proc/cpuinfo serves no purpose for quite some
time now, get rid of it.

Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
---
 arch/x86/kernel/cpu/proc.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index 6df621ae62a7..c6c5217a7980 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -30,8 +30,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
 		   "coma_bug\t: %s\n"
 		   "fpu\t\t: %s\n"
 		   "fpu_exception\t: %s\n"
-		   "cpuid level\t: %d\n"
-		   "wp\t\t: yes\n",
+		   "cpuid level\t: %d\n",
 		   static_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",
 		   static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",
 		   static_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",
@@ -45,8 +44,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
 	seq_printf(m,
 		   "fpu\t\t: yes\n"
 		   "fpu_exception\t: yes\n"
-		   "cpuid level\t: %d\n"
-		   "wp\t\t: yes\n",
+		   "cpuid level\t: %d\n",
 		   c->cpuid_level);
 }
 #endif
-- 
1.7.10.4

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] struct cpuinfo_x86 related cleanups Mathias Krause <minipli@googlemail.com> - 2017-02-12 22:20 +0100
  [PATCH 5/6] cris: remove unused wp_works_ok macro Mathias Krause <minipli@googlemail.com> - 2017-02-12 22:20 +0100
    Re: [PATCH 5/6] cris: remove unused wp_works_ok macro Jesper Nilsson <jesper.nilsson@axis.com> - 2017-02-13 10:20 +0100
  [PATCH 1/6] x86: drop unneded members of struct cpuinfo_x86 Mathias Krause <minipli@googlemail.com> - 2017-02-12 22:20 +0100
  [PATCH 4/6] sparc: remove unused wp_works_ok macro Mathias Krause <minipli@googlemail.com> - 2017-02-12 22:20 +0100
    Re: [PATCH 4/6] sparc: remove unused wp_works_ok macro David Miller <davem@davemloft.net> - 2017-02-13 03:50 +0100
  [PATCH 2/6] x86/cpu: drop wp_works_ok member of struct cpuinfo_x86 Mathias Krause <minipli@googlemail.com> - 2017-02-12 22:20 +0100
  [PATCH 3/6] x86/cpu: proc - remove "wp" status line in cpuinfo Mathias Krause <minipli@googlemail.com> - 2017-02-12 22:20 +0100

csiph-web