Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hpcmips/tx PR/32394 -- Don't define 'panic' label u...



details:   https://anonhg.NetBSD.org/src/rev/9dcc4315e000
branches:  trunk
changeset: 771754:9dcc4315e000
user:      shattered <shattered%NetBSD.org@localhost>
date:      Fri Dec 02 18:07:26 2011 +0000

description:
PR/32394 -- Don't define 'panic' label unconditionally, or "minimal
mobilepro 780 kernel configuration will not build".

OK by wiz@

diffstat:

 sys/arch/hpcmips/tx/tx39.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 51e49cf5b9d4 -r 9dcc4315e000 sys/arch/hpcmips/tx/tx39.c
--- a/sys/arch/hpcmips/tx/tx39.c        Fri Dec 02 16:37:43 2011 +0000
+++ b/sys/arch/hpcmips/tx/tx39.c        Fri Dec 02 18:07:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $ */
+/*     $NetBSD: tx39.c,v 1.44 2011/12/02 18:07:26 shattered Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.43 2011/02/26 12:07:45 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tx39.c,v 1.44 2011/12/02 18:07:26 shattered Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -285,7 +285,9 @@
        }
        
        return;
+#if (NM38813C > 0) || (NTC5165BUF > 0)
  panic:
+#endif
        panic("tx_cons_init: can't init console");
        /* NOTREACHED */
 }



Home | Main Index | Thread Index | Old Index