[src/trunk]: src/sys/arch/usermode/dev Now that pr45327 is fixed, remove BROK...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6504be83288b
branches:  trunk
changeset: 769222:6504be83288b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Sep 03 20:02:34 2011 +0000

description:
Now that pr45327 is fixed, remove BROKEN_SIGINFO code.

diffstat:

 sys/arch/usermode/dev/ld_thunkbus.c |  24 ++----------------------
 1 files changed, 2 insertions(+), 22 deletions(-)

diffs (69 lines):

diff -r f5a31d37934d -r 6504be83288b sys/arch/usermode/dev/ld_thunkbus.c
--- a/sys/arch/usermode/dev/ld_thunkbus.c       Sat Sep 03 19:33:40 2011 +0000
+++ b/sys/arch/usermode/dev/ld_thunkbus.c       Sat Sep 03 20:02:34 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_thunkbus.c,v 1.8 2011/09/03 19:07:32 jmcneill Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.9 2011/09/03 20:02:34 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,10 +26,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BROKEN_SIGINFO
-
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.8 2011/09/03 19:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.9 2011/09/03 20:02:34 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -71,10 +69,6 @@
        struct ld_thunkbus_transfer sc_tt;
 };
 
-#ifdef BROKEN_SIGINFO
-struct ld_thunkbus_transfer *ld_thunkbus_tt;
-#endif
-
 CFATTACH_DECL_NEW(ld_thunkbus, sizeof(struct ld_thunkbus_softc),
     ld_thunkbus_match, ld_thunkbus_attach, NULL, NULL);
 
@@ -86,12 +80,6 @@
        if (taa->taa_type != THUNKBUS_TYPE_DISKIMAGE)
                return 0;
 
-#ifdef BROKEN_SIGINFO
-       /* We can only have one instance if siginfo doesn't work */
-       if (ld_thunkbus_tt != NULL)
-               return 0;
-#endif
-
        return 1;
 }
 
@@ -117,10 +105,6 @@
                return;
        }
 
-#ifdef BROKEN_SIGINFO
-       ld_thunkbus_tt = &sc->sc_tt;
-#endif
-
        aprint_naive("\n");
        aprint_normal(": %s (%lld)\n", path, (long long)size);
 
@@ -154,12 +138,8 @@
        curcpu()->ci_idepth++;
 
        if (info->si_signo == SIGIO) {
-#ifdef BROKEN_SIGINFO
-               tt = ld_thunkbus_tt;
-#else
                if (info->si_code == SI_ASYNCIO)
                        tt = info->si_value.sival_ptr;
-#endif
                if (tt) {
                        sc = tt->tt_sc;
                        softint_schedule(sc->sc_ih);