checkpatch: warn on uapi #includes that #include <uapi/...

JoePerches · torvalds · commit 495e9d84607c · 2012-12-20T17:40:20.000-08:00
Avoid specifying internal uapi #include paths with uapi/...  as
userspace should not use and never see that.

Neaten message line wrapping above.

Signed-off-by: Joe Perches &lt;joe@perches.com&gt;
Acked-by: David Howells &lt;dhowells@redhat.com&gt;
Acked-by: Andy Whitcroft &lt;apw@canonical.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
@@ -2226,8 +2226,11 @@ sub process {
 			my $path = $1;
 			if ($path =~ m{//}) {
 				ERROR("MALFORMED_INCLUDE",
-				      "malformed #include filename\n" .
-					$herecurr);
+				      "malformed #include filename\n" . $herecurr);
+			}
+			if ($path =~ "^uapi/" && $realfile =~ m@\binclude/uapi/@) {
+				ERROR("UAPI_INCLUDE",
+				      "No #include in ...include/uapi/... should use a uapi/ path prefix\n" . $herecurr);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -2226,8 +2226,11 @@ sub process {`
`2226`	`2226`	`my $path = $1;`
`2227`	`2227`	`if ($path =~ m{//}) {`
`2228`	`2228`	`ERROR("MALFORMED_INCLUDE",`
`2229`		`- "malformed #include filename\n" .`
`2230`		`- $herecurr);`
	`2229`	`+ "malformed #include filename\n" . $herecurr);`
	`2230`	`+ }`
	`2231`	`+ if ($path =~ "^uapi/" && $realfile =~ m@\binclude/uapi/@) {`
	`2232`	`+ ERROR("UAPI_INCLUDE",`
	`2233`	`+ "No #include in ...include/uapi/... should use a uapi/ path prefix\n" . $herecurr);`
`2231`	`2234`	`}`
`2232`	`2235`	`}`
`2233`	`2236`