[PATCH 1/2] Hyperv detection - code cleanup

[Ky Srinivasan]

From: K. Y. Srinivasan <ksrinivasan@xxxxxxxxxx>
Subject: Code cleanup - consolidate all hyperv related definitions into one
header file.


Signed-off-by: K. Y. Srinivasan <ksrinivasan@xxxxxxxxxx>

Index: linux.trees.git/arch/x86/include/asm/hyperv.h
===================================================================
--- linux.trees.git.orig/arch/x86/include/asm/hyperv.h	2010-05-18 10:14:02.000000000 -0600
+++ linux.trees.git/arch/x86/include/asm/hyperv.h	2010-05-18 14:11:55.000000000 -0600
@@ -190,4 +190,11 @@
 #define HV_STATUS_INVALID_HYPERCALL_INPUT	3
 #define HV_STATUS_INVALID_ALIGNMENT		4
 
+struct ms_hyperv_info {
+	u32 features;
+	u32 hints;
+};
+
+extern struct ms_hyperv_info ms_hyperv;
+
 #endif
Index: linux.trees.git/arch/x86/include/asm/mshyperv.h
===================================================================
--- linux.trees.git.orig/arch/x86/include/asm/mshyperv.h	2010-05-18 10:14:02.000000000 -0600
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-#ifndef _ASM_X86_MSHYPER_H
-#define _ASM_X86_MSHYPER_H
-
-#include <linux/types.h>
-#include <asm/hyperv.h>
-
-struct ms_hyperv_info {
-	u32 features;
-	u32 hints;
-};
-
-extern struct ms_hyperv_info ms_hyperv;
-
-#endif
Index: linux.trees.git/arch/x86/kernel/cpu/mshyperv.c
===================================================================
--- linux.trees.git.orig/arch/x86/kernel/cpu/mshyperv.c	2010-05-18 12:46:50.000000000 -0600
+++ linux.trees.git/arch/x86/kernel/cpu/mshyperv.c	2010-05-18 14:11:55.000000000 -0600
@@ -15,7 +15,6 @@
 #include <asm/processor.h>
 #include <asm/hypervisor.h>
 #include <asm/hyperv.h>
-#include <asm/mshyperv.h>
 
 struct ms_hyperv_info ms_hyperv;
 EXPORT_SYMBOL(ms_hyperv);










--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/