diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 20:11:06 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 20:11:06 +0300 |
| commit | c13cac2a21b44c6d18a2cf5485f26eee0fb686f6 (patch) | |
| tree | 1cf120a57dbbc95a2d450f1c2047e89b9f917596 /arch/arm64/include/asm/cache.h | |
| parent | bb8865f435d81223596f1abd6dec0b12ed122af0 (diff) | |
| parent | 98d54f81e36ba3bf92172791eba5ca5bd813989b (diff) | |
| download | linux-c13cac2a21b44c6d18a2cf5485f26eee0fb686f6.tar.xz | |
Merge tag 'v5.6-rc4' into rdma.git for-next
Required due to dependencies in following patches.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'arch/arm64/include/asm/cache.h')
| -rw-r--r-- | arch/arm64/include/asm/cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index 806e9dc2a852..a4d1b5f771f6 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -69,7 +69,7 @@ static inline int icache_is_aliasing(void) return test_bit(ICACHEF_ALIASING, &__icache_flags); } -static inline int icache_is_vpipt(void) +static __always_inline int icache_is_vpipt(void) { return test_bit(ICACHEF_VPIPT, &__icache_flags); } |