diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
| commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
| tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /include/target/target_core_base.h | |
| parent | 1a99367023f6ac664365a37fa508b059e31d0e88 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/target/target_core_base.h')
| -rw-r--r-- | include/target/target_core_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 4a8795a87b9e..672150b6aaf5 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h | |||
| @@ -407,7 +407,7 @@ struct t10_reservation { | |||
| 407 | /* Activate Persistence across Target Power Loss enabled | 407 | /* Activate Persistence across Target Power Loss enabled |
| 408 | * for SCSI device */ | 408 | * for SCSI device */ |
| 409 | int pr_aptpl_active; | 409 | int pr_aptpl_active; |
| 410 | #define PR_APTPL_BUF_LEN 8192 | 410 | #define PR_APTPL_BUF_LEN 262144 |
| 411 | u32 pr_generation; | 411 | u32 pr_generation; |
| 412 | spinlock_t registration_lock; | 412 | spinlock_t registration_lock; |
| 413 | spinlock_t aptpl_reg_lock; | 413 | spinlock_t aptpl_reg_lock; |
