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>
This commit is contained in:
Родитель
fc6a4b2609
Коммит
0ffa63b09b
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/mm.h>
|
||||||
#include "StorVsc.c"
|
#include "StorVsc.c"
|
||||||
|
|
||||||
static const char* gBlkDriverName="blkvsc";
|
static const char* gBlkDriverName="blkvsc";
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#define KERNEL_2_6_27
|
#define KERNEL_2_6_27
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/mm.h>
|
||||||
#include "include/logging.h"
|
#include "include/logging.h"
|
||||||
#include "NetVsc.h"
|
#include "NetVsc.h"
|
||||||
#include "RndisFilter.h"
|
#include "RndisFilter.h"
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#define KERNEL_2_6_27
|
#define KERNEL_2_6_27
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/mm.h>
|
||||||
#include "include/logging.h"
|
#include "include/logging.h"
|
||||||
|
|
||||||
#include "include/NetVscApi.h"
|
#include "include/NetVscApi.h"
|
||||||
|
|
|
@ -24,6 +24,8 @@
|
||||||
#define KERNEL_2_6_27
|
#define KERNEL_2_6_27
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/string.h>
|
||||||
|
#include <linux/mm.h>
|
||||||
#include "include/logging.h"
|
#include "include/logging.h"
|
||||||
|
|
||||||
#include "include/StorVscApi.h"
|
#include "include/StorVscApi.h"
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/mm.h>
|
||||||
#include "include/logging.h"
|
#include "include/logging.h"
|
||||||
#include "VersionInfo.h"
|
#include "VersionInfo.h"
|
||||||
#include "VmbusPrivate.h"
|
#include "VmbusPrivate.h"
|
||||||
|
|
|
@ -29,34 +29,6 @@
|
||||||
// Defines
|
// 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_PACKED __attribute__((__packed__))
|
||||||
#define STRUCT_ALIGNED(x) __attribute__((__aligned__(x)))
|
#define STRUCT_ALIGNED(x) __attribute__((__aligned__(x)))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче