From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755731AbbFCMmU (ORCPT ); Wed, 3 Jun 2015 08:42:20 -0400 Received: from mail.skyhub.de ([78.46.96.112]:46858 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755567AbbFCMl6 (ORCPT ); Wed, 3 Jun 2015 08:41:58 -0400 From: Borislav Petkov To: LKML Cc: Andrew Morton , Andy Lutomirski , "H. Peter Anvin" , Ingo Molnar , "Peter Zijlstra (Intel)" , Thomas Gleixner , x86@kernel.org Subject: [PATCH] x86/asm/msr: Retract msr-index.h Date: Wed, 3 Jun 2015 14:41:48 +0200 Message-Id: <1433335308-27114-1-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov This header containing all MSRs and respective bit definitions got exported to userspace in conjunction with the big uapi shuffle. But, it doesn't have anything to do in the uapi headers because userspace can do its own MSR defines and exporting them from the kernel blocks us from doing cleanups/renames in that header. Which is ridiculous - it is not kernel's job to export such a header and keep MSRs list and their names stable. Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: Andy Lutomirski Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: linux-kernel@vger.kernel.org Cc: "Peter Zijlstra (Intel)" Cc: Thomas Gleixner Cc: x86@kernel.org --- arch/x86/include/{uapi => }/asm/msr-index.h | 0 tools/power/x86/turbostat/Makefile | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/x86/include/{uapi => }/asm/msr-index.h (100%) diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/asm/msr-index.h similarity index 100% rename from arch/x86/include/uapi/asm/msr-index.h rename to arch/x86/include/asm/msr-index.h diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index 4039854560d0..e367b1a85d70 100644 --- a/tools/power/x86/turbostat/Makefile +++ b/tools/power/x86/turbostat/Makefile @@ -9,7 +9,7 @@ endif turbostat : turbostat.c CFLAGS += -Wall -CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"' +CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' %: %.c @mkdir -p $(BUILD_OUTPUT) -- 2.3.5