Module Name: src
Committed By: jmcneill
Date: Sat Sep 3 20:02:34 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: ld_thunkbus.c
Log Message:
Now that pr45327 is fixed, remove BROKEN_SIGINFO code.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/dev/ld_thunkbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/dev/ld_thunkbus.c
diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.8 src/sys/arch/usermode/dev/ld_thunkbus.c:1.9
--- src/sys/arch/usermode/dev/ld_thunkbus.c:1.8 Sat Sep 3 19:07:32 2011
+++ src/sys/arch/usermode/dev/ld_thunkbus.c Sat Sep 3 20:02:34 2011
@@ -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 <[email protected]>
@@ -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);
