Commit b462b37b authored May 25, 2016 by Linus Torvalds

linux

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

parents 24c82fbb 92181d47

scripts/headers_check.pl

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 " .

Admin message