]>
Commit | Line | Data |
---|---|---|
ab119548 DM |
1 | diff -ur a/drivers/scsi/hpsa_kernel_compat.h b/drivers/scsi/hpsa_kernel_compat.h |
2 | --- a/drivers/scsi/hpsa_kernel_compat.h 2015-01-13 17:54:31.000000000 +0100 | |
3 | +++ b/drivers/scsi/hpsa_kernel_compat.h 2015-01-13 18:00:01.000000000 +0100 | |
4 | @@ -49,7 +49,7 @@ | |
5 | /* #define SLES11sp2plus */ | |
6 | /* #define RHEL5 */ | |
7 | /* #define RHEL5u2 */ | |
8 | -/* #define RHEL6 */ | |
9 | +#define RHEL6 | |
10 | /* #define RHEL7 */ | |
11 | /* Default is kernel.org */ | |
12 | ||
13 | @@ -124,7 +124,7 @@ | |
14 | ||
15 | #ifdef RHEL6 /************ RHEL 6 ************/ | |
16 | #define KFEATURE_HAS_WAIT_FOR_COMPLETION_IO_TIMEOUT 0 | |
17 | -#define KFEATURE_HAS_WAIT_FOR_COMPLETION_IO 0 | |
18 | +#define KFEATURE_HAS_WAIT_FOR_COMPLETION_IO 1 | |
19 | #define KFEATURE_HAS_2011_03_INTERRUPT_HANDLER 1 | |
20 | #define KFEATURE_CHANGE_QDEPTH_HAS_REASON 1 | |
21 | #define KFEATURE_HAS_2011_03_STYLE_DEVICE_ATTR 1 | |
22 | @@ -684,7 +684,7 @@ | |
23 | * the thread that is doing the swapping i/o needs to allocate. | |
24 | */ | |
25 | #define WQ_MEM_RECLAIM (0) | |
26 | -#define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0) | |
27 | +#define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0, NULL) | |
28 | #endif | |
29 | ||
30 | #if !KFEATURE_HAS_ATOMIC_DEC_IF_POSITIVE |