From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753017AbbFGRpd (ORCPT ); Sun, 7 Jun 2015 13:45:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57527 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831AbbFGRpZ (ORCPT ); Sun, 7 Jun 2015 13:45:25 -0400 Date: Sun, 7 Jun 2015 10:44:52 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: akpm@linux-foundation.org, bp@suse.de, dhowells@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, luto@kernel.org, tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, akpm@linux-foundation.org, bp@suse.de, dhowells@redhat.com, peterz@infradead.org, luto@kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1433436928-31903-19-git-send-email-bp@alien8.de> References: <1433436928-31903-19-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/core] x86/uapi: Do not export as part of the user API headers Git-Commit-ID: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b72e7464e4cf80117938e6adb8c22fdc1ca46d42 Gitweb: http://git.kernel.org/tip/b72e7464e4cf80117938e6adb8c22fdc1ca46d42 Author: Borislav Petkov AuthorDate: Thu, 4 Jun 2015 18:55:26 +0200 Committer: Ingo Molnar CommitDate: Sun, 7 Jun 2015 15:36:04 +0200 x86/uapi: Do not export as part of the user API headers This header containing all MSRs and respective bit definitions got exported to userspace in conjunction with the big UAPI shuffle. But, it doesn't belong 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 Acked-by: H. Peter Anvin Cc: Andrew Morton Cc: Andy Lutomirski Cc: David Howells Cc: Linus Torvalds Cc: Peter Zijlstra (Intel) Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1433436928-31903-19-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/include/{uapi => }/asm/msr-index.h | 0 arch/x86/include/asm/msr.h | 3 ++- arch/x86/include/uapi/asm/msr.h | 2 -- tools/power/x86/turbostat/Makefile | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) 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/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index de36f22..441ecf8 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -1,13 +1,14 @@ #ifndef _ASM_X86_MSR_H #define _ASM_X86_MSR_H -#include +#include "msr-index.h" #ifndef __ASSEMBLY__ #include #include #include +#include struct msr { union { diff --git a/arch/x86/include/uapi/asm/msr.h b/arch/x86/include/uapi/asm/msr.h index 155e510..c41f4fe 100644 --- a/arch/x86/include/uapi/asm/msr.h +++ b/arch/x86/include/uapi/asm/msr.h @@ -1,8 +1,6 @@ #ifndef _UAPI_ASM_X86_MSR_H #define _UAPI_ASM_X86_MSR_H -#include - #ifndef __ASSEMBLY__ #include diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile index 4039854..e367b1a 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)