c287d789b7
A number of merge conflicts, but hopefully they are all sorted out now. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
|
|
From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
|
Date: Mon, 30 Jan 2017 16:32:06 -0600
|
|
Subject: [PATCH] Remove check for useSIGIO option
|
|
|
|
Original patch follows:
|
|
Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO
|
|
option.
|
|
|
|
As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO
|
|
and OsReleaseSIGIO.
|
|
|
|
No longer the check for useSIGIO is needed
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
|
|
|
Downloaded from
|
|
https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
|
|
|
|
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
|
|
---
|
|
hw/xfree86/os-support/shared/sigio.c | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
|
|
index 884a71c..be76498 100644
|
|
--- a/hw/xfree86/os-support/shared/sigio.c
|
|
+++ b/hw/xfree86/os-support/shared/sigio.c
|
|
@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
|
|
int i;
|
|
int installed = FALSE;
|
|
|
|
- if (!xf86Info.useSIGIO)
|
|
- return 0;
|
|
-
|
|
for (i = 0; i < MAX_FUNCS; i++) {
|
|
if (!xf86SigIOFuncs[i].f) {
|
|
if (xf86IsPipe(fd))
|
|
@@ -257,9 +256,6 @@ xf86RemoveSIGIOHandler(int fd)
|
|
int max;
|
|
int ret;
|
|
|
|
- if (!xf86Info.useSIGIO)
|
|
- return 0;
|
|
-
|
|
max = 0;
|
|
ret = 0;
|
|
for (i = 0; i < MAX_FUNCS; i++) {
|
|
--
|
|
2.7.4
|
|
|