diff options
| author | Huacai Chen <chenhc@lemote.com> | 2017-11-24 15:14:25 -0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-12-08 18:01:16 -0500 |
| commit | 6c917e099dae9190f1947a5630d910dfbc6b2182 (patch) | |
| tree | 14d327d14f0207f0e4aab96626df85566ee26b69 /include | |
| parent | 9aaebcbeb063168251f9b816a3126c4c4dee70fb (diff) | |
| download | linux-6c917e099dae9190f1947a5630d910dfbc6b2182.tar.gz linux-6c917e099dae9190f1947a5630d910dfbc6b2182.tar.bz2 linux-6c917e099dae9190f1947a5630d910dfbc6b2182.zip | |
bcache: Fix building error on MIPS
[ Upstream commit cf33c1ee5254c6a430bc1538232b49c3ea13e613 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'include')
| -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 */ |