Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b72e7464 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarH. 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: default avatarIngo Molnar <mingo@kernel.org>
parent c2f9b0af

arch/x86/include/asm/msr.h

+2 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MSR_H

#define _ASM_X86_MSR_H



#include <uapi/asm/msr.h>

#include "msr-index.h"



#ifndef __ASSEMBLY__



#include <asm/asm.h>

#include <asm/errno.h>

#include <asm/cpumask.h>

#include <uapi/asm/msr.h>



struct msr {

	union {

arch/x86/include/uapi/asm/msr.h

+0 −2
Original line number Diff line number Diff line 
#ifndef _UAPI_ASM_X86_MSR_H

#define _UAPI_ASM_X86_MSR_H



#include <asm/msr-index.h>



#ifndef __ASSEMBLY__



#include <linux/types.h>

tools/power/x86/turbostat/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)