[PATCH 1/2] drm: Untangle __KERNEL__ guards

Daniel Vetter daniel at ffwll.ch
Wed Mar 30 19:11:46 UTC 2016


On Wed, Mar 30, 2016 at 04:56:17PM +0100, Emil Velikov wrote:
> On 30 March 2016 at 15:42, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> > make headers_install can't handle fancy conditions, so let's simplify
> > things for it a bit.
> >
> > Cc: Emil Velikov <emil.l.velikov at gmail.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> > ---
> >  include/uapi/drm/drm.h | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
> > index c7ecc3abff03..3b56285a7e2a 100644
> > --- a/include/uapi/drm/drm.h
> > +++ b/include/uapi/drm/drm.h
> > @@ -36,7 +36,13 @@
> >  #ifndef _DRM_H_
> >  #define _DRM_H_
> >
> > -#if defined(__KERNEL__) || defined(__linux__)
> > +#if defined(__KERNEL__)
> > +
> > +#include <linux/types.h>
> > +#include <asm/ioctl.h>
> > +typedef unsigned int drm_handle_t;
> > +
> > +#elif defined(__linux__)
> >
> Bit dubious how that used to work, and that the program fails with the
> original, yet handled "elif defined..." correctly.

I didn't dare looking into the horror show the script is - still charred
from looking too closely at kerneldoc ;-)

> Regardless,
> Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

Thanks for the review, all expect the last one (to make them pendantic
compliant, still missing r-b on that) applied to drm-misc.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list