*** conf/param.c.orig	Tue Jul 18 05:36:07 1995
--- conf/param.c	Tue Jul 18 05:36:35 1995
***************
*** 88,94 ****
--- 88,102 ----
  #define	NVNODE (NPROC + NTEXT + 100)
  int	desiredvnodes = NVNODE;
  int	maxfiles = 3 * (NPROC + MAXUSERS) + 80;
+ #ifndef MRITIMER
  int	ncallout = 16 + NPROC;
+ #else /* MRITIMER is defined */
+ #ifndef CALLOUTS_PER_PROC
+ #define CALLOUTS_PER_PROC 8
+ #endif /* CALLOUTS_PER_PROC */
+ int	ncallout = 32 + CALLOUTS_PER_PROC * NPROC;
+ int	nmrtimer = 16 + (CALLOUTS_PER_PROC - 1) * NPROC;
+ #endif /* MRITIMER */
  #ifdef REAL_CLISTS
  int	nclist = 60 + 12 * MAXUSERS;
  #endif
***************
*** 158,164 ****
   * them here forces loader errors if this file is omitted
   * (if they've been externed everywhere else; hah!).
   */
! struct 	callout *callout;
  struct	cblock *cfree;
  struct	buf *buf, *swbuf;
  char	*buffers;
--- 166,184 ----
   * them here forces loader errors if this file is omitted
   * (if they've been externed everywhere else; hah!).
   */
! struct 	callout *callfree, *callout;
! #ifndef CALLWHEEL
! struct	callout calltodo;
! #else /* CALLWHEEL is defined */
! int	calloutsize, calloutbits, calloutmask;
! struct	callout **callwheel;
! int	callwheelsize, callwheelbits, callwheelmask;
! struct	callout **callhash;
! int	callhashsize, callhashbits, callhashmask;
! #endif /* CALLWHEEL */
! #ifdef MRITIMER
! struct	mrtimer *mrfree, *mrtimer;
! #endif /* MRITIMER */
  struct	cblock *cfree;
  struct	buf *buf, *swbuf;
  char	*buffers;