From owner-freebsd-current  Sun Jun 27 23: 7:44 1999
Delivered-To: freebsd-current@freebsd.org
Received: from fep1.post.tele.dk (fep1.post.tele.dk [195.41.46.133])
	by hub.freebsd.org (Postfix) with ESMTP id C42F914E65
	for <freebsd-current@FreeBSD.org>; Sun, 27 Jun 1999 23:07:32 -0700 (PDT)
	(envelope-from peter@holm.cc)
Received: from holm.cc ([195.249.209.24]) by fep1.post.tele.dk
          (InterMail v4.0 201-221) with ESMTP
          id <19990628060728.HVW27563.fep1@holm.cc>
          for <freebsd-current@FreeBSD.org>;
          Mon, 28 Jun 1999 08:07:28 +0200
Message-ID: <377711B4.F86D0404@holm.cc>
Date: Mon, 28 Jun 1999 08:09:56 +0200
From: Peter Holm <peter@holm.cc>
X-Mailer: Mozilla 4.51 [en] (Win95; I)
X-Accept-Language: en
MIME-Version: 1.0
To: freebsd-current@FreeBSD.org
Subject: boot -c causes pagefault in userconfig.c:savelist+18
Content-Type: multipart/mixed;
 boundary="------------C6C980DA3C83F9AE928C8A34"
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

This is a multi-part message in MIME format.
--------------C6C980DA3C83F9AE928C8A34
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This in current as of Saturday. The attached patch to
i386/i386/userconfig.c fixes the problem.:

Regards
--
Peter Holm | mailto:peter@holm.cc | http://login.dknet.dk/~pho/
  -[ Member of the BSD-Dk User Group / http://www.bsd-dk.dk/ ] -


--------------C6C980DA3C83F9AE928C8A34
Content-Type: text/plain; charset=us-ascii;
 name="userconfig.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="userconfig.diff"

*** userconfig.c~	Sun Jun 27 18:39:23 1999
--- userconfig.c	Sun Jun 27 18:58:52 1999
***************
*** 843,849 ****
  {
      struct isa_device	*id_p,*id_pn;
      struct isa_driver	*isa_drv;
!     char *name = list->device->id_driver->name;
  
      while (list)
      {
--- 843,849 ----
  {
      struct isa_device	*id_p,*id_pn;
      struct isa_driver	*isa_drv;
!     char *name;
  
      while (list)
      {
***************
*** 859,864 ****
--- 859,865 ----
  	    {						/* look on the list for it */
  		if (id_p->id_id == list->device->id_id) 
  		{
+ 		    name = list->device->id_driver->name;
  		    id_pn = id_p->id_next;
  		    isa_drv = id_p->id_driver;
  		    if (isa_drv && isa_drv->name)
***************
*** 878,883 ****
--- 879,885 ----
  	    }
  	    if (!id_pn)					/* not already on the list */
  	    {
+ 		name = list->device->id_driver->name;
  		id_pn = malloc(sizeof(struct isa_device),M_DEVL,M_WAITOK);
  		bcopy(list->device,id_pn,sizeof(struct isa_device));
  		save_resource(list->device);

--------------C6C980DA3C83F9AE928C8A34--



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message