Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove GENERIC.MP config and enable SMP by default on amd64.

This commit is contained in:
ad 2007-12-20 23:32:24 +00:00
parent b59ab94c46
commit f28895c808
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/utils/sysinst/arch/amd64/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.21 2007/11/12 15:07:34 jmmv Exp $ */
/* $NetBSD: md.h,v 1.22 2007/12/20 23:32:24 ad Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -68,7 +68,6 @@
* from floppy.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
#define SET_KERNEL_2_NAME "kern-GENERIC.MP"
#define SET_KERNEL_GENERIC SET_KERNEL_1

4
etc/etc.amd64/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.9 2007/11/22 21:23:42 bouyer Exp $
# $NetBSD: Makefile.inc,v 1.10 2007/12/20 23:32:24 ad Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@ -6,7 +6,7 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
KERNEL_SETS= GENERIC GENERIC.MP
KERNEL_SETS= GENERIC
KERNEL_SETS+= XEN3_DOM0 XEN3_DOMU
BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU

6
sys/arch/amd64/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.184 2007/12/17 04:36:16 riz Exp $
# $NetBSD: GENERIC,v 1.185 2007/12/20 23:32:25 ad Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.184 $"
#ident "GENERIC-$Revision: 1.185 $"
maxusers 32 # estimated number of users
@ -60,7 +60,7 @@ options SYSVSHM # System V-like memory sharing
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
options LKM # loadable kernel modules
options MULTIPROCESSOR # SMP
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel

5
sys/arch/amd64/conf/GENERIC.MP
View File

@ -1,5 +0,0 @@
# $NetBSD: GENERIC.MP,v 1.2 2005/12/27 00:46:38 chs Exp $
include "arch/amd64/conf/GENERIC"
options MULTIPROCESSOR