diff options
author | Jens Axboe <axboe@kernel.dk> | 2019-12-07 03:27:56 +0300 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-12-07 03:27:56 +0300 |
commit | dc3ecfc9819a96b2a6700b01443347b01e07a13b (patch) | |
tree | 4ecc369d0114698ef84af1dc459f1fa33df55a07 /drivers/nvme/host/nvme.h | |
parent | 8539429917c48c994d2e2cafa02ab06587b3b42c (diff) | |
parent | 7e4c6b9a5d22485acf009b3c3510a370f096dd54 (diff) | |
download | linux-dc3ecfc9819a96b2a6700b01443347b01e07a13b.tar.xz |
Merge branch 'nvme/for-5.5' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Keith
* 'nvme/for-5.5' of git://git.infradead.org/nvme:
nvme/pci: Fix read queue count
nvme/pci Limit write queue sizes to possible cpus
nvme/pci: Fix write and poll queue types
nvme/pci: Remove last_cq_head
nvme: Namepace identification descriptor list is optional
nvme-fc: fix double-free scenarios on hw queues
nvme: else following return is not needed
nvme: add error message on mismatching controller ids
nvme_fc: add module to ops template to allow module references
nvmet-loop: Avoid preallocating big SGL for data
nvme-fc: Avoid preallocating big SGL for data
nvme-rdma: Avoid preallocating big SGL for data
Diffstat (limited to 'drivers/nvme/host/nvme.h')
-rw-r--r-- | drivers/nvme/host/nvme.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 3b9cbe0668fa..1024fec7914c 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -28,6 +28,12 @@ extern unsigned int admin_timeout; #define NVME_DEFAULT_KATO 5 #define NVME_KATO_GRACE 10 +#ifdef CONFIG_ARCH_NO_SG_CHAIN +#define NVME_INLINE_SG_CNT 0 +#else +#define NVME_INLINE_SG_CNT 2 +#endif + extern struct workqueue_struct *nvme_wq; extern struct workqueue_struct *nvme_reset_wq; extern struct workqueue_struct *nvme_delete_wq; |