diff options
| author |   Uros Bizjak <ubizjak@gmail.com> | 2024-08-19 09:41:15 +0200 |
|---|---|---|
| committer |   Peter Zijlstra <peterz@infradead.org> | 2024-10-25 10:01:50 +0200 |
| commit | f730fd535fc51573f982fad629f2fc6b4a0cde2f (patch) | |
| tree | 08b041bd0c250ac66b7d0d5299f0ad1398db2143 | |
| parent | locking/rtmutex: Fix misleading comment (diff) | |
| download | wireguard-linux-f730fd535fc51573f982fad629f2fc6b4a0cde2f.tar.xz wireguard-linux-f730fd535fc51573f982fad629f2fc6b4a0cde2f.zip | |
cleanup: Remove address space of returned pointer
Guard functions in local_lock.h are defined using DEFINE_GUARD() and
DEFINE_LOCK_GUARD_1() macros having lock type defined as pointer in
the percpu address space. The functions, defined by these macros
return value in generic address space, causing:
cleanup.h:157:18: error: return from pointer to non-enclosed address space
and
cleanup.h:214:18: error: return from pointer to non-enclosed address space
when strict percpu checks are enabled.
Add explicit casts to remove address space of the returned pointer.
Found by GCC's named address space checks.
Fixes: e4ab322fbaaa ("cleanup: Add conditional guard support")
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20240819074124.143565-1-ubizjak@gmail.com
Diffstat (limited to '')
| -rw-r--r-- | include/linux/cleanup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h index 038b2d523bf8..518bd1fd86fb 100644 --- a/include/linux/cleanup.h +++ b/include/linux/cleanup.h @@ -290,7 +290,7 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \ #define DEFINE_GUARD(_name, _type, _lock, _unlock) \ DEFINE_CLASS(_name, _type, if (_T) { _unlock; }, ({ _lock; _T; }), _type _T); \ static inline void * class_##_name##_lock_ptr(class_##_name##_t *_T) \ - { return *_T; } + { return (void *)(__force unsigned long)*_T; } #define DEFINE_GUARD_COND(_name, _ext, _condlock) \ EXTEND_CLASS(_name, _ext, \ @@ -347,7 +347,7 @@ static inline void class_##_name##_destructor(class_##_name##_t *_T) \ \ static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T) \ { \ - return _T->lock; \ + return (void *)(__force unsigned long)_T->lock; \ } |