From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 7 Dec 2018 09:11:36 +0000 (+0900)
Subject: missing: re-add drm related entries
X-Git-Tag: v240~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b139f86a6e034993c7476b1278e4e7cc2a33c1c;p=thirdparty%2Fsystemd.git

missing: re-add drm related entries

This effectively reverts dab28f09051445fe370466e767e31652e0804a0f.

Fixes #11075.
---

diff --git a/src/basic/meson.build b/src/basic/meson.build
index fb6fa2fcfa2..23b5e75bd8a 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -96,6 +96,7 @@ basic_sources = files('''
         missing_btrfs.h
         missing_btrfs_tree.h
         missing_capability.h
+        missing_drm.h
         missing_ethtool.h
         missing_fcntl.h
         missing_fib_rules.h
diff --git a/src/basic/missing.h b/src/basic/missing.h
index 7e14e0a2a40..5067c8fd009 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -6,6 +6,7 @@
 #include "missing_audit.h"
 #include "missing_btrfs_tree.h"
 #include "missing_capability.h"
+#include "missing_drm.h"
 #include "missing_fcntl.h"
 #include "missing_fs.h"
 #include "missing_input.h"
diff --git a/src/basic/missing_drm.h b/src/basic/missing_drm.h
new file mode 100644
index 00000000000..a64f74efdae
--- /dev/null
+++ b/src/basic/missing_drm.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#ifndef DRM_IOCTL_SET_MASTER
+#define DRM_IOCTL_SET_MASTER _IO('d', 0x1e)
+#endif
+
+#ifndef DRM_IOCTL_DROP_MASTER
+#define DRM_IOCTL_DROP_MASTER _IO('d', 0x1f)
+#endif
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 0fcbe98c2a3..f358524ebca 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -3,13 +3,9 @@
 #include <fcntl.h>
 #include <linux/input.h>
 #include <string.h>
-#include <stdint.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-/* Old drm.h may needs to be included after stdint.h and sys/types.h */
-#include <drm/drm.h>
-
 #include "sd-device.h"
 
 #include "alloc-util.h"