aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-19 13:09:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-19 13:09:40 -0700
commit592be758f196ed4610e326fc3f33dadd80aa7c6b (patch)
treefab4cd98fb1101c1f7b789308ae97abcb697e099 /include
parentMerge tag 'drm-fixes-2020-06-19' of git://anongit.freedesktop.org/drm/drm (diff)
parentlibata: Use per port sync for detach (diff)
downloadwireguard-linux-592be758f196ed4610e326fc3f33dadd80aa7c6b.tar.xz
wireguard-linux-592be758f196ed4610e326fc3f33dadd80aa7c6b.zip
Merge tag 'libata-5.8-2020-06-19' of git://git.kernel.dk/linux-block
Pull libata fixes from Jens Axboe: "A few minor changes that should go into this release" * tag 'libata-5.8-2020-06-19' of git://git.kernel.dk/linux-block: libata: Use per port sync for detach ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function sata_rcar: handle pm_runtime_get_sync failure cases
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 8bf5e59a7859..675895ffa2dd 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -22,6 +22,7 @@
#include <linux/acpi.h>
#include <linux/cdrom.h>
#include <linux/sched.h>
+#include <linux/async.h>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -872,6 +873,8 @@ struct ata_port {
struct timer_list fastdrain_timer;
unsigned long fastdrain_cnt;
+ async_cookie_t cookie;
+
int em_message_type;
void *private_data;