Staging: hv: remove PAGE_SIZE and PAGE_SHIFT and __builtin functions

The kernel provides all of this, and actually gets it correct, so don't
try to redefine these types of things.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c
index fe5edaf6229dffee68e138aace81b13cabb3902e..dc91aae6272b6761f01cc68433d9cbaef682a011 100644 (file)
--- a/drivers/staging/hv/BlkVsc.c
+++ b/drivers/staging/hv/BlkVsc.c
@@ -21,6 +21,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include "StorVsc.c"
 
 static const char* gBlkDriverName="blkvsc";

diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index ba83b2c0cab3c32cee034d55d4f6e7dc55173316..ca0348aa55eb9b02c2114166d9284d95d287e49a 100644 (file)
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -23,6 +23,7 @@
 #define KERNEL_2_6_27
 
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include "include/logging.h"
 #include "NetVsc.h"
 #include "RndisFilter.h"

diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index 7478fdb08d8f42d13c6993f38331a06a6cf13fc5..92fc0520842b8f61f7e8fac2d779bead559fde88 100644 (file)
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -24,6 +24,7 @@
 #define KERNEL_2_6_27
 
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include "include/logging.h"
 
 #include "include/NetVscApi.h"

diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index 9cbd0641594f7f5c67ee9440c724714bcd1e5542..2d7f2ca6155a9f8f9dc81b3ec0c38d9425ebe5d8 100644 (file)
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -24,6 +24,8 @@
 #define KERNEL_2_6_27
 
 #include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/mm.h>
 #include "include/logging.h"
 
 #include "include/StorVscApi.h"

diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index 3803915622b8b6d58f297581cfdf27f81abcc442..080594dcbbb16ccfb1801e9e803358db79fc2049 100644 (file)
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include "include/logging.h"
 #include "VersionInfo.h"
 #include "VmbusPrivate.h"

diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index dfc20c3d3f9b71010b0aff9f1488c677a9ab13b1..fa0ae8cc08c964c3c3c549359d71929fd093938c 100644 (file)
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -29,34 +29,6 @@
 // Defines
 //
 
-#ifndef PAGE_SIZE
-#define PAGE_SIZE 0x1000
-#endif
-
-#ifndef PAGE_SHIFT
-#define PAGE_SHIFT 12
-#endif
-
-#ifndef memcpy
-#define memcpy         __builtin_memcpy
-#endif
-
-#ifndef memset
-#define memset         __builtin_memset
-#endif
-
-#ifndef memcmp
-#define memcmp         __builtin_memcmp
-#endif
-
-#ifndef strcpy
-#define strcpy         __builtin_strcpy
-#endif
-
-//
-//#ifndef sprintf
-//#define sprintf                              __builtin_sprintf
-//#endif
 
 #define STRUCT_PACKED          __attribute__((__packed__))
 #define STRUCT_ALIGNED(x)      __attribute__((__aligned__(x)))