Merge tag 'drm-4.7-rc1-headers-fix' of git://people.freedesktop.org/~airlied/linux

b462b37b · Linus Torvalds <[email protected]> · 2016-05-25 09:37:50 -07:00

Pull header warning fix from Dave Airlie:
 "Here is the C++ guards warning fix from Arnd"

[ Background: there are 'extern "C" { }' guards in include/uapi for the
  GPU headers.

  They should arguably be wrapped somehow, but as it is they caused
  checkpatch to warn because it would trigger on the 'extern' and think
  it's exporting a function or variable from the kernel to user space.

  This just fixes checkpatch.  Whether we wrap the C++ guards some way
  in the future will be an independent issue. ]

* tag 'drm-4.7-rc1-headers-fix' of git://people.freedesktop.org/~airlied/linux:
  headers_check: don't warn about c++ guards

Commit: b462b37b08be1b6a4e380d78b978ec1ff84e2783
Parents: 24c82fbb · 92181d47

Merge commit. Changes below are compared with the first parent: 24c82fbb.

Changes

1 files changed · +4 −0

File	Status	Add	Del	Content
scripts/headers_check.pl	modified	+4	−0	View file

scripts/headers_check.pl

View file

diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index 62320f9..8b2da05 100755
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -69,6 +69,10 @@ sub check_declarations
 	if ($line =~ m/^void seqbuf_dump\(void\);/) {
 		return;
 	}
+	# drm headers are being C++ friendly
+	if ($line =~ m/^extern "C"/) {
+		return;
+	}
 	if ($line =~ m/^(\s*extern|unsigned|char|short|int|long|void)\b/) {
 		printf STDERR "$filename:$lineno: " .
 			      "userspace cannot reference function or " .