diff options
author | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2014-07-10 13:34:33 +0000 |
---|---|---|
committer | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2014-07-10 13:34:33 +0000 |
commit | fd44aff8a64104f8df34eb71bc06a61347463828 (patch) | |
tree | 83d181d2eef0b2ebecf76e851fba35b4be030786 /sys | |
parent | 1617fe128aaf8d224a914b4258c75c95ff8e1d75 (diff) |
boot(): Remove comments about RB_TIMEBAD to reduce diffs
RB_TIMEBAD is documented well enough that the comment is not needed. sparc64
does slightly different and its comment is left with XXX.
OK deraadt@ miod@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/alpha/alpha/machdep.c | 8 | ||||
-rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 9 | ||||
-rw-r--r-- | sys/arch/arm/arm/arm32_machdep.c | 7 | ||||
-rw-r--r-- | sys/arch/aviion/aviion/machdep.c | 8 | ||||
-rw-r--r-- | sys/arch/hppa/hppa/machdep.c | 8 | ||||
-rw-r--r-- | sys/arch/hppa64/hppa64/machdep.c | 8 | ||||
-rw-r--r-- | sys/arch/i386/i386/machdep.c | 8 | ||||
-rw-r--r-- | sys/arch/landisk/landisk/machdep.c | 7 | ||||
-rw-r--r-- | sys/arch/loongson/loongson/machdep.c | 9 | ||||
-rw-r--r-- | sys/arch/luna88k/luna88k/machdep.c | 8 | ||||
-rw-r--r-- | sys/arch/macppc/macppc/machdep.c | 7 | ||||
-rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 9 | ||||
-rw-r--r-- | sys/arch/sgi/sgi/machdep.c | 9 | ||||
-rw-r--r-- | sys/arch/socppc/socppc/machdep.c | 7 | ||||
-rw-r--r-- | sys/arch/solbourne/solbourne/machdep.c | 7 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/machdep.c | 7 | ||||
-rw-r--r-- | sys/arch/sparc64/sparc64/machdep.c | 5 | ||||
-rw-r--r-- | sys/arch/vax/vax/machdep.c | 7 |
18 files changed, 29 insertions, 109 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index b198b99d780..cb088387767 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.157 2014/07/10 12:13:48 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.158 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */ /*- @@ -999,11 +999,7 @@ boot(int howto) if ((howto & RB_NOSYNC) == 0 && waittime < 0) { waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system has been sitting in ddb. - */ + if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 4e14080b0c1..59150a9e9b7 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.181 2014/07/10 12:13:48 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.182 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -765,12 +765,9 @@ boot(int howto) waittime = 0; if (curproc == NULL) - curproc = &proc0; /* XXX */ + curproc = &proc0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now. - */ + if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c index 88f96c204f8..7a137678808 100644 --- a/sys/arch/arm/arm/arm32_machdep.c +++ b/sys/arch/arm/arm/arm32_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arm32_machdep.c,v 1.43 2014/05/08 21:17:00 miod Exp $ */ +/* $OpenBSD: arm32_machdep.c,v 1.44 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */ /* @@ -216,11 +216,6 @@ bootsync(int howto) vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system has been sitting in ddb. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c index cd70d811b5a..043af8a38fd 100644 --- a/sys/arch/aviion/aviion/machdep.c +++ b/sys/arch/aviion/aviion/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.65 2014/07/10 12:13:48 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.66 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 2007 Miodrag Vallat. * @@ -311,11 +311,7 @@ boot(int howto) boothowto = howto; if ((howto & RB_NOSYNC) == 0) { vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ + if ((howto & RB_TIMEBAD) == 0) resettodr(); else diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 0d79161c1af..8d95b2852e2 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.223 2014/07/10 12:13:48 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.224 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 1999-2003 Michael Shalayeff @@ -913,11 +913,7 @@ boot(int howto) if (!(howto & RB_NOSYNC)) { waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ + if ((howto & RB_TIMEBAD) == 0) resettodr(); else diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c index e2a0d1139a0..9db930df5eb 100644 --- a/sys/arch/hppa64/hppa64/machdep.c +++ b/sys/arch/hppa64/hppa64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.61 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.62 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -550,11 +550,7 @@ boot(int howto) if (!(howto & RB_NOSYNC)) { waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ + if ((howto & RB_TIMEBAD) == 0) resettodr(); else diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index a6da0388774..e286839f0d5 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.542 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.543 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -2576,16 +2576,12 @@ boot(int howto) if ((howto & RB_NOSYNC) == 0 && waittime < 0) { extern struct proc proc0; - /* make sure there's a process to charge for I/O in sync() */ if (curproc == NULL) curproc = &proc0; waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now. - */ + if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c index e61894ff390..c1df9245632 100644 --- a/sys/arch/landisk/landisk/machdep.c +++ b/sys/arch/landisk/landisk/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.34 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.35 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -204,10 +204,7 @@ boot(int howto) boothowto = howto; if ((howto & RB_NOSYNC) == 0) { vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now. - */ + if ((howto & RB_TIMEBAD) == 0) resettodr(); else diff --git a/sys/arch/loongson/loongson/machdep.c b/sys/arch/loongson/loongson/machdep.c index 8e63720007a..af4a626a8f1 100644 --- a/sys/arch/loongson/loongson/machdep.c +++ b/sys/arch/loongson/loongson/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.50 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.51 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 2009, 2010, 2014 Miodrag Vallat. @@ -924,16 +924,9 @@ boot(int howto) /* fill curproc with live object */ if (curproc == NULL) curproc = &proc0; - /* - * Synchronize the disks... - */ waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr will be out of - * sync; adjust it now. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index cc1b9085671..c0bdd8807c8 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.101 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.102 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -485,11 +485,7 @@ boot(int howto) boothowto = howto; if ((howto & RB_NOSYNC) == 0) { vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ + if ((howto & RB_TIMEBAD) == 0) resettodr(); else diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index 82d2c9c82d6..c3330c1fce3 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.154 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.155 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -821,11 +821,6 @@ boot(int howto) syncing = 1; vfs_shutdown(); /* sync */ - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index 784332c5b46..90bfd69033f 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.50 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.51 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -688,16 +688,9 @@ boot(int howto) /* fill curproc with live object */ if (curproc == NULL) curproc = &proc0; - /* - * Synchronize the disks... - */ waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr will be out of - * sync; adjust it now. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c index 5ed7682b63c..42e71b1bfbf 100644 --- a/sys/arch/sgi/sgi/machdep.c +++ b/sys/arch/sgi/sgi/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.141 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.142 2014/07/10 13:34:32 uebayasi Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -851,16 +851,9 @@ boot(int howto) /* fill curproc with live object */ if (curproc == NULL) curproc = &proc0; - /* - * Synchronize the disks... - */ waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr will be out of - * sync; adjust it now. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c index a9dc40f3956..63c0ce2ff84 100644 --- a/sys/arch/socppc/socppc/machdep.c +++ b/sys/arch/socppc/socppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.49 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.50 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -1049,11 +1049,6 @@ boot(int howto) syncing = 1; vfs_shutdown(); /* sync */ - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c index 6a4883aa7d9..c0d5e086c5f 100644 --- a/sys/arch/solbourne/solbourne/machdep.c +++ b/sys/arch/solbourne/solbourne/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.34 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.35 2014/07/10 13:34:32 uebayasi Exp $ */ /* OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp */ /* @@ -539,11 +539,6 @@ boot(int howto) waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index e0e25fecc45..356c45ae2fc 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.155 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.156 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -548,11 +548,6 @@ boot(int howto) waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index 38fc758eef5..842730701b5 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.158 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.159 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -632,8 +632,7 @@ boot(int howto) vfs_shutdown(); /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now. + * XXX * Do this only if the TOD clock has already been read out * successfully by inittodr() or set by an explicit call * to resettodr() (e.g. from settimeofday()). diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index 256205ad1d0..7f695e18f5e 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.137 2014/07/10 12:13:49 uebayasi Exp $ */ +/* $OpenBSD: machdep.c,v 1.138 2014/07/10 13:34:32 uebayasi Exp $ */ /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */ /* @@ -524,10 +524,7 @@ boot(int howto) if ((howto & RB_NOSYNC) == 0 && waittime < 0) { waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr will be out of - * synch; adjust it now. - */ + if ((howto & RB_TIMEBAD) == 0) { resettodr(); } else { |