diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-23 20:33:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-23 20:33:12 +0100 |
| commit | 4eb0a7c8e195d4549221f9df3a0313254c493949 (patch) | |
| tree | 8abb3ca294129f55bd8c26ed012082a8082b907c /include | |
| parent | Merge branch 'for-5.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | tools/cgroup/slabinfo: update to work with struct slab (diff) | |
| download | linux-4eb0a7c8e195d4549221f9df3a0313254c493949.tar.xz linux-4eb0a7c8e195d4549221f9df3a0313254c493949.zip | |
Merge tag 'slab-for-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull slab fixes from Vlastimil Babka:
- Build fix (workaround) for clang.
- Fix a /proc/kcore based slabinfo script broken by struct slab changes
in 5.17-rc1.
* tag 'slab-for-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
tools/cgroup/slabinfo: update to work with struct slab
slab: remove __alloc_size attribute from __kmalloc_track_caller
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slab.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 37bde99b74af..5b6193fd8bd9 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -660,8 +660,7 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag * allocator where we care about the real place the memory allocation * request comes from. */ -extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller) - __alloc_size(1); +extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller); #define kmalloc_track_caller(size, flags) \ __kmalloc_track_caller(size, flags, _RET_IP_) |