diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-15 11:06:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:47 -0700 |
| commit | 0ffa63b09bf99ce3ee879c7de1c687267a90d20b (patch) | |
| tree | 6eb615f7bca4f0935833c55d6bdaea81ba4e1f66 /drivers/staging | |
| parent | fc6a4b2609b35448ad72302d375a40edf31887d2 (diff) | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/hv/BlkVsc.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/NetVsc.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/RndisFilter.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/StorVsc.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/Vmbus.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/include/osd.h | 28 |
6 files changed, 6 insertions, 28 deletions
diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c index fe5edaf6229d..dc91aae6272b 100644 --- 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 ba83b2c0cab3..ca0348aa55eb 100644 --- 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 7478fdb08d8f..92fc0520842b 100644 --- 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 9cbd0641594f..2d7f2ca6155a 100644 --- 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 3803915622b8..080594dcbbb1 100644 --- 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 dfc20c3d3f9b..fa0ae8cc08c9 100644 --- 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))) |