From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751494AbdBLVMj (ORCPT ); Sun, 12 Feb 2017 16:12:39 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34207 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751467AbdBLVMg (ORCPT ); Sun, 12 Feb 2017 16:12:36 -0500 From: Mathias Krause To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: Andrew Morton , Borislav Petkov , "David S. Miller" , Jesper Nilsson , Mikael Starvik , Geert Uytterhoeven , x86@kernel.org, linux-kernel@vger.kernel.org, Mathias Krause , "H. Peter Anvin" Subject: [PATCH 3/6] x86/cpu: proc - remove "wp" status line in cpuinfo Date: Sun, 12 Feb 2017 22:12:09 +0100 Message-Id: <1486933932-585-4-git-send-email-minipli@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1486933932-585-1-git-send-email-minipli@googlemail.com> References: <1486933932-585-1-git-send-email-minipli@googlemail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: H. Peter Anvin Signed-off-by: Mathias Krause --- 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