Source-Changes-HG archive

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

[src/netbsd-1-6]: src/sys/arch/newsmips/newsmips Pull up revision 1.7 (reques...



details:   https://anonhg.NetBSD.org/src/rev/de08d50040a9
branches:  netbsd-1-6
changeset: 530324:de08d50040a9
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 16 21:54:14 2003 +0000

description:
Pull up revision 1.7 (requested by tsutsui in ticket #1276):

Fix unexpected fallthrough in switch statement.

This should fix boot failure of the INSTALL kernel
on news3400 with serial console.

diffstat:

 sys/arch/newsmips/newsmips/cpu_cons.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 459bd94ff0f5 -r de08d50040a9 sys/arch/newsmips/newsmips/cpu_cons.c
--- a/sys/arch/newsmips/newsmips/cpu_cons.c     Mon Jun 16 21:52:40 2003 +0000
+++ b/sys/arch/newsmips/newsmips/cpu_cons.c     Mon Jun 16 21:54:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu_cons.c,v 1.6 2000/11/15 14:29:41 tsubai Exp $      */
+/*     $NetBSD: cpu_cons.c,v 1.6.18.1 2003/06/16 21:54:14 grant Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -95,7 +95,7 @@
                if (*dipsw & SW_CONSOLE) {
                        fb_cnattach();
                        kb_hb_cnattach();
-                       return;
+                       break;
                }
 #endif
 
@@ -103,6 +103,7 @@
                cn_tab = &consdev_zs;
                (*cn_tab->cn_init)(cn_tab);
 #endif
+               break;
 
 #endif /* news3400 */
 
@@ -114,15 +115,15 @@
                if (*dipsw & SW_CONSOLE) {
                        xafb_cnattach();
                        kb_ap_cnattach();
-                       return;
+                       break;
                }
 #endif
 
 #if NZSC > 0
                cn_tab = &consdev_zs_ap;
                (*cn_tab->cn_init)(cn_tab);
-               return;
 #endif
+               break;
 
 #endif /* news5000 */
        }



Home | Main Index | Thread Index | Old Index