Subject: GENERIC kernel overlay too large (#428)
Index:	sys/conf/Make.sunix 2.11BSD

Description:
	After applying updates 426 and 427 the GENERIC kernel will
	not build due to overlay 9 being 192 bytes too large.

Repeat-By:
	Apply updates 426 and 427.  Then:

		cd /sys/GENERIC
		make

	Notice the "ld: too big for type 431" error from the linker.

Fix:
	Rebuilding the GENERIC kernel was overlooked.  The addition of
	the sigwait(2) syscall caused the last overlay to be slightly
	too large.   The GENERIC kernel is the one (and only) kernel
	configuration that is supposed to always build.  The fix was
	to move 'mem.o' (454 bytes) to overlay 6.  

	To apply this update cut where indicated and save to a file
	(/tmp/428) then:

		patch -p0 < /tmp/428

	Recompiling the GENERIC  kernel is of course optional but it is
	a good thing to keep around in /genunix:

		cd /sys/GENERIC
		make clean
		make 
		mv unix /genunix

	As always this and previous updates to 2.11BSD are available via
	anonymous FTP to either FTP.GD-ISO.COM or MOE.2BSD.COM in the
	directory /pub/2.11BSD.

-------------------------------cut here----------------------
*** /usr/src/sys/conf/Make.sunix.old	Fri Nov 28 16:42:55 1997
--- /usr/src/sys/conf/Make.sunix	Fri Sep 24 20:30:05 1999
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.12 (2.11BSD GTE) 1997/11/28
  #
  #########################################################
  # Non-network, but separate I/D kernel			#
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.13 (2.11BSD) 1999/9/24
  #
  #########################################################
  # Non-network, but separate I/D kernel			#
***************
*** 60,69 ****
  OV4=	hk.o init_main.o kern_prot.o tty_pty.o quota_kern.o quota_subr.o \
  	quota_ufs.o vm_swp.o vm_swap.o vm_proc.o
  OV5=	ht.o tm.o ts.o
! OV6=	tmscp.o tmscpdump.o
  OV7=	rl.o mch_fpsim.o ingreslock.o ufs_disksubr.o
  OV8=	rx.o kern_sysctl.o vm_sched.o vm_text.o
! OV9=	kern_pdp.o kern_xxx.o ufs_syscalls2.o mem.o ufs_subr.o rk.o sys_pipe.o \
  	kern_sig2.o toy.o subr_log.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
--- 60,69 ----
  OV4=	hk.o init_main.o kern_prot.o tty_pty.o quota_kern.o quota_subr.o \
  	quota_ufs.o vm_swp.o vm_swap.o vm_proc.o
  OV5=	ht.o tm.o ts.o
! OV6=	tmscp.o tmscpdump.o mem.o
  OV7=	rl.o mch_fpsim.o ingreslock.o ufs_disksubr.o
  OV8=	rx.o kern_sysctl.o vm_sched.o vm_text.o
! OV9=	kern_pdp.o kern_xxx.o ufs_syscalls2.o ufs_subr.o rk.o sys_pipe.o \
  	kern_sig2.o toy.o subr_log.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
*** /usr/src/sys/GENERIC/Makefile.old	Fri Nov 28 16:42:45 1997
--- /usr/src/sys/GENERIC/Makefile	Fri Sep 24 20:19:52 1999
***************
*** 10,16 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.12 (2.11BSD GTE) 1997/11/28
  #
  #########################################################
  # Non-network, but separate I/D kernel			#
--- 10,16 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	2.13 (2.11BSD) 1999/9/24
  #
  #########################################################
  # Non-network, but separate I/D kernel			#
***************
*** 61,70 ****
  OV4=	hk.o init_main.o kern_prot.o tty_pty.o quota_kern.o quota_subr.o \
  	quota_ufs.o vm_swp.o vm_swap.o vm_proc.o
  OV5=	ht.o tm.o ts.o
! OV6=	tmscp.o tmscpdump.o
  OV7=	rl.o mch_fpsim.o ingreslock.o ufs_disksubr.o
  OV8=	rx.o kern_sysctl.o vm_sched.o vm_text.o
! OV9=	kern_pdp.o kern_xxx.o ufs_syscalls2.o mem.o ufs_subr.o rk.o sys_pipe.o \
  	kern_sig2.o toy.o subr_log.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
--- 61,70 ----
  OV4=	hk.o init_main.o kern_prot.o tty_pty.o quota_kern.o quota_subr.o \
  	quota_ufs.o vm_swp.o vm_swap.o vm_proc.o
  OV5=	ht.o tm.o ts.o
! OV6=	tmscp.o tmscpdump.o mem.o
  OV7=	rl.o mch_fpsim.o ingreslock.o ufs_disksubr.o
  OV8=	rx.o kern_sysctl.o vm_sched.o vm_text.o
! OV9=	kern_pdp.o kern_xxx.o ufs_syscalls2.o ufs_subr.o rk.o sys_pipe.o \
  	kern_sig2.o toy.o subr_log.o
  
  KERNOBJ=${CONF} ${BASE} ${OV1} ${OV2} ${OV3} ${OV4} ${OV5} \
*** /VERSION.old	Mon Sep 20 20:08:55 1999
--- /VERSION	Fri Sep 24 20:30:26 1999
***************
*** 1,5 ****
! Current Patch Level: 427
! Date: September 15, 1999
  
  2.11 BSD
  ============
--- 1,5 ----
! Current Patch Level: 428
! Date: September 24, 1999
  
  2.11 BSD
  ============
