diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 13:33:12 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 13:33:12 -0700 |
| commit | c13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch) | |
| tree | 8f77894f61822d1ae5285c07c801af7c62f71afd /include/linux/blk_types.h | |
| parent | Input: elan_i2c_smbus - fix corrupted stack (diff) | |
| parent | Input: goodix - add new ACPI id for GPD Win 2 touch screen (diff) | |
| download | wireguard-linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.xz wireguard-linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'include/linux/blk_types.h')
| -rw-r--r-- | include/linux/blk_types.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index bf18b95ed92d..17b18b91ebac 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -20,8 +20,13 @@ typedef void (bio_end_io_t) (struct bio *); /* * Block error status values. See block/blk-core:blk_errors for the details. + * Alpha cannot write a byte atomically, so we need to use 32-bit value. */ +#if defined(CONFIG_ALPHA) && !defined(__alpha_bwx__) +typedef u32 __bitwise blk_status_t; +#else typedef u8 __bitwise blk_status_t; +#endif #define BLK_STS_OK 0 #define BLK_STS_NOTSUPP ((__force blk_status_t)1) #define BLK_STS_TIMEOUT ((__force blk_status_t)2) |