diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-07-15 10:44:16 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-07-15 10:44:16 +0200 |
| commit | 436381eaf2a423e60fc8340399f7d2458091b383 (patch) | |
| tree | 16ecce9d2dcb5ed43de60a966e9026c9ffd6e711 /scripts | |
| parent | mm/memcg: alignment memcg_data define condition (diff) | |
| parent | mm/util: Use dedicated slab buckets for memdup_user() (diff) | |
| download | linux-436381eaf2a423e60fc8340399f7d2458091b383.tar.xz linux-436381eaf2a423e60fc8340399f7d2458091b383.zip | |
Merge branch 'slab/for-6.11/buckets' into slab/for-next
Merge all the slab patches previously collected on top of v6.10-rc1,
over cleanups/fixes that had to be based on rc6.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kernel-doc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 95a59ac78f82..2791f8195203 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1729,6 +1729,7 @@ sub dump_function($$) { $prototype =~ s/__printf\s*\(\s*\d*\s*,\s*\d*\s*\) +//; $prototype =~ s/__(?:re)?alloc_size\s*\(\s*\d+\s*(?:,\s*\d+\s*)?\) +//; $prototype =~ s/__diagnose_as\s*\(\s*\S+\s*(?:,\s*\d+\s*)*\) +//; + $prototype =~ s/DECL_BUCKET_PARAMS\s*\(\s*(\S+)\s*,\s*(\S+)\s*\)/$1, $2/; my $define = $prototype =~ s/^#\s*define\s+//; #ak added $prototype =~ s/__attribute_const__ +//; $prototype =~ s/__attribute__\s*\(\( |