[PATCH] x86/asm/msr: Retract msr-index.h

[Borislav Petkov <bp@alien8.de>]

From: Borislav Petkov <bp@suse.de>

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 <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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