Date: Mon, 28 Feb 2011 17:36:56 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 189287 for review Message-ID: <201102281736.p1SHauVI014367@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@189287?ac=10 Change 189287 by mjacob@mjacob-sandbox on 2011/02/28 17:36:50 Remove my local sio_suppressed hack- it gets in the way of running a clean 'make universe' and it isn't worth fixing for all architecture. Affected files ... .. //depot/projects/mjacob-dev/sys/dev/uart/uart_tty.c#4 edit .. //depot/projects/mjacob-dev/sys/kern/kern_shutdown.c#3 edit .. //depot/projects/mjacob-dev/sys/kern/subr_kdb.c#4 edit Differences ... ==== //depot/projects/mjacob-dev/sys/dev/uart/uart_tty.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ #include <machine/bus.h> #include <sys/rman.h> #include <sys/tty.h> -#include <sys/sysctl.h> #include <machine/resource.h> #include <machine/stdarg.h> @@ -108,15 +107,10 @@ uart_term(cp->cn_arg); } -int sio_suppressed = 0; -SYSCTL_INT(_machdep, OID_AUTO, sio_suppressed, CTLFLAG_RW, &sio_suppressed, 0, ""); - static void uart_cnputc(struct consdev *cp, int c) { - if (sio_suppressed) { - return; - } + uart_putc(cp->cn_arg, c); } ==== //depot/projects/mjacob-dev/sys/kern/kern_shutdown.c#3 (text+ko) ==== @@ -512,8 +512,6 @@ /* NOTREACHED */ /* assuming reset worked */ } -extern int sio_suppressed; - /* * Panic is called on unresolvable fatal errors. It prints "panic: mesg", * and then reboots. If we are called twice, then we avoid trying to sync @@ -530,7 +528,6 @@ va_list ap; static char buf[256]; - sio_suppressed = 0; critical_enter(); #ifdef SMP /* ==== //depot/projects/mjacob-dev/sys/kern/subr_kdb.c#4 (text+ko) ==== @@ -271,7 +271,6 @@ return (brk); } -extern int sio_suppressed; /* * Print a backtrace of the calling thread. The backtrace is generated by * the selected debugger, provided it supports backtraces. If no debugger @@ -282,8 +281,6 @@ void kdb_backtrace(void) { - int osup = sio_suppressed; - sio_suppressed = 0; if (kdb_dbbe != NULL && kdb_dbbe->dbbe_trace != NULL) { printf("KDB: stack backtrace:\n"); @@ -298,7 +295,6 @@ stack_print_ddb(&st); } #endif - sio_suppressed = osup; } /* @@ -331,8 +327,6 @@ void kdb_enter(const char *why, const char *msg) { - int osup = sio_suppressed; - sio_suppressed = 0; if (kdb_dbbe != NULL && kdb_active == 0) { if (msg != NULL) @@ -341,7 +335,6 @@ breakpoint(); kdb_why = KDB_WHY_UNSET; } - sio_suppressed = osup; } /* @@ -510,8 +503,6 @@ int did_stop_cpus; #endif int handled; - int osup = sio_suppressed; - sio_suppressed = 0; be = kdb_dbbe; if (be == NULL || be->dbbe_trap == NULL) @@ -557,6 +548,5 @@ intr_restore(intr); - sio_suppressed = osup; return (handled); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102281736.p1SHauVI014367>