mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-11 13:27:06 +09:00
Merge 624ad333d4 ("Merge tag 'docs-5.16' of git://git.lwn.net/linux") into android-mainline
Steps on the way to 5.16-rc1 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I73d8bec65f45ab651aeab83ee60cc66dc36467e3
This commit is contained in:
@@ -94,6 +94,9 @@ while (<IN>) {
|
||||
# Makefiles and scripts contain nasty expressions to parse docs
|
||||
next if ($f =~ m/Makefile/ || $f =~ m/\.sh$/);
|
||||
|
||||
# It doesn't make sense to parse hidden files
|
||||
next if ($f =~ m#/\.#);
|
||||
|
||||
# Skip this script
|
||||
next if ($f eq $scriptname);
|
||||
|
||||
@@ -144,6 +147,7 @@ while (<IN>) {
|
||||
if ($f =~ m/tools/) {
|
||||
my $path = $f;
|
||||
$path =~ s,(.*)/.*,$1,;
|
||||
$path =~ s,testing/selftests/bpf,bpf/bpftool,;
|
||||
next if (grep -e, glob("$path/$ref $path/../$ref $path/$fulref"));
|
||||
}
|
||||
|
||||
|
||||
@@ -1256,6 +1256,7 @@ sub dump_struct($$) {
|
||||
my $args = qr{([^,)]+)};
|
||||
# replace DECLARE_BITMAP
|
||||
$members =~ s/__ETHTOOL_DECLARE_LINK_MODE_MASK\s*\(([^\)]+)\)/DECLARE_BITMAP($1, __ETHTOOL_LINK_MODE_MASK_NBITS)/gos;
|
||||
$members =~ s/DECLARE_PHY_INTERFACE_MASK\s*\(([^\)]+)\)/DECLARE_BITMAP($1, PHY_INTERFACE_MODE_MAX)/gos;
|
||||
$members =~ s/DECLARE_BITMAP\s*\($args,\s*$args\)/unsigned long $1\[BITS_TO_LONGS($2)\]/gos;
|
||||
# replace DECLARE_HASHTABLE
|
||||
$members =~ s/DECLARE_HASHTABLE\s*\($args,\s*$args\)/unsigned long $1\[1 << (($2) - 1)\]/gos;
|
||||
@@ -1798,6 +1799,7 @@ sub dump_function($$) {
|
||||
$prototype =~ s/__weak +//;
|
||||
$prototype =~ s/__sched +//;
|
||||
$prototype =~ s/__printf\s*\(\s*\d*\s*,\s*\d*\s*\) +//;
|
||||
$prototype =~ s/__alloc_size\s*\(\s*\d+\s*(?:,\s*\d+\s*)?\) +//;
|
||||
my $define = $prototype =~ s/^#\s*define\s+//; #ak added
|
||||
$prototype =~ s/__attribute_const__ +//;
|
||||
$prototype =~ s/__attribute__\s*\(\(
|
||||
|
||||
Reference in New Issue
Block a user