From owner-freebsd-smp  Fri Apr 25 21:42:26 1997
Return-Path: <owner-smp>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id VAA05112
          for smp-outgoing; Fri, 25 Apr 1997 21:42:26 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id VAA05106
          for <freebsd-smp@FreeBSD.org>; Fri, 25 Apr 1997 21:42:24 -0700 (PDT)
From: Peter Wemm <peter@FreeBSD.org>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id VAA10790
	for freebsd-smp; Fri, 25 Apr 1997 21:42:23 -0700 (PDT)
Date: Fri, 25 Apr 1997 21:42:23 -0700 (PDT)
Message-Id: <199704260442.VAA10790@freefall.freebsd.org>
To: freebsd-smp@FreeBSD.org
Subject: cvs commit:  sys/i386/i386 identcpu.c locore.s machdep.c swtch.s sys/kern kern_fork.c sys/sys kernel.h sys/i386/isa npx.c sys/pci pci.c pcireg.h
Sender: owner-smp@FreeBSD.org
X-Loop: FreeBSD.org
Precedence: bulk

peter       97/04/25 21:42:23

  Modified:    i386/i386  identcpu.c locore.s machdep.c swtch.s
               i386/isa  npx.c
               kern      kern_fork.c
               pci       pci.c pcireg.h
               sys       kernel.h
  Log:
  Merge in -current 970425 onto mainline.  The ELF kernel stuff isn't
  complete for the smp case.
  
  Revision  Changes    Path
  1.7       +9 -4      sys/i386/i386/identcpu.c
  1.37      +5 -5      sys/i386/i386/locore.s
  1.40      +7 -1      sys/i386/i386/machdep.c
  1.38      +2 -2      sys/i386/i386/swtch.s
  1.18      +13 -8     sys/i386/isa/npx.c
  1.12      +1 -1      sys/kern/kern_fork.c
  1.10      +19 -10    sys/pci/pci.c
  1.8       +2 -1      sys/pci/pcireg.h
  1.16      +20 -2     sys/sys/kernel.h