Re: i915_gpu_error.c build failure

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

On Fri, May 13, 2016 at 02:38:22PM +0100, Robert Swindells wrote:
> 
> Patrick Welche wrote:
> >amd64 kernels built without DIAGNOSTIC fail with
> >
> >/usr/src/sys/external/bsd/drm2/dist/drm/i915/i915_gpu_error.c:608:8: error: implicit declaration of function 'cpu_intr_p' [-We
> >rror=implicit-function-declaration]
> >    if (cpu_intr_p() || cpu_softintr_p() ||
> >
> >(Trying to figure out cpu.h inclusion difference but haven't found it...)
> 
> It seems to be in:
> 
> sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h

Thanks! OK to commit trivial patch attached?

Cheers,

Patrick

Index: sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h,v
retrieving revision 1.13
diff -u -p -r1.13 drm_wait_netbsd.h
--- sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h	12 Apr 2015 20:55:02 -0000	1.13
+++ sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h	13 May 2016 14:25:22 -0000
@@ -34,9 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/condvar.h>
-#if DIAGNOSTIC
 #include <sys/cpu.h>		/* cpu_intr_p */
-#endif
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>