diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-08 12:13:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-08 12:13:22 +0100 |
| commit | b349e9a916772e867d0f9246d2978799897b2495 (patch) | |
| tree | baebdc1a0c1176198518ba6991fbf42ce4614910 /scripts/kernel-doc | |
| parent | 7c360572b430a0e9757bafc0c20f26c920f2a07f (diff) | |
| parent | 59fd1214561921343305a0e9dc218bf3d40068f3 (diff) | |
| download | cachepc-linux-b349e9a916772e867d0f9246d2978799897b2495.tar.gz cachepc-linux-b349e9a916772e867d0f9246d2978799897b2495.zip | |
Merge branch 'x86/urgent' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/kernel-doc')
| -rwxr-xr-x | scripts/kernel-doc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 638a38e1b419..c37255bb620d 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1816,6 +1816,8 @@ sub dump_struct($$) { $members =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//i; $members =~ s/__aligned\s*\([^;]*\)//gos; $members =~ s/\s*CRYPTO_MINALIGN_ATTR//gos; + # replace DECLARE_BITMAP + $members =~ s/DECLARE_BITMAP\s*\(([^,)]+), ([^,)]+)\)/unsigned long $1\[BITS_TO_LONGS($2)\]/gos; create_parameterlist($members, ';', $file); check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); @@ -1844,7 +1846,8 @@ sub dump_enum($$) { my $file = shift; $x =~ s@/\*.*?\*/@@gos; # strip comments. - $x =~ s/^#\s*define\s+.*$//; # strip #define macros inside enums + # strip #define macros inside enums + $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos; if ($x =~ /enum\s+(\w+)\s*{(.*)}/) { $declaration_name = $1; |