diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libnetworking/vm/vm_extern.h | 11 | ||||
-rw-r--r-- | cpukit/libnetworking/vm/vm_kern.h | 17 |
3 files changed, 16 insertions, 17 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index cdbf73ebbf..6cfead059a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2005-02-18 Ralf Corsepius <ralf.corsepius@rtems.org> + + * libnetworking/vm/vm_extern.h, libnetworking/vm/vm_kern.h: + Update from FreeBSD. + 2005-02-17 Joel Sherrill <joel@OARcorp.com> * include/rtems/pci.h: Merge differences from diff --git a/cpukit/libnetworking/vm/vm_extern.h b/cpukit/libnetworking/vm/vm_extern.h index 50503a7f6f..0edb3ebb44 100644 --- a/cpukit/libnetworking/vm/vm_extern.h +++ b/cpukit/libnetworking/vm/vm_extern.h @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,9 +27,12 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $Id$ + * $FreeBSD: src/sys/vm/vm_extern.h,v 1.75 2004/11/20 02:29:00 das Exp $ */ +/* + * $Id$ + */ #ifndef _VM_EXTERN_H_ #define _VM_EXTERN_H_ diff --git a/cpukit/libnetworking/vm/vm_kern.h b/cpukit/libnetworking/vm/vm_kern.h index b1e073dd3a..309f503f44 100644 --- a/cpukit/libnetworking/vm/vm_kern.h +++ b/cpukit/libnetworking/vm/vm_kern.h @@ -13,10 +13,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -61,6 +57,10 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * + * $FreeBSD: src/sys/vm/vm_kern.h,v 1.28 2005/01/07 02:29:27 imp Exp $ + */ + +/* * $Id$ */ @@ -71,14 +71,9 @@ extern vm_map_t buffer_map; extern vm_map_t kernel_map; extern vm_map_t kmem_map; -extern vm_map_t mb_map; -extern int mb_map_full; -extern vm_map_t io_map; extern vm_map_t clean_map; -extern vm_map_t phys_map; extern vm_map_t exec_map; -extern vm_map_t u_map; - -extern vm_offset_t kernel_vm_end; +extern vm_map_t pipe_map; +extern u_int vm_kmem_size; #endif /* _VM_VM_KERN_H_ */ |