Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/simonb-timecounters]: src/sys Sync with head.
details: https://anonhg.NetBSD.org/src/rev/b5ba8f8d5f39
branches: simonb-timecounters
changeset: 587920:b5ba8f8d5f39
user: kardel <kardel%NetBSD.org@localhost>
date: Sat Jun 03 19:44:03 2006 +0000
description:
Sync with head.
diffstat:
sys/arch/hpcmips/stand/lcboot/Makefile | 5 +-
sys/arch/mips/include/Makefile.inc | 5 +-
sys/arch/prep/conf/INSTALL | 4 +-
sys/arch/vax/boot/Makefile.inc | 6 +-
sys/arch/vax/conf/Makefile.vax | 6 +-
sys/conf/Makefile.kern.inc | 15 +---
sys/dev/ic/ral.c | 6 +-
sys/kern/tty.c | 108 ++++++++++++++++++--------------
sys/kern/tty_pty.c | 6 +-
sys/net/if_media.h | 12 +++-
sys/netinet6/in6.c | 16 +++-
sys/netisdn/i4b_capi_l4if.c | 6 +-
sys/sys/signal.h | 7 +-
sys/sys/tty.h | 4 +-
14 files changed, 108 insertions(+), 98 deletions(-)
diffs (truncated from 517 to 300 lines):
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/arch/hpcmips/stand/lcboot/Makefile
--- a/sys/arch/hpcmips/stand/lcboot/Makefile Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/arch/hpcmips/stand/lcboot/Makefile Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.6.1 2006/04/22 11:37:30 simonb Exp $
+# $NetBSD: Makefile,v 1.7.6.2 2006/06/03 19:44:03 kardel Exp $
.include <bsd.own.mk>
ROMICE?= no
@@ -31,9 +31,6 @@
INCLUDES= -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= ${INCLUDES} -nostdinc -D_STANDALONE -DHEAP_LIMIT=0x8002ffff
CFLAGS+= -mips2 -EL -mno-abicalls -ffreestanding -mmemcpy
-.if ${HAVE_GCC} == "2"
-CFLAGS+= -mno-half-pic
-.endif
LD_SCRIPT= lcboot.ldscript
.if defined(ROMICE) && (${ROMICE} == "yes")
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/arch/mips/include/Makefile.inc
--- a/sys/arch/mips/include/Makefile.inc Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/arch/mips/include/Makefile.inc Sat Jun 03 19:44:03 2006 +0000
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4.6.1 2006/04/22 11:37:42 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.4.6.2 2006/06/03 19:44:03 kardel Exp $
# Standard kernel compile flags
CFLAGS += -G 0 -mno-abicalls
-.if ${HAVE_GCC} == "2"
-CFLAGS += -mno-half-pic
-.endif
# Needed so modules loaded in KSEG2 can make calls to KSEG0
CFLAGS += -mlong-calls
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/arch/prep/conf/INSTALL
--- a/sys/arch/prep/conf/INSTALL Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/arch/prep/conf/INSTALL Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.36.6.2 2006/06/01 22:35:16 kardel Exp $
+# $NetBSD: INSTALL,v 1.36.6.3 2006/06/03 19:44:03 kardel Exp $
#
# INSTALL -- Installation kernel
#
@@ -12,7 +12,7 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=3500 # save space
+options MEMORY_DISK_ROOT_SIZE=3800 # save space
options MEMORY_DISK_SERVER=0 # don't need for install
maxusers 8
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/arch/vax/boot/Makefile.inc
--- a/sys/arch/vax/boot/Makefile.inc Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/arch/vax/boot/Makefile.inc Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9.6.1 2006/04/22 11:38:06 simonb Exp $
+# $NetBSD: Makefile.inc,v 1.9.6.2 2006/06/03 19:44:03 kardel Exp $
RELOC=0x2f0000
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
@@ -12,10 +12,6 @@
WARNS?= 1
CFLAGS+=-ffreestanding
-.if ${HAVE_GCC} == "2"
-CFLAGS+=-mno-asm-pic
-AFLAGS+=-mno-asm-pic
-.endif
MKMAN=no
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/arch/vax/conf/Makefile.vax
--- a/sys/arch/vax/conf/Makefile.vax Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/arch/vax/conf/Makefile.vax Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vax,v 1.75.6.1 2006/04/22 11:38:06 simonb Exp $
+# $NetBSD: Makefile.vax,v 1.75.6.2 2006/06/03 19:44:03 kardel Exp $
# Makefile for NetBSD
#
@@ -34,10 +34,6 @@
CPPFLAGS+= -D_VAX_INLINE_
AFLAGS+= -x assembler-with-cpp -traditional-cpp
.if ${OBJECT_FMT} == "ELF"
-.if ${HAVE_GCC} == "2"
-CFLAGS+= -mno-asm-pic
-AFLAGS+= -mno-asm-pic
-.endif
.else
CFLAGS+= -fno-pic
.endif
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/conf/Makefile.kern.inc Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.73.6.2 2006/06/01 22:36:01 kardel Exp $
+# $NetBSD: Makefile.kern.inc,v 1.73.6.3 2006/06/03 19:44:03 kardel Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -54,7 +54,6 @@
##
## CPPFLAGS, CFLAGS, and AFLAGS must be set in the port's Makefile
##
-_ISGCC295!= ${CC} --version 2>/dev/null | grep 2.95 2>/dev/null || echo 0
INCLUDES?= -I. ${EXTRA_INCLUDES} -I${S}/../common/include -I$S/arch \
-I$S -nostdinc
CPPFLAGS+= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT
@@ -68,9 +67,6 @@
.endif
CWARNFLAGS+= -Wall -Wno-main -Wno-format-zero-length -Wpointer-arith
CWARNFLAGS+= -Wmissing-prototypes -Wstrict-prototypes
-.if !${_ISGCC295}
-CWARNFLAGS+= -Wreturn-type
-.endif
CWARNFLAGS+= -Wswitch -Wshadow
CWARNFLAGS+= -Wcast-qual -Wwrite-strings
# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3,
@@ -81,17 +77,10 @@
. endif
.endif
-CFLAGS+= -ffreestanding
+CFLAGS+= -ffreestanding -fno-zero-initialized-in-bss
CFLAGS+= ${CPUFLAGS} ${DEBUG} ${COPTS} ${CWARNFLAGS}
AFLAGS+= ${CPUFLAGS} -D_LOCORE
-# Disable unitialized warnings with 2.95 - it gets it wrong way too often
-.if ${_ISGCC295}
-CWARNFLAGS+= -Wno-uninitialized
-.else
-CFLAGS+= -fno-zero-initialized-in-bss
-.endif
-
# XXX
.if ${HAVE_GCC} > 3
CFLAGS+= -fno-strict-aliasing
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/dev/ic/ral.c
--- a/sys/dev/ic/ral.c Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/dev/ic/ral.c Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ral.c,v 1.6 2005/11/18 16:53:56 skrll Exp $ */
+/* $NetBSD: ral.c,v 1.6.6.1 2006/06/03 19:44:04 kardel Exp $ */
/* $OpenBSD: ral.c,v 1.56 2005/07/02 23:14:42 brad Exp $ */
/* $FreeBSD: /a/cvsroot/freebsd.repo/ncvs/src/sys/dev/ral/if_ral.c,v 1.10 2005/07/10 22:25:44 sam Exp $ */
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ral.c,v 1.6 2005/11/18 16:53:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ral.c,v 1.6.6.1 2006/06/03 19:44:04 kardel Exp $");
#include "bpfilter.h"
@@ -993,7 +993,7 @@
RAL_EEPROM_CTL(sc, 0);
RAL_EEPROM_CTL(sc, RAL_EEPROM_C);
- return le16toh(val);
+ return val;
}
/*
diff -r d8bc49737831 -r b5ba8f8d5f39 sys/kern/tty.c
--- a/sys/kern/tty.c Sat Jun 03 10:45:29 2006 +0000
+++ b/sys/kern/tty.c Sat Jun 03 19:44:03 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.179.6.3 2006/06/01 22:38:09 kardel Exp $ */
+/* $NetBSD: tty.c,v 1.179.6.4 2006/06/03 19:44:04 kardel Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.179.6.3 2006/06/01 22:38:09 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.179.6.4 2006/06/03 19:44:04 kardel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -606,7 +606,7 @@
*/
if (CCEQ(cc[VSTATUS], c)) {
if (!ISSET(lflag, NOKERNINFO))
- ttyinfo(tp);
+ ttyinfo(tp, 1);
if (ISSET(lflag, ISIG))
pgsignal(tp->t_pgrp, SIGINFO, 1);
goto endcase;
@@ -1192,7 +1192,7 @@
case TIOCSTAT: /* get load avg stats */
s = spltty();
TTY_LOCK(tp);
- ttyinfo(tp);
+ ttyinfo(tp, 0);
TTY_UNLOCK(tp);
splx(s);
break;
@@ -2317,74 +2317,86 @@
* Call with tty slock held.
*/
void
-ttyinfo(struct tty *tp)
+ttyinfo(struct tty *tp, int fromsig)
{
struct lwp *l;
struct proc *p, *pick;
struct timeval utime, stime;
int tmp;
+ const char *msg;
if (ttycheckoutq_wlock(tp, 0) == 0)
return;
- /* Print load average. */
- tmp = (averunnable.ldavg[0] * 100 + FSCALE / 2) >> FSHIFT;
- ttyprintf_nolock(tp, "load: %d.%02d ", tmp / 100, tmp % 100);
-
if (tp->t_session == NULL)
- ttyprintf_nolock(tp, "not a controlling terminal\n");
+ msg = "not a controlling terminal\n";
else if (tp->t_pgrp == NULL)
- ttyprintf_nolock(tp, "no foreground process group\n");
- else if ((p = LIST_FIRST(&tp->t_pgrp->pg_members)) == 0)
- ttyprintf_nolock(tp, "empty foreground process group\n");
+ msg = "no foreground process group\n";
+ else if ((p = LIST_FIRST(&tp->t_pgrp->pg_members)) == NULL)
+ msg = "empty foreground process group\n";
else {
/* Pick interesting process. */
for (pick = NULL; p != NULL; p = LIST_NEXT(p, p_pglist))
if (proc_compare(pick, p))
pick = p;
+ if (fromsig &&
+ (SIGACTION_PS(pick->p_sigacts, SIGINFO).sa_flags &
+ SA_NOKERNINFO))
+ return;
+ msg = NULL;
+ }
- ttyprintf_nolock(tp, " cmd: %s %d [", pick->p_comm, pick->p_pid);
- LIST_FOREACH(l, &pick->p_lwps, l_sibling)
- ttyprintf_nolock(tp, "%s%s",
- l->l_stat == LSONPROC ? "running" :
- l->l_stat == LSRUN ? "runnable" :
- l->l_wmesg ? l->l_wmesg : "iowait",
- (LIST_NEXT(l, l_sibling) != NULL) ? " " : "] ");
+ /* Print load average. */
+ tmp = (averunnable.ldavg[0] * 100 + FSCALE / 2) >> FSHIFT;
+ ttyprintf_nolock(tp, "load: %d.%02d ", tmp / 100, tmp % 100);
- calcru(pick, &utime, &stime, NULL);
+ if (msg) {
+ ttyprintf_nolock(tp, msg);
+ tp->t_rocount = 0; /* so pending input will be retyped if BS */
+ return;
+ }
- /* Round up and print user time. */
- utime.tv_usec += 5000;
- if (utime.tv_usec >= 1000000) {
- utime.tv_sec += 1;
- utime.tv_usec -= 1000000;
- }
- ttyprintf_nolock(tp, "%ld.%02ldu ", (long int)utime.tv_sec,
- (long int)utime.tv_usec / 10000);
+ ttyprintf_nolock(tp, " cmd: %s %d [", pick->p_comm, pick->p_pid);
+ LIST_FOREACH(l, &pick->p_lwps, l_sibling)
+ ttyprintf_nolock(tp, "%s%s",
+ l->l_stat == LSONPROC ? "running" :
+ l->l_stat == LSRUN ? "runnable" :
+ l->l_wmesg ? l->l_wmesg : "iowait",
+ (LIST_NEXT(l, l_sibling) != NULL) ? " " : "] ");
+
+ calcru(pick, &utime, &stime, NULL);
- /* Round up and print system time. */
- stime.tv_usec += 5000;
- if (stime.tv_usec >= 1000000) {
- stime.tv_sec += 1;
- stime.tv_usec -= 1000000;
- }
- ttyprintf_nolock(tp, "%ld.%02lds ", (long int)stime.tv_sec,
- (long int)stime.tv_usec / 10000);
+ /* Round up and print user time. */
+ utime.tv_usec += 5000;
+ if (utime.tv_usec >= 1000000) {
+ utime.tv_sec += 1;
+ utime.tv_usec -= 1000000;
+ }
+ ttyprintf_nolock(tp, "%ld.%02ldu ", (long int)utime.tv_sec,
+ (long int)utime.tv_usec / 10000);
+
+ /* Round up and print system time. */
+ stime.tv_usec += 5000;
+ if (stime.tv_usec >= 1000000) {
+ stime.tv_sec += 1;
Home |
Main Index |
Thread Index |
Old Index