From 9a6c8313f746820c6ec4118a8f0094de6b20637f Mon Sep 17 00:00:00 2001 From: mrg Date: Sat, 27 Nov 1999 12:14:26 +0000 Subject: minor cosmetic merges; long way to go here. --- sys/arch/sparc/include/param.h | 5 ++--- sys/arch/sparc64/include/param.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h index 08a756c96f3..610e03c5cdf 100644 --- a/sys/arch/sparc/include/param.h +++ b/sys/arch/sparc/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.39 1999/05/03 16:14:02 christos Exp $ */ +/* $NetBSD: param.h,v 1.40 1999/11/27 12:14:26 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -116,12 +116,11 @@ extern int nbpg, pgofset, pgshift; #define MCLSHIFT 11 /* log2(MCLBYTES) */ #define MCLOFSET (MCLBYTES - 1) -#ifndef NMBCLUSTERS - #if defined(_KERNEL) && !defined(_LKM) #include "opt_gateway.h" #endif /* _KERNEL && ! _LKM */ +#ifndef NMBCLUSTERS #ifdef GATEWAY #define NMBCLUSTERS 512 /* map size, max cluster allocation */ #else diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h index 7b6f0fa874f..474670d7070 100644 --- a/sys/arch/sparc64/include/param.h +++ b/sys/arch/sparc64/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.13 1999/11/21 00:17:19 eeh Exp $ */ +/* $NetBSD: param.h,v 1.14 1999/11/27 12:14:26 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -116,7 +116,7 @@ * of the `options SUN4?' combination a particular kernel was configured with. * See also the definitions of NBPG, PGOFSET and PGSHIFT below. */ -#if defined(_KERNEL) && !defined(_LOCORE) +#if (defined(_KERNEL) || defined(_STANDALONE)) && !defined(_LOCORE) extern int nbpg, pgofset, pgshift; #endif -- cgit