summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/imgact_elf.c5
-rw-r--r--sys/kern/kern_descrip.c4
-rw-r--r--sys/kern/kern_exit.c3
-rw-r--r--sys/kern/kern_fork.c3
-rw-r--r--sys/kern/kern_proc.c6
-rw-r--r--sys/kern/kern_random.c4
-rw-r--r--sys/kern/subr_diskslice.c3
-rw-r--r--sys/kern/subr_trap.c5
-rw-r--r--sys/kern/sys_pipe.c6
-rw-r--r--sys/kern/sysv_sem.c3
-rw-r--r--sys/kern/tty.c4
-rw-r--r--sys/kern/tty_pty.c14
-rw-r--r--sys/kern/uipc_sockbuf.c3
-rw-r--r--sys/kern/uipc_socket2.c3
14 files changed, 26 insertions, 40 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 7d4b5e6..607483f2 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: imgact_elf.c,v 1.4 1996/03/12 06:20:10 peter Exp $
+ * $Id: imgact_elf.c,v 1.5 1996/05/01 02:42:43 bde Exp $
*/
#include <sys/param.h>
@@ -139,7 +139,7 @@ static int
map_pages(struct vnode *vp, vm_offset_t offset,
vm_offset_t *buf, vm_size_t size)
{
- int error, aresid;
+ int error;
vm_offset_t kern_buf;
vm_size_t pageoff;
@@ -170,7 +170,6 @@ map_pages(struct vnode *vp, vm_offset_t offset,
static void
unmap_pages(struct vnode *vp, vm_offset_t buf, vm_size_t size)
{
- int error, aresid;
vm_size_t pageoff;
pageoff = (buf & PAGE_MASK);
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 96ea474..a9b9b03 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.27 1996/03/11 02:17:30 hsu Exp $
+ * $Id: kern_descrip.c,v 1.28 1996/03/27 19:19:58 bde Exp $
*/
#include <sys/param.h>
@@ -682,8 +682,6 @@ void
ffree(fp)
register struct file *fp;
{
- register struct file *fq;
-
LIST_REMOVE(fp, f_list);
crfree(fp->f_cred);
#ifdef DIAGNOSTIC
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index ad7b4db..65ddfa5 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_exit.c 8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.31 1996/04/07 17:38:56 bde Exp $
+ * $Id: kern_exit.c,v 1.32 1996/04/11 20:56:29 bde Exp $
*/
#include "opt_ktrace.h"
@@ -108,7 +108,6 @@ exit1(p, rv)
int rv;
{
register struct proc *q, *nq;
- register struct proc **pp;
register struct vmspace *vm;
if (p->p_pid == 1) {
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 2ea502e..0e145a2 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_fork.c 8.6 (Berkeley) 4/8/94
- * $Id: kern_fork.c,v 1.20 1996/04/17 17:04:55 smpatel Exp $
+ * $Id: kern_fork.c,v 1.21 1996/05/02 11:38:05 peter Exp $
*/
#include "opt_ktrace.h"
@@ -112,7 +112,6 @@ fork1(p1, flags, retval)
register struct proc *p2, *pptr;
register uid_t uid;
struct proc *newproc;
- struct proc **hash;
int count;
static int nextpid, pidchecked = 0;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index bbcaa7b..cd02f3e 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_proc.c 8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.18 1996/05/30 01:21:49 davidg Exp $
+ * $Id: kern_proc.c,v 1.19 1996/06/06 17:19:21 phk Exp $
*/
#include <sys/param.h>
@@ -77,7 +77,7 @@ LIST_HEAD(uihashhead, uidinfo) *uihashtbl;
static u_long uihash; /* size of hash table - 1 */
static void orphanpg __P((struct pgrp *pg));
-static void pgrpdump __P((void));
+static void DDB_pgrpdump __P((void));
/*
* Other process lists
@@ -366,7 +366,7 @@ orphanpg(pg)
#ifdef DEBUG
static void
-pgrpdump()
+DDB_pgrpdump()
{
register struct pgrp *pgrp;
register struct proc *p;
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index f2f51a9..8944a9d 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
/*
* random_machdep.c -- A strong random number generator
*
- * $Id: random_machdep.c,v 1.6 1996/04/07 18:16:26 bde Exp $
+ * $Id: random_machdep.c,v 1.7 1996/06/08 08:18:00 bde Exp $
*
* Version 0.95, last modified 18-Oct-95
*
@@ -98,7 +98,9 @@ static u_int32_t random_pool[POOLWORDS];
static struct timer_rand_state keyboard_timer_state;
static struct timer_rand_state extract_timer_state;
static struct timer_rand_state irq_timer_state[ICU_LEN];
+#ifdef notyet
static struct timer_rand_state blkdev_timer_state[MAX_BLKDEV];
+#endif
static struct wait_queue *random_wait;
inthand2_t *sec_intr_handler[ICU_LEN];
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 16af2b6..4b95b07 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $Id: subr_diskslice.c,v 1.24 1996/04/07 14:32:14 bde Exp $
+ * $Id: subr_diskslice.c,v 1.25 1996/04/19 19:22:29 bde Exp $
*/
#include <sys/param.h>
@@ -776,7 +776,6 @@ free_ds_label(ssp, slice)
int slice;
{
struct disklabel *lp;
- int part;
struct diskslice *sp;
sp = &ssp->dss_slices[slice];
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index b81cfc1..7cf89d1 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.75 1996/03/28 05:40:57 dyson Exp $
+ * $Id: trap.c,v 1.76 1996/05/18 03:36:19 dyson Exp $
*/
/*
@@ -606,9 +606,6 @@ trap_pfault(frame, usermode)
ftype = VM_PROT_READ;
if (map != kernel_map) {
- vm_offset_t v;
- vm_page_t mpte;
-
/*
* Keep swapout from messing with us during this
* critical time.
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index d4b168d..0df5269 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: sys_pipe.c,v 1.14 1996/03/17 04:52:10 dyson Exp $
+ * $Id: sys_pipe.c,v 1.15 1996/03/25 01:48:28 dyson Exp $
*/
#ifndef OLD_PIPE
@@ -125,7 +125,6 @@ static struct fileops pipeops =
int amountpipekva;
static void pipeclose __P((struct pipe *cpipe));
-static void pipebufferinit __P((struct pipe *cpipe));
static void pipeinit __P((struct pipe *cpipe));
static __inline int pipelock __P((struct pipe *cpipe, int catch));
static __inline void pipeunlock __P((struct pipe *cpipe));
@@ -135,7 +134,6 @@ static int pipe_build_write_buffer __P((struct pipe *wpipe, struct uio *uio));
static void pipe_destroy_write_buffer __P((struct pipe *wpipe));
static int pipe_direct_write __P((struct pipe *wpipe, struct uio *uio));
static void pipe_clone_write_buffer __P((struct pipe *wpipe));
-static void pipe_mark_pages_clean __P((struct pipe *cpipe));
#endif
static int pipewrite __P((struct pipe *wpipe, struct uio *uio, int nbio));
static void pipespace __P((struct pipe *cpipe));
@@ -1004,8 +1002,8 @@ pipe_close(fp, p)
struct file *fp;
struct proc *p;
{
- int error = 0;
struct pipe *cpipe = (struct pipe *)fp->f_data;
+
pipeclose(cpipe);
fp->f_data = NULL;
return 0;
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 8c76e90..436ca84 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/* $Id: sysv_sem.c,v 1.14 1995/12/28 01:31:38 jkh Exp $ */
+/* $Id: sysv_sem.c,v 1.15 1996/01/05 16:38:01 wollman Exp $ */
/*
* Implementation of SVID semaphores
@@ -47,7 +47,6 @@ static sy_call_t *semcalls[] = {
static int semtot = 0;
struct semid_ds *sema; /* semaphore id pool */
struct sem *sem; /* semaphore pool */
-static struct map *semmap; /* semaphore allocation map */
static struct sem_undo *semu_list; /* list of active undo structures */
int *semu; /* undo structure pool */
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 7815b6d..3f5f894 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)tty.c 8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.80 1996/03/11 06:05:03 hsu Exp $
+ * $Id: tty.c,v 1.81 1996/05/02 14:20:27 phk Exp $
*/
/*-
@@ -1151,7 +1151,9 @@ ttyflush(tp, rw)
register int s;
s = spltty();
+#if 0
again:
+#endif
if (rw & FWRITE)
CLR(tp->t_state, TS_TTSTOP);
#ifdef sun4c /* XXX */
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 2918d3d..36bcc5d 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tty_pty.c 8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.37 1996/03/11 02:24:39 hsu Exp $
+ * $Id: tty_pty.c,v 1.38 1996/04/11 18:43:37 bde Exp $
*/
/*
@@ -56,7 +56,9 @@
#include <sys/devfsext.h>
#endif /*DEVFS*/
+#ifdef notyet
static void ptyattach __P((int n));
+#endif
static void ptsstart __P((struct tty *tp));
static void ptcwakeup __P((struct tty *tp, int flag));
@@ -71,7 +73,6 @@ static d_open_t ptcopen;
static d_close_t ptcclose;
static d_read_t ptcread;
static d_write_t ptcwrite;
-static d_ioctl_t ptcioctl;
static d_select_t ptcselect;
#define CDEV_MAJOR_S 5
@@ -113,6 +114,7 @@ static int npty = NPTY; /* for pstat -t */
#define PF_NOSTOP 0x40
#define PF_UCNTL 0x80 /* user control mode */
+#ifdef notyet
/*
* Establish n (or default if n is 1) ptys in the system.
*
@@ -122,7 +124,6 @@ static void
ptyattach(n)
int n;
{
-#ifdef notyet
char *mem;
register u_long ntb;
#define DEFAULT_NPTY 32
@@ -137,8 +138,8 @@ ptyattach(n)
mem = (char *)ALIGN(mem + ntb);
pt_ioctl = (struct pt_ioctl *)mem;
npty = n;
-#endif
}
+#endif
/*ARGSUSED*/
static int
@@ -789,7 +790,6 @@ ptc_drvinit(void *unused)
{
#ifdef DEVFS
int i,j,k;
- char name[16];
#endif
dev_t dev;
@@ -806,8 +806,6 @@ ptc_drvinit(void *unused)
#define NPTY MAXUNITS
#endif
for ( i = 0 ; i<NPTY ; i++ ) {
- void *x;
-
j = i / 32;
k = i % 32;
devfs_token_pts[i] =
@@ -824,5 +822,3 @@ ptc_drvinit(void *unused)
}
SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL)
-
-
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index a09ed21..b3bdc44 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.8 1996/01/05 21:41:54 wollman Exp $
+ * $Id: uipc_socket2.c,v 1.9 1996/03/11 15:37:32 davidg Exp $
*/
#include <sys/param.h>
@@ -162,7 +162,6 @@ sonewconn1(head, connstatus)
int connstatus;
{
register struct socket *so;
- int soqueue = connstatus ? 1 : 0;
if (head->so_qlen > 3 * head->so_qlimit / 2)
return ((struct socket *)0);
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index a09ed21..b3bdc44 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.8 1996/01/05 21:41:54 wollman Exp $
+ * $Id: uipc_socket2.c,v 1.9 1996/03/11 15:37:32 davidg Exp $
*/
#include <sys/param.h>
@@ -162,7 +162,6 @@ sonewconn1(head, connstatus)
int connstatus;
{
register struct socket *so;
- int soqueue = connstatus ? 1 : 0;
if (head->so_qlen > 3 * head->so_qlimit / 2)
return ((struct socket *)0);
OpenPOWER on IntegriCloud