[PATCH] Compat fixes for DRM & prctl()

[PATCH] Compat fixes for DRM & prctl()

[Michael Ellerman]

---
 include/compat.h | 9 +++++++++
 ioctls/drm.c     | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/include/compat.h b/include/compat.h
index 51f0936..8bdaf92 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -257,10 +257,19 @@ enum {
 
 #ifndef PR_SET_MM
 #define PR_SET_MM               35
+#endif
+
+#ifndef PR_SET_CHILD_SUBREAPER
 #define PR_SET_CHILD_SUBREAPER  36
 #define PR_GET_CHILD_SUBREAPER  37
+#endif
+
+#ifndef PR_SET_NO_NEW_PRIVS
 #define PR_SET_NO_NEW_PRIVS     38
 #define PR_GET_NO_NEW_PRIVS     39
+#endif
+
+#ifndef PR_GET_TID_ADDRESS
 #define PR_GET_TID_ADDRESS      40
 #endif
 
diff --git a/ioctls/drm.c b/ioctls/drm.c
index 986b668..1f6174a 100644
--- a/ioctls/drm.c
+++ b/ioctls/drm.c
@@ -276,7 +276,9 @@ static const struct ioctl drm_ioctls[] = {
 #ifdef DRM_IOCTL_EXYNOS_GEM_GET
 	IOCTL(DRM_IOCTL_EXYNOS_GEM_GET),
 #endif
+#ifdef DRM_IOCTL_EXYNOS_VIDI_CONNECTION
 	IOCTL(DRM_IOCTL_EXYNOS_VIDI_CONNECTION),
+#endif
 #ifdef DRM_IOCTL_EXYNOS_G2D_GET_VER
 	IOCTL(DRM_IOCTL_EXYNOS_G2D_GET_VER),
 #endif
-- 
1.9.1

Re: [PATCH] Compat fixes for DRM & prctl()

[Dave Jones]

On Fri, May 23, 2014 at 07:09:25PM +1000, Michael Ellerman wrote:
 > ---
 >  include/compat.h | 9 +++++++++
 >  ioctls/drm.c     | 2 ++
 >  2 files changed, 11 insertions(+)
 > 
 > diff --git a/include/compat.h b/include/compat.h
 > index 51f0936..8bdaf92 100644
 > --- a/include/compat.h
 > +++ b/include/compat.h
 > @@ -257,10 +257,19 @@ enum {
 >  
 >  #ifndef PR_SET_MM
 >  #define PR_SET_MM               35
 > +#endif
 > +
 > +#ifndef PR_SET_CHILD_SUBREAPER
 >  #define PR_SET_CHILD_SUBREAPER  36
 >  #define PR_GET_CHILD_SUBREAPER  37
 > +#endif
 > +
 > +#ifndef PR_SET_NO_NEW_PRIVS
 >  #define PR_SET_NO_NEW_PRIVS     38
 >  #define PR_GET_NO_NEW_PRIVS     39
 > +#endif
 > +
 > +#ifndef PR_GET_TID_ADDRESS
 >  #define PR_GET_TID_ADDRESS      40
 >  #endif

I applied Vinson's variant of this, which I think should be
sufficient, because iirc, those all got added at the same time.
Can you send a follow up if needed ?

I edited your diff and applied the DRM part separately.

thanks,

	Dave

Re: [PATCH] Compat fixes for DRM & prctl()

[Michael Ellerman]

On Fri, 2014-05-23 at 20:48 -0400, Dave Jones wrote:
> On Fri, May 23, 2014 at 07:09:25PM +1000, Michael Ellerman wrote:
>  > ---
>  >  include/compat.h | 9 +++++++++
>  >  ioctls/drm.c     | 2 ++
>  >  2 files changed, 11 insertions(+)
>  > 
>  > diff --git a/include/compat.h b/include/compat.h
>  > index 51f0936..8bdaf92 100644
>  > --- a/include/compat.h
>  > +++ b/include/compat.h
>  > @@ -257,10 +257,19 @@ enum {
>  >  
>  >  #ifndef PR_SET_MM
>  >  #define PR_SET_MM               35
>  > +#endif
>  > +
>  > +#ifndef PR_SET_CHILD_SUBREAPER
>  >  #define PR_SET_CHILD_SUBREAPER  36
>  >  #define PR_GET_CHILD_SUBREAPER  37
>  > +#endif
>  > +
>  > +#ifndef PR_SET_NO_NEW_PRIVS
>  >  #define PR_SET_NO_NEW_PRIVS     38
>  >  #define PR_GET_NO_NEW_PRIVS     39
>  > +#endif
>  > +
>  > +#ifndef PR_GET_TID_ADDRESS
>  >  #define PR_GET_TID_ADDRESS      40
>  >  #endif
> 
> I applied Vinson's variant of this, which I think should be
> sufficient, because iirc, those all got added at the same time.
> Can you send a follow up if needed ?

OK. I had a quick look and it looked like some were added separately, but
Vinson's patch builds for me so that's fine.

> I edited your diff and applied the DRM part separately.

Thanks.

cheers