]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
missing: re-add drm related entries
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 7 Dec 2018 09:11:36 +0000 (18:11 +0900)
committerLennart Poettering <lennart@poettering.net>
Fri, 7 Dec 2018 11:46:55 +0000 (12:46 +0100)
This effectively reverts dab28f09051445fe370466e767e31652e0804a0f.

Fixes #11075.

src/basic/meson.build
src/basic/missing.h
src/basic/missing_drm.h [new file with mode: 0644]
src/login/logind-session-device.c

index fb6fa2fcfa2328c168b4f09a97e622daf51ab999..23b5e75bd8ae3e56ebb175708e49cc2b499e7217 100644 (file)
@@ -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
index 7e14e0a2a401f6137244c136e0054060838fb580..5067c8fd009a80bc426e494c57da523eb79d96bd 100644 (file)
@@ -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 (file)
index 0000000..a64f74e
--- /dev/null
@@ -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
index 0fcbe98c2a3dccdf2f02ef9fd0a0dcc44b9a691e..f358524ebcaae8484a006bfbbab927c9c8ccf473 100644 (file)
@@ -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"