diff options
| author |   Christoph Hellwig <hch@lst.de> | 2015-10-02 15:25:49 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-10-09 10:40:37 -0600 |
| commit | 9d99a8dda154f38307d43d9c9aa504bd3703d596 (patch) | |
| tree | a46c7d299552272d3f6d054e7495c2a5e584977c /drivers/block | |
| parent | nvme: add a local nvme.h header (diff) | |
| download | linux-dev-9d99a8dda154f38307d43d9c9aa504bd3703d596.tar.xz linux-dev-9d99a8dda154f38307d43d9c9aa504bd3703d596.zip | |
nvme: move hardware structures out of the uapi version of nvme.h
Currently all NVMe command and completion structures are exposed to userspace
through the uapi version of nvme.h. They are not an ABI between the kernel
and userspace, and will change in C-incompatible way for future versions of
the spec. Move them to the kernel version of the file and rename the uapi
header to nvme_ioctl.h so that userspace can easily detect the presence of
the new clean header. Nvme-cli already carries a local copy of the header,
so it won't be affected by this move.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nvme-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index a20f66a44b96..a526696d684d 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -42,6 +42,7 @@ #include <scsi/sg.h> #include <asm-generic/io-64-nonatomic-lo-hi.h> +#include <uapi/linux/nvme_ioctl.h> #include "nvme.h" #define NVME_MINORS (1U << MINORBITS) |