diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-04-16 14:04:59 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-04-16 14:04:59 -0700 |
| commit | 640958fde130acfea98f539dfd4de6a9e72cf012 (patch) | |
| tree | c122cb130940b99f79e9b21cdc00c7437afd98ce /scripts | |
| parent | 4e2e3612922529f03a6fb380d416ba8c968b34cc (diff) | |
| parent | 0bbac3facb5d6cc0171c45c9873a2dc96bea9680 (diff) | |
Merge branch 'master' into mm-stable
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gcc-plugins/stackleak_plugin.c | 2 | ||||
| -rwxr-xr-x | scripts/kernel-doc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c index c5c2ce113c92..d20c47d21ad8 100644 --- a/scripts/gcc-plugins/stackleak_plugin.c +++ b/scripts/gcc-plugins/stackleak_plugin.c @@ -467,6 +467,8 @@ static bool stackleak_gate(void) return false; if (STRING_EQUAL(section, ".entry.text")) return false; + if (STRING_EQUAL(section, ".head.text")) + return false; } return track_frame_size >= 0; diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 967f1abb0edb..cb1be22afc65 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1541,7 +1541,7 @@ sub create_parameterlist($$$$) { save_struct_actual($2); push_parameter($2, "$type $1", $arg, $file, $declaration_name); - } elsif ($param =~ m/(.*?):(\d+)/) { + } elsif ($param =~ m/(.*?):(\w+)/) { if ($type ne "") { # skip unnamed bit-fields save_struct_actual($1); push_parameter($1, "$type:$2", $arg, $file, $declaration_name) |