projects / people / teissler / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | From foo@baz Tue Jul 14 10:18:50 PDT 2009 |
| 2 | Date: Tue, 14 Jul 2009 10:18:50 -0700 | |
| 3 | From: Greg Kroah-Hartman <gregkh@suse.de> | |
| 4 | Subject: Staging: hv: make the Hyper-V virtual storage driver build | |
| 5 | ||
| 6 | From: Greg Kroah-Hartman <gregkh@suse.de> | |
| 7 | ||
| 8 | The #define KERNEL_2_6_27 needs to be set, and I adjusted the include | |
| 9 | directories a bit to get things to build properly. | |
| 10 | ||
| 11 | I also fixed up the direct access of bus_id, as that field is now gone. | |
| 12 | Some minor scsi api changes were needed as well. | |
| 13 | ||
| 14 | The hv_storvsc code should now build properly, with no errors. | |
| 15 | ||
| 16 | Cc: Hank Janssen <hjanssen@microsoft.com> | |
| 17 | Cc: Haiyang Zhang <haiyangz@microsoft.com> | |
| 18 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 19 | ||
| 20 | --- | |
| 21 | drivers/staging/hv/StorVsc.c | 9 +++++---- | |
| 22 | drivers/staging/hv/storvsc_drv.c | 9 +++++---- | |
| 23 | 2 files changed, 10 insertions(+), 8 deletions(-) | |
| 24 | ||
| 25 | --- a/drivers/staging/hv/StorVsc.c | |
| 26 | +++ b/drivers/staging/hv/StorVsc.c | |
| 27 | @@ -21,12 +21,13 @@ | |
| 28 | * | |
| 29 | */ | |
| 30 | ||
| 31 | +#define KERNEL_2_6_27 | |
| 32 | ||
| 33 | -#include "logging.h" | |
| 34 | +#include "include/logging.h" | |
| 35 | ||
| 36 | -#include "StorVscApi.h" | |
| 37 | -#include "VmbusPacketFormat.h" | |
| 38 | -#include "vstorage.h" | |
| 39 | +#include "include/StorVscApi.h" | |
| 40 | +#include "include/VmbusPacketFormat.h" | |
| 41 | +#include "include/vstorage.h" | |
| 42 | ||
| 43 | ||
| 44 | // | |
| 45 | --- a/drivers/staging/hv/storvsc_drv.c | |
| 46 | +++ b/drivers/staging/hv/storvsc_drv.c | |
| 47 | @@ -21,6 +21,7 @@ | |
| 48 | * | |
| 49 | */ | |
| 50 | ||
| 51 | +#define KERNEL_2_6_27 | |
| 52 | ||
| 53 | #include <linux/init.h> | |
| 54 | #include <linux/module.h> | |
| 55 | @@ -40,10 +41,10 @@ | |
| 56 | #include <scsi/scsi_dbg.h> | |
| 57 | #endif | |
| 58 | ||
| 59 | -#include "logging.h" | |
| 60 | -#include "vmbus.h" | |
| 61 | +#include "include/logging.h" | |
| 62 | +#include "include/vmbus.h" | |
| 63 | ||
| 64 | -#include "StorVscApi.h" | |
| 65 | +#include "include/StorVscApi.h" | |
| 66 | ||
| 67 | // | |
| 68 | // #defines | |
| 69 | @@ -296,7 +297,7 @@ static int storvsc_probe(struct device * | |
| 70 | #if defined(KERNEL_2_6_27) | |
| 71 | host_device_ctx->request_pool = | |
| 72 | kmem_cache_create | |
| 73 | - (device_ctx->device.bus_id, | |
| 74 | + (dev_name(&device_ctx->device), | |
| 75 | sizeof(struct storvsc_cmd_request) + storvsc_drv_obj->RequestExtSize, | |
| 76 | 0, | |
| 77 | SLAB_HWCACHE_ALIGN, NULL); |