Jelajahi Sumber

Staging: hv: move osd.h

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>
Greg Kroah-Hartman 16 tahun lalu
induk
melakukan
4983b39a06

+ 1 - 0
drivers/staging/hv/BlkVsc.c

@@ -22,6 +22,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include "osd.h"
 #include "StorVsc.c"
 
 static const char* gBlkDriverName="blkvsc";

+ 1 - 1
drivers/staging/hv/Channel.c

@@ -23,7 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include "include/osd.h"
+#include "osd.h"
 #include "include/logging.h"
 
 #include "VmbusPrivate.h"

+ 0 - 1
drivers/staging/hv/Channel.h

@@ -25,7 +25,6 @@
 #ifndef _CHANNEL_H_
 #define _CHANNEL_H_
 
-#include "include/osd.h"
 #include "ChannelMgmt.h"
 
 /* The format must be the same as VMDATA_GPA_DIRECT */

+ 1 - 2
drivers/staging/hv/ChannelInterface.c

@@ -23,8 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include "include/osd.h"
-
+#include "osd.h"
 #include "VmbusPrivate.h"
 
 static int

+ 1 - 1
drivers/staging/hv/ChannelMgmt.c

@@ -24,7 +24,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include "include/osd.h"
+#include "osd.h"
 #include "include/logging.h"
 
 #include "VmbusPrivate.h"

+ 0 - 1
drivers/staging/hv/ChannelMgmt.h

@@ -25,7 +25,6 @@
 #ifndef _CHANNEL_MGMT_H_
 #define _CHANNEL_MGMT_H_
 
-#include "include/osd.h"
 #include "include/List.h"
 #include "RingBuffer.h"
 

+ 1 - 0
drivers/staging/hv/Connection.c

@@ -25,6 +25,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include "osd.h"
 #include "include/logging.h"
 #include "VmbusPrivate.h"
 

+ 1 - 0
drivers/staging/hv/Hv.c

@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include "osd.h"
 #include "include/logging.h"
 #include "VmbusPrivate.h"
 

+ 0 - 2
drivers/staging/hv/Hv.h

@@ -25,8 +25,6 @@
 #ifndef __HV_H__
 #define __HV_H__
 
-#include "include/osd.h"
-
 #include "include/HvTypes.h"
 #include "include/HvStatus.h"
 #include "include/HvHalApi.h"

+ 1 - 0
drivers/staging/hv/NetVsc.c

@@ -24,6 +24,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <asm/io.h>
+#include "osd.h"
 #include "include/logging.h"
 #include "NetVsc.h"
 #include "RndisFilter.h"

+ 1 - 0
drivers/staging/hv/RingBuffer.c

@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include "osd.h"
 #include "include/logging.h"
 #include "RingBuffer.h"
 

+ 0 - 2
drivers/staging/hv/RingBuffer.h

@@ -27,8 +27,6 @@
 
 #include <linux/scatterlist.h>
 
-#include "include/osd.h"
-
 typedef struct _RING_BUFFER {
 	/* Offset in bytes from the start of ring data below */
 	volatile u32 WriteIndex;

+ 1 - 1
drivers/staging/hv/RndisFilter.c

@@ -26,8 +26,8 @@
 #include <asm/kmap_types.h>
 #include <asm/io.h>
 
+#include "osd.h"
 #include "include/logging.h"
-
 #include "include/NetVscApi.h"
 #include "RndisFilter.h"
 

+ 0 - 1
drivers/staging/hv/RndisFilter.h

@@ -27,7 +27,6 @@
 
 #define __struct_bcount(x)
 
-#include "include/osd.h"
 #include "NetVsc.h"
 
 #include "include/rndis.h"

+ 1 - 1
drivers/staging/hv/StorVsc.c

@@ -25,8 +25,8 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
+#include "osd.h"
 #include "include/logging.h"
-
 #include "include/StorVscApi.h"
 #include "include/VmbusPacketFormat.h"
 #include "include/vstorage.h"

+ 1 - 0
drivers/staging/hv/Vmbus.c

@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include "osd.h"
 #include "include/logging.h"
 #include "VersionInfo.h"
 #include "VmbusPrivate.h"

+ 1 - 0
drivers/staging/hv/blkvsc_drv.c

@@ -33,6 +33,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
 
+#include "osd.h"
 #include "include/logging.h"
 #include "include/vmbus.h"
 

+ 0 - 1
drivers/staging/hv/include/List.h

@@ -25,7 +25,6 @@
 #ifndef _LIST_H_
 #define _LIST_H_
 
-#include "osd.h"
 /*
  *
  *  Doubly-linked list manipulation routines.  Implemented as macros

+ 0 - 1
drivers/staging/hv/include/VmbusApi.h

@@ -25,7 +25,6 @@
 #ifndef _VMBUS_API_H_
 #define _VMBUS_API_H_
 
-#include "osd.h"
 
 
 /* Defines */

+ 0 - 1
drivers/staging/hv/include/logging.h

@@ -28,7 +28,6 @@
 /* #include <linux/init.h> */
 /* #include <linux/module.h> */
 
-#include "osd.h"
 
 #define VMBUS				0x0001
 #define STORVSC				0x0002

+ 1 - 0
drivers/staging/hv/netvsc_drv.c

@@ -36,6 +36,7 @@
 #include <net/sock.h>
 #include <net/pkt_sched.h>
 
+#include "osd.h"
 #include "include/logging.h"
 #include "include/vmbus.h"
 

+ 1 - 1
drivers/staging/hv/osd.c

@@ -43,7 +43,7 @@
 #include <asm/kmap_types.h>
 #include <asm/atomic.h>
 
-#include "include/osd.h"
+#include "osd.h"
 
 
 /* Data types */

+ 0 - 0
drivers/staging/hv/include/osd.h → drivers/staging/hv/osd.h


+ 1 - 1
drivers/staging/hv/storvsc_drv.c

@@ -36,9 +36,9 @@
 
 #include <scsi/scsi_dbg.h>
 
+#include "osd.h"
 #include "include/logging.h"
 #include "include/vmbus.h"
-
 #include "include/StorVscApi.h"
 
 

+ 1 - 1
drivers/staging/hv/vmbus_drv.c

@@ -28,7 +28,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/sysctl.h>
-
+#include "osd.h"
 #include "include/logging.h"
 #include "include/vmbus.h"