From a54907a1a7deb15bf478959677f19a8a4cdcfcb7 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Thu, 23 Mar 1995 06:14:44 +0000
Subject: [PATCH] Restore my changes to initialize the kdc_shutdown routine
 pointer. Stefan clobbered it in his previous commit and not having it causes
 the machine to panic during reboot (as well as not doing the important
 shutdown callout).

---
 sys/dev/pci/pci.c | 9 +++++----
 sys/pci/pci.c     | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 32428c662d22..c3b7dca1c05e 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.19 1995/03/17 04:27:19 davidg Exp $
+**  $Id: pci.c,v 1.20 1995/03/21 23:01:01 se Exp $
 **
 **  General subroutines for the PCI bus.
 **  pci_configure ()
@@ -61,13 +61,13 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 
+#include <machine/pmap.h>
+#include <sys/devconf.h>
+
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
 #include <pci/pcibus.h>
 
-#include <machine/pmap.h>
-#include <sys/devconf.h>
-
 #define PCI_MAX_IRQ	(16)
 
 
@@ -560,6 +560,7 @@ pci_bus_config (void)
 		pdcp -> pdc_kdc.kdc_parentdata  = &pdcp->pdc_pi;
 		pdcp -> pdc_kdc.kdc_state       = DC_UNKNOWN;
 		pdcp -> pdc_kdc.kdc_description = name;
+		pdcp -> pdc_kdc.kdc_shutdown	= dvp->pd_shutdown;
 
 		/*
 		**	And register this device
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 32428c662d22..c3b7dca1c05e 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.19 1995/03/17 04:27:19 davidg Exp $
+**  $Id: pci.c,v 1.20 1995/03/21 23:01:01 se Exp $
 **
 **  General subroutines for the PCI bus.
 **  pci_configure ()
@@ -61,13 +61,13 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 
+#include <machine/pmap.h>
+#include <sys/devconf.h>
+
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
 #include <pci/pcibus.h>
 
-#include <machine/pmap.h>
-#include <sys/devconf.h>
-
 #define PCI_MAX_IRQ	(16)
 
 
@@ -560,6 +560,7 @@ pci_bus_config (void)
 		pdcp -> pdc_kdc.kdc_parentdata  = &pdcp->pdc_pi;
 		pdcp -> pdc_kdc.kdc_state       = DC_UNKNOWN;
 		pdcp -> pdc_kdc.kdc_description = name;
+		pdcp -> pdc_kdc.kdc_shutdown	= dvp->pd_shutdown;
 
 		/*
 		**	And register this device