mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
x86/uapi: Do not export <asm/msr-index.h> 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 <bp@suse.de> Acked-by: H. Peter Anvin <hpa@zytor.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: David Howells <dhowells@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1433436928-31903-19-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
c2f9b0af8b
commit
b72e7464e4
4 changed files with 3 additions and 4 deletions
|
@ -1,13 +1,14 @@
|
||||||
#ifndef _ASM_X86_MSR_H
|
#ifndef _ASM_X86_MSR_H
|
||||||
#define _ASM_X86_MSR_H
|
#define _ASM_X86_MSR_H
|
||||||
|
|
||||||
#include <uapi/asm/msr.h>
|
#include "msr-index.h"
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
#include <asm/asm.h>
|
#include <asm/asm.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/cpumask.h>
|
#include <asm/cpumask.h>
|
||||||
|
#include <uapi/asm/msr.h>
|
||||||
|
|
||||||
struct msr {
|
struct msr {
|
||||||
union {
|
union {
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#ifndef _UAPI_ASM_X86_MSR_H
|
#ifndef _UAPI_ASM_X86_MSR_H
|
||||||
#define _UAPI_ASM_X86_MSR_H
|
#define _UAPI_ASM_X86_MSR_H
|
||||||
|
|
||||||
#include <asm/msr-index.h>
|
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
|
@ -9,7 +9,7 @@ endif
|
||||||
|
|
||||||
turbostat : turbostat.c
|
turbostat : turbostat.c
|
||||||
CFLAGS += -Wall
|
CFLAGS += -Wall
|
||||||
CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"'
|
CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
|
||||||
|
|
||||||
%: %.c
|
%: %.c
|
||||||
@mkdir -p $(BUILD_OUTPUT)
|
@mkdir -p $(BUILD_OUTPUT)
|
||||||
|
|
Loading…
Reference in a new issue