diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-05-03 12:52:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-05-03 12:52:45 +0200 |
| commit | 176d2323c7743e03e3bb4298b6f25eea2f00fed0 (patch) | |
| tree | c751cba895aa8870372c97c8340166de079eae8e /include/linux/nvme.h | |
| parent | 9b019acb72e4b5741d88e8936d6f200ed44b66b2 (diff) | |
| parent | ea9866793d1e925b4d320eaea409263b2a568f38 (diff) | |
| download | lwn-176d2323c7743e03e3bb4298b6f25eea2f00fed0.tar.gz lwn-176d2323c7743e03e3bb4298b6f25eea2f00fed0.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/nvme.h')
| -rw-r--r-- | include/linux/nvme.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index baa49e6a23cc..c40720cb59ac 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -967,8 +967,13 @@ struct nvme_get_log_page_command { __le16 numdl; __le16 numdu; __u16 rsvd11; - __le32 lpol; - __le32 lpou; + union { + struct { + __le32 lpol; + __le32 lpou; + }; + __le64 lpo; + }; __u32 rsvd14[2]; }; |