diff options
| author |   Huacai Chen <chenhc@lemote.com> | 2017-11-24 15:14:25 -0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2017-11-24 16:22:58 -0700 |
| commit | cf33c1ee5254c6a430bc1538232b49c3ea13e613 (patch) | |
| tree | 0318204e26ecf0913cbd7587e198828451d58a31 /include/uapi/linux/bcache.h | |
| parent | bcache: add a comment in journal bucket reading (diff) | |
| download | wireguard-linux-cf33c1ee5254c6a430bc1538232b49c3ea13e613.tar.xz wireguard-linux-cf33c1ee5254c6a430bc1538232b49c3ea13e613.zip | |
bcache: Fix building error on MIPS
This patch try to fix the building error on MIPS. The reason is MIPS
has already defined the PTR macro, which conflicts with the PTR macro
in include/uapi/linux/bcache.h.
[fixed by mlyle: corrected a line-length issue]
Cc: stable@vger.kernel.org
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/uapi/linux/bcache.h')
| -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 90fc490f973f..821f71a2e48f 100644 --- a/include/uapi/linux/bcache.h +++ b/include/uapi/linux/bcache.h @@ -91,7 +91,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 */ |