Make sure the mem_range_AP_init() prototype is seen where it's needed, and

#ifdef SMP around it for fun.

9 files changed, 27 insertions, 9 deletions

diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 64b7e60..66eddd6 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.58 1999/05/02 03:06:22 msmith Exp $
+ *	$Id: mem.c,v 1.59 1999/05/03 09:47:53 peter Exp $
  */
 
 /*
@@ -527,12 +527,14 @@ mem_range_attr_set(struct mem_range_desc *mrd, int *arg)
 	return(mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg));
 }
 
+#ifdef SMP
 void
 mem_range_AP_init(void)
 {
 	if (mem_range_softc.mr_op && mem_range_softc.mr_op->initAP)
 		return(mem_range_softc.mr_op->initAP(&mem_range_softc));
 }
+#endif
 
 static int 
 random_ioctl(dev, cmd, data, flags, p)
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index ee7222e..4c8c946 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index ee7222e..4c8c946 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index ee7222e..4c8c946 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 64b7e60..66eddd6 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.58 1999/05/02 03:06:22 msmith Exp $
+ *	$Id: mem.c,v 1.59 1999/05/03 09:47:53 peter Exp $
  */
 
 /*
@@ -527,12 +527,14 @@ mem_range_attr_set(struct mem_range_desc *mrd, int *arg)
 	return(mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg));
 }
 
+#ifdef SMP
 void
 mem_range_AP_init(void)
 {
 	if (mem_range_softc.mr_op && mem_range_softc.mr_op->initAP)
 		return(mem_range_softc.mr_op->initAP(&mem_range_softc));
 }
+#endif
 
 static int 
 random_ioctl(dev, cmd, data, flags, p)
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index ee7222e..4c8c946 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index ee7222e..4c8c946 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index ee7222e..4c8c946 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index ee7222e..4c8c946 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.98 1999/04/28 01:03:21 luoqi Exp $
+ *	$Id: mp_machdep.c,v 1.99 1999/04/30 22:09:40 msmith Exp $
  */
 
 #include "opt_smp.h"
@@ -41,6 +41,8 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
+#include <sys/malloc.h>
+#include <sys/memrange.h>
 #ifdef BETTER_CLOCK
 #include <sys/dkstat.h>
 #endif