diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-19 19:14:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:56 -0400 |
commit | 4983b39a0687b00688478e6748b979a02934b234 (patch) | |
tree | 57c06411bc8cb8f3d7278c91752e12423d24ee03 /drivers/staging/hv | |
parent | d7363a194ba9fc4e91a354d5f4ba7f084b847c82 (diff) |
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>
Diffstat (limited to 'drivers/staging/hv')
25 files changed, 16 insertions, 19 deletions
diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c index 526a0ab8997..c2e03673cf1 100644 --- a/drivers/staging/hv/BlkVsc.c +++ b/drivers/staging/hv/BlkVsc.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
25 | #include "osd.h" | ||
25 | #include "StorVsc.c" | 26 | #include "StorVsc.c" |
26 | 27 | ||
27 | static const char* gBlkDriverName="blkvsc"; | 28 | static const char* gBlkDriverName="blkvsc"; |
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index 78850f3a32c..5f4016154e8 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include "include/osd.h" | 26 | #include "osd.h" |
27 | #include "include/logging.h" | 27 | #include "include/logging.h" |
28 | 28 | ||
29 | #include "VmbusPrivate.h" | 29 | #include "VmbusPrivate.h" |
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h index c741dc1373f..d0fd9aa6238 100644 --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef _CHANNEL_H_ | 25 | #ifndef _CHANNEL_H_ |
26 | #define _CHANNEL_H_ | 26 | #define _CHANNEL_H_ |
27 | 27 | ||
28 | #include "include/osd.h" | ||
29 | #include "ChannelMgmt.h" | 28 | #include "ChannelMgmt.h" |
30 | 29 | ||
31 | /* The format must be the same as VMDATA_GPA_DIRECT */ | 30 | /* The format must be the same as VMDATA_GPA_DIRECT */ |
diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c index 451a1a53065..ffd62bb2914 100644 --- a/drivers/staging/hv/ChannelInterface.c +++ b/drivers/staging/hv/ChannelInterface.c | |||
@@ -23,8 +23,7 @@ | |||
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include "include/osd.h" | 26 | #include "osd.h" |
27 | |||
28 | #include "VmbusPrivate.h" | 27 | #include "VmbusPrivate.h" |
29 | 28 | ||
30 | static int | 29 | static int |
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index ebf4f7e8847..86ce05b4b14 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
27 | #include "include/osd.h" | 27 | #include "osd.h" |
28 | #include "include/logging.h" | 28 | #include "include/logging.h" |
29 | 29 | ||
30 | #include "VmbusPrivate.h" | 30 | #include "VmbusPrivate.h" |
diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h index 8b81d59b69d..34eddab6f3b 100644 --- a/drivers/staging/hv/ChannelMgmt.h +++ b/drivers/staging/hv/ChannelMgmt.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef _CHANNEL_MGMT_H_ | 25 | #ifndef _CHANNEL_MGMT_H_ |
26 | #define _CHANNEL_MGMT_H_ | 26 | #define _CHANNEL_MGMT_H_ |
27 | 27 | ||
28 | #include "include/osd.h" | ||
29 | #include "include/List.h" | 28 | #include "include/List.h" |
30 | #include "RingBuffer.h" | 29 | #include "RingBuffer.h" |
31 | 30 | ||
diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c index 6b726894b31..9083f33a4b3 100644 --- a/drivers/staging/hv/Connection.c +++ b/drivers/staging/hv/Connection.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
27 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
28 | #include "osd.h" | ||
28 | #include "include/logging.h" | 29 | #include "include/logging.h" |
29 | #include "VmbusPrivate.h" | 30 | #include "VmbusPrivate.h" |
30 | 31 | ||
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index f706ab8f08c..31459f76f16 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
27 | #include "osd.h" | ||
27 | #include "include/logging.h" | 28 | #include "include/logging.h" |
28 | #include "VmbusPrivate.h" | 29 | #include "VmbusPrivate.h" |
29 | 30 | ||
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h index 926213538cd..6df388d741a 100644 --- a/drivers/staging/hv/Hv.h +++ b/drivers/staging/hv/Hv.h | |||
@@ -25,8 +25,6 @@ | |||
25 | #ifndef __HV_H__ | 25 | #ifndef __HV_H__ |
26 | #define __HV_H__ | 26 | #define __HV_H__ |
27 | 27 | ||
28 | #include "include/osd.h" | ||
29 | |||
30 | #include "include/HvTypes.h" | 28 | #include "include/HvTypes.h" |
31 | #include "include/HvStatus.h" | 29 | #include "include/HvStatus.h" |
32 | #include "include/HvHalApi.h" | 30 | #include "include/HvHalApi.h" |
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 349329aea16..0389ef7bedb 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
27 | #include "osd.h" | ||
27 | #include "include/logging.h" | 28 | #include "include/logging.h" |
28 | #include "NetVsc.h" | 29 | #include "NetVsc.h" |
29 | #include "RndisFilter.h" | 30 | #include "RndisFilter.h" |
diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c index f7332f300c4..7473f915403 100644 --- a/drivers/staging/hv/RingBuffer.c +++ b/drivers/staging/hv/RingBuffer.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include "osd.h" | ||
26 | #include "include/logging.h" | 27 | #include "include/logging.h" |
27 | #include "RingBuffer.h" | 28 | #include "RingBuffer.h" |
28 | 29 | ||
diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h index 17e859fa510..6202157e145 100644 --- a/drivers/staging/hv/RingBuffer.h +++ b/drivers/staging/hv/RingBuffer.h | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | #include <linux/scatterlist.h> | 28 | #include <linux/scatterlist.h> |
29 | 29 | ||
30 | #include "include/osd.h" | ||
31 | |||
32 | typedef struct _RING_BUFFER { | 30 | typedef struct _RING_BUFFER { |
33 | /* Offset in bytes from the start of ring data below */ | 31 | /* Offset in bytes from the start of ring data below */ |
34 | volatile u32 WriteIndex; | 32 | volatile u32 WriteIndex; |
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 5cd1575578a..ef490f52593 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c | |||
@@ -26,8 +26,8 @@ | |||
26 | #include <asm/kmap_types.h> | 26 | #include <asm/kmap_types.h> |
27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
28 | 28 | ||
29 | #include "osd.h" | ||
29 | #include "include/logging.h" | 30 | #include "include/logging.h" |
30 | |||
31 | #include "include/NetVscApi.h" | 31 | #include "include/NetVscApi.h" |
32 | #include "RndisFilter.h" | 32 | #include "RndisFilter.h" |
33 | 33 | ||
diff --git a/drivers/staging/hv/RndisFilter.h b/drivers/staging/hv/RndisFilter.h index 6725fe525d3..8e357c8c95d 100644 --- a/drivers/staging/hv/RndisFilter.h +++ b/drivers/staging/hv/RndisFilter.h | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #define __struct_bcount(x) | 28 | #define __struct_bcount(x) |
29 | 29 | ||
30 | #include "include/osd.h" | ||
31 | #include "NetVsc.h" | 30 | #include "NetVsc.h" |
32 | 31 | ||
33 | #include "include/rndis.h" | 32 | #include "include/rndis.h" |
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index 47de70b0d82..32fa2914f45 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
28 | #include "osd.h" | ||
28 | #include "include/logging.h" | 29 | #include "include/logging.h" |
29 | |||
30 | #include "include/StorVscApi.h" | 30 | #include "include/StorVscApi.h" |
31 | #include "include/VmbusPacketFormat.h" | 31 | #include "include/VmbusPacketFormat.h" |
32 | #include "include/vstorage.h" | 32 | #include "include/vstorage.h" |
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 50d2773053b..2feb7c3cfae 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
26 | #include "osd.h" | ||
26 | #include "include/logging.h" | 27 | #include "include/logging.h" |
27 | #include "VersionInfo.h" | 28 | #include "VersionInfo.h" |
28 | #include "VmbusPrivate.h" | 29 | #include "VmbusPrivate.h" |
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 6888909c69e..3107f460d9d 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <scsi/scsi_eh.h> | 33 | #include <scsi/scsi_eh.h> |
34 | #include <scsi/scsi_dbg.h> | 34 | #include <scsi/scsi_dbg.h> |
35 | 35 | ||
36 | #include "osd.h" | ||
36 | #include "include/logging.h" | 37 | #include "include/logging.h" |
37 | #include "include/vmbus.h" | 38 | #include "include/vmbus.h" |
38 | 39 | ||
diff --git a/drivers/staging/hv/include/List.h b/drivers/staging/hv/include/List.h index 31c12969643..3895c328ddd 100644 --- a/drivers/staging/hv/include/List.h +++ b/drivers/staging/hv/include/List.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef _LIST_H_ | 25 | #ifndef _LIST_H_ |
26 | #define _LIST_H_ | 26 | #define _LIST_H_ |
27 | 27 | ||
28 | #include "osd.h" | ||
29 | /* | 28 | /* |
30 | * | 29 | * |
31 | * Doubly-linked list manipulation routines. Implemented as macros | 30 | * Doubly-linked list manipulation routines. Implemented as macros |
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h index 0a870855028..442a2125470 100644 --- a/drivers/staging/hv/include/VmbusApi.h +++ b/drivers/staging/hv/include/VmbusApi.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef _VMBUS_API_H_ | 25 | #ifndef _VMBUS_API_H_ |
26 | #define _VMBUS_API_H_ | 26 | #define _VMBUS_API_H_ |
27 | 27 | ||
28 | #include "osd.h" | ||
29 | 28 | ||
30 | 29 | ||
31 | /* Defines */ | 30 | /* Defines */ |
diff --git a/drivers/staging/hv/include/logging.h b/drivers/staging/hv/include/logging.h index 8609269ca19..74c18f1d7f4 100644 --- a/drivers/staging/hv/include/logging.h +++ b/drivers/staging/hv/include/logging.h | |||
@@ -28,7 +28,6 @@ | |||
28 | /* #include <linux/init.h> */ | 28 | /* #include <linux/init.h> */ |
29 | /* #include <linux/module.h> */ | 29 | /* #include <linux/module.h> */ |
30 | 30 | ||
31 | #include "osd.h" | ||
32 | 31 | ||
33 | #define VMBUS 0x0001 | 32 | #define VMBUS 0x0001 |
34 | #define STORVSC 0x0002 | 33 | #define STORVSC 0x0002 |
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 439c357c52e..43488504a02 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <net/sock.h> | 36 | #include <net/sock.h> |
37 | #include <net/pkt_sched.h> | 37 | #include <net/pkt_sched.h> |
38 | 38 | ||
39 | #include "osd.h" | ||
39 | #include "include/logging.h" | 40 | #include "include/logging.h" |
40 | #include "include/vmbus.h" | 41 | #include "include/vmbus.h" |
41 | 42 | ||
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index f2576958f64..3b142ce9661 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <asm/kmap_types.h> | 43 | #include <asm/kmap_types.h> |
44 | #include <asm/atomic.h> | 44 | #include <asm/atomic.h> |
45 | 45 | ||
46 | #include "include/osd.h" | 46 | #include "osd.h" |
47 | 47 | ||
48 | 48 | ||
49 | /* Data types */ | 49 | /* Data types */ |
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/osd.h index 949c273e576..949c273e576 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/osd.h | |||
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index a79ea812bf4..fc5b02d5121 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c | |||
@@ -36,9 +36,9 @@ | |||
36 | 36 | ||
37 | #include <scsi/scsi_dbg.h> | 37 | #include <scsi/scsi_dbg.h> |
38 | 38 | ||
39 | #include "osd.h" | ||
39 | #include "include/logging.h" | 40 | #include "include/logging.h" |
40 | #include "include/vmbus.h" | 41 | #include "include/vmbus.h" |
41 | |||
42 | #include "include/StorVscApi.h" | 42 | #include "include/StorVscApi.h" |
43 | 43 | ||
44 | 44 | ||
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 0e13d778c00..bb40c2e15c3 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/irq.h> | 28 | #include <linux/irq.h> |
29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
30 | #include <linux/sysctl.h> | 30 | #include <linux/sysctl.h> |
31 | 31 | #include "osd.h" | |
32 | #include "include/logging.h" | 32 | #include "include/logging.h" |
33 | #include "include/vmbus.h" | 33 | #include "include/vmbus.h" |
34 | 34 | ||