PERFORCE change 101700 for review
Warner Losh
imp at FreeBSD.org
Sun Jul 16 15:09:32 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101700
Change 101700 by imp at imp_paco-paco on 2006/07/16 15:09:07
Remove duplicate entries from moving stuff in config files.
NO_SYSCTL_DESCR
Affected files ...
.. //depot/projects/arm/src/sys/arm/conf/TSC4370#6 edit
.. //depot/projects/arm/src/sys/conf/options#24 edit
.. //depot/projects/arm/src/sys/sys/sysctl.h#8 edit
Differences ...
==== //depot/projects/arm/src/sys/arm/conf/TSC4370#6 (text+ko) ====
@@ -21,10 +21,6 @@
machine arm
ident KB920X
-options KERNPHYSADDR=0x20000000
-options KERNVIRTADDR=0xc0000000
-options PHYSADDR=0x20000000
-options STARTUP_PAGETABLE_ADDR=0x20800000
options AT91_TSC
include "../at91/std.kb920x"
#To statically compile in device wiring instead of /boot/device.hints
@@ -32,7 +28,6 @@
#hints "KB920X.hints" #Default places to look for devices.
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-makeoptions CONF_CFLAGS=-mcpu=arm9
options DDB
options KDB
options BREAK_TO_DEBUGGER
@@ -64,7 +59,7 @@
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-#options SYSCTL_OMIT_DESCR
+options NO_SYSCTL_DESCR
options MUTEX_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
==== //depot/projects/arm/src/sys/conf/options#24 (text+ko) ====
@@ -56,7 +56,7 @@
KDB_UNATTENDED opt_kdb.h
SYSCTL_DEBUG opt_sysctl.h
-SYSCTL_OMIT_DESCR opt_global.h
+NO_SYSCTL_DESCR opt_global.h
# Miscellaneous options.
ADAPTIVE_GIANT opt_adaptive_mutexes.h
==== //depot/projects/arm/src/sys/sys/sysctl.h#8 (text+ko) ====
@@ -205,7 +205,7 @@
#define SYSCTL_NODE_CHILDREN(parent, name) \
sysctl_##parent##_##name##_children
-#ifndef SYSCTL_OMIT_DESCR
+#ifndef NO_SYSCTL_DESCR
#define __DESCR(d) d
#else
#define __DESCR(d) ""
More information about the p4-projects
mailing list