1 files changed, 3 insertions, 4 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 077a2ca33043..53ec3946670d 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -168,12 +168,11 @@ our @modifierList = (
 );
 
 sub build_types {
-        my $mods = "(?:  \n" . join("|\n  ", @modifierList) . "\n)";
-        my $all = "(?:  \n" . join("|\n  ", @typeList) . "\n)";
+        my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
+        my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
         $Modifier       = qr{(?:$Attribute|$Sparse|$mods)};
         $NonptrType     = qr{
-                        (?:const\s+)?
-                        (?:$mods\s+)?
+                        (?:$Modifier\s+|const\s+)*
                         (?:
                                 (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)|
                                 (?:${all}\b)