Skip to content

Commit

Permalink
Staging: hv: move osd.h
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent d7363a1 commit 4983b39
Show file tree
Hide file tree
Showing 25 changed files with 16 additions and 19 deletions.
1 change: 1 addition & 0 deletions drivers/staging/hv/BlkVsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <linux/kernel.h>
#include <linux/mm.h>
#include "osd.h"
#include "StorVsc.c"

static const char* gBlkDriverName="blkvsc";
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/Channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/Channel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/hv/ChannelInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

#include <linux/kernel.h>
#include <linux/mm.h>
#include "include/osd.h"

#include "osd.h"
#include "VmbusPrivate.h"

static int
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/ChannelMgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/ChannelMgmt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#ifndef _CHANNEL_MGMT_H_
#define _CHANNEL_MGMT_H_

#include "include/osd.h"
#include "include/List.h"
#include "RingBuffer.h"

Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/Connection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/Hv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/hv/Hv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/NetVsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/RingBuffer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include <linux/kernel.h>
#include <linux/mm.h>
#include "osd.h"
#include "include/logging.h"
#include "RingBuffer.h"

Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/hv/RingBuffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/RndisFilter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/RndisFilter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

#define __struct_bcount(x)

#include "include/osd.h"
#include "NetVsc.h"

#include "include/rndis.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/StorVsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/Vmbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/blkvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/include/List.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#ifndef _LIST_H_
#define _LIST_H_

#include "osd.h"
/*
*
* Doubly-linked list manipulation routines. Implemented as macros
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/include/VmbusApi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#ifndef _VMBUS_API_H_
#define _VMBUS_API_H_

#include "osd.h"


/* Defines */
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/include/logging.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
/* #include <linux/init.h> */
/* #include <linux/module.h> */

#include "osd.h"

#define VMBUS 0x0001
#define STORVSC 0x0002
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/hv/netvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <net/sock.h>
#include <net/pkt_sched.h>

#include "osd.h"
#include "include/logging.h"
#include "include/vmbus.h"

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/osd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <asm/kmap_types.h>
#include <asm/atomic.h>

#include "include/osd.h"
#include "osd.h"


/* Data types */
Expand Down
0 drivers/staging/hv/include/osd.h → drivers/staging/hv/osd.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/staging/hv/storvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

#include <scsi/scsi_dbg.h>

#include "osd.h"
#include "include/logging.h"
#include "include/vmbus.h"

#include "include/StorVscApi.h"


Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/vmbus_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 4983b39

Please sign in to comment.