This moves osd.h out of the include/ subdirectory. No code changes are made here. Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
@@ -22,6 +22,7 @@
#include <linux/kernel.h>
#include <linux/mm.h>
+#include "osd.h"
#include "StorVsc.c"
static const char* gBlkDriverName="blkvsc";
@@ -23,7 +23,7 @@
-#include "include/osd.h"
#include "include/logging.h"
#include "VmbusPrivate.h"
@@ -25,7 +25,6 @@
#ifndef _CHANNEL_H_
#define _CHANNEL_H_
#include "ChannelMgmt.h"
/* The format must be the same as VMDATA_GPA_DIRECT */
@@ -23,8 +23,7 @@
-
static int
@@ -24,7 +24,7 @@
#ifndef _CHANNEL_MGMT_H_
#define _CHANNEL_MGMT_H_
#include "include/List.h"
#include "RingBuffer.h"
@@ -25,6 +25,7 @@
#include <linux/vmalloc.h>
@@ -24,6 +24,7 @@
@@ -25,8 +25,6 @@
#ifndef __HV_H__
#define __HV_H__
#include "include/HvTypes.h"
#include "include/HvStatus.h"
#include "include/HvHalApi.h"
#include <linux/delay.h>
#include <asm/io.h>
#include "NetVsc.h"
#include "RndisFilter.h"
@@ -23,6 +23,7 @@
@@ -27,8 +27,6 @@
#include <linux/scatterlist.h>
typedef struct _RING_BUFFER {
/* Offset in bytes from the start of ring data below */
volatile u32 WriteIndex;
@@ -26,8 +26,8 @@
#include <asm/kmap_types.h>
#include "include/NetVscApi.h"
@@ -27,7 +27,6 @@
#define __struct_bcount(x)
#include "include/rndis.h"
@@ -25,8 +25,8 @@
#include <linux/string.h>
#include "include/StorVscApi.h"
#include "include/VmbusPacketFormat.h"
#include "include/vstorage.h"
#include "VersionInfo.h"
@@ -33,6 +33,7 @@
#include <scsi/scsi_eh.h>
#include <scsi/scsi_dbg.h>
#include "include/vmbus.h"
#ifndef _LIST_H_
#define _LIST_H_
-#include "osd.h"
/*
*
* Doubly-linked list manipulation routines. Implemented as macros
#ifndef _VMBUS_API_H_
#define _VMBUS_API_H_
/* Defines */
@@ -28,7 +28,6 @@
/* #include <linux/init.h> */
/* #include <linux/module.h> */
#define VMBUS 0x0001
#define STORVSC 0x0002
@@ -36,6 +36,7 @@
#include <net/sock.h>
#include <net/pkt_sched.h>
@@ -43,7 +43,7 @@
#include <asm/atomic.h>
/* Data types */
@@ -36,9 +36,9 @@
@@ -28,7 +28,7 @@
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/sysctl.h>