On Thu, Oct 14, 2010 at 09:49:05AM -0700, Adam Jackson wrote: > Signed-off-by: Adam Jackson <a...@redhat.com> > --- > hw/xfree86/os-support/shared/sigio.c | 11 ----------- > hw/xfree86/os-support/shared/sigiostubs.c | 5 ----- > hw/xfree86/os-support/xf86_OSproc.h | 1 - > 3 files changed, 0 insertions(+), 17 deletions(-)
We use these asserts in the nvidia driver to make sure that SIGIO is properly blocked around code that touches the display engine. It would be a shame to lose this, but we could roll our own checks if you really think these need to be removed. > diff --git a/hw/xfree86/os-support/shared/sigio.c > b/hw/xfree86/os-support/shared/sigio.c > index 274a8ab..f3d322f 100644 > --- a/hw/xfree86/os-support/shared/sigio.c > +++ b/hw/xfree86/os-support/shared/sigio.c > @@ -289,17 +289,6 @@ xf86UnblockSIGIO (int wasset) > } > } > > -void > -xf86AssertBlockedSIGIO (char *where) > -{ > - sigset_t set, old; > - > - sigemptyset (&set); > - sigprocmask (SIG_BLOCK, &set, &old); > - if (!sigismember (&old, SIGIO)) > - xf86Msg (X_ERROR, "SIGIO not blocked at %s\n", where); > -} > - > /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ > > int > diff --git a/hw/xfree86/os-support/shared/sigiostubs.c > b/hw/xfree86/os-support/shared/sigiostubs.c > index cecec37..9a92d84 100644 > --- a/hw/xfree86/os-support/shared/sigiostubs.c > +++ b/hw/xfree86/os-support/shared/sigiostubs.c > @@ -57,11 +57,6 @@ xf86UnblockSIGIO (int wasset) > { > } > > -void > -xf86AssertBlockedSIGIO (char *where) > -{ > -} > - > /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ > Bool > xf86SIGIOSupported () > diff --git a/hw/xfree86/os-support/xf86_OSproc.h > b/hw/xfree86/os-support/xf86_OSproc.h > index f0cb768..b97b335 100644 > --- a/hw/xfree86/os-support/xf86_OSproc.h > +++ b/hw/xfree86/os-support/xf86_OSproc.h > @@ -192,7 +192,6 @@ extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void > (*f)(int, void *), voi > extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd); > extern _X_EXPORT int xf86BlockSIGIO (void); > extern _X_EXPORT void xf86UnblockSIGIO (int); > -extern _X_EXPORT void xf86AssertBlockedSIGIO (char *); > extern _X_EXPORT Bool xf86SIGIOSupported (void); > > #ifdef XF86_OS_PRIVS > -- > 1.7.2.3 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel