diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-08 14:03:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-08 14:03:35 +0800 |
| commit | f2363994a726dff665d850042ace77e100a80d4a (patch) | |
| tree | 8e47bd341509fa369502223c2113dbe01277817e /include/uapi | |
| parent | 81ab793d6dcb61c8ca908b442cc7b98be7ffa02c (diff) | |
| parent | bd379939182247ace70e425ab60b3b1352db601b (diff) | |
Merge tag 'v4.4.104' into linux-linaro-lsk-v4.4
This is the 4.4.104 stable release
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/bcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h index 22b6ad31c706..8562b1cb776b 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -90,7 +90,7 @@ PTR_FIELD(PTR_GEN, 0, 8) #define PTR_CHECK_DEV ((1 << PTR_DEV_BITS) - 1) -#define PTR(gen, offset, dev) \ +#define MAKE_PTR(gen, offset, dev) \ ((((__u64) dev) << 51) | ((__u64) offset) << 8 | gen) /* Bkey utility code */ |