PERFORCE change 139377 for review
Warner Losh
imp at FreeBSD.org
Fri Apr 4 20:48:02 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=139377
Change 139377 by imp at imp_paco-paco on 2008/04/04 20:47:14
IFC @139376
Affected files ...
.. //depot/projects/mips2-jnpr/src/share/man/man9/sleep.9#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/mips2-jnpr/src/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/mips2-jnpr/src/sys/conf/Makefile.arm#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/mips2-jnpr/src/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/mips2-jnpr/src/sys/vm/uma.h#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/vm/uma_core.c#2 integrate
.. //depot/projects/mips2-jnpr/src/sys/vm/vm_map.c#4 integrate
Differences ...
==== //depot/projects/mips2-jnpr/src/share/man/man9/sleep.9#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.61 2007/03/30 18:07:26 julian Exp $
+.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.62 2008/04/04 16:59:58 imp Exp $
.\"
-.Dd February 27, 2007
+.Dd April 4, 2008
.Os
.Dt SLEEP 9
.Sh NAME
@@ -93,6 +93,10 @@
runnable with the specified
.Fa priority
when it resumes.
+.Dv PZERO
+should never be used, as it is for compatibility only.
+A new priority of 0 means to use the thread's current priority when
+it is made runnable again.
If
.Fa priority
includes the
==== //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#6 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.611 2008/04/02 04:39:47 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $");
/*
* Manages physical address maps.
@@ -2904,12 +2904,6 @@
panic("pmap_enter: attempted pmap_enter on 2MB page");
pte = pmap_pde_to_pte(pde, va);
} else
- pte = NULL;
-
- /*
- * Page Directory table entry not valid, we need a new PT page
- */
- if (pte == NULL)
panic("pmap_enter: invalid page directory va=%#lx", va);
pa = VM_PAGE_TO_PHYS(m);
==== //depot/projects/mips2-jnpr/src/sys/arm/arm/elf_trampoline.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.19 2008/03/22 20:34:07 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.20 2008/04/04 17:35:24 raj Exp $");
#include <machine/asm.h>
#include <sys/param.h>
#include <sys/elf32.h>
@@ -59,6 +59,8 @@
#define cpu_idcache_wbinv_all arm8_cache_purgeID
#elif defined(CPU_ARM9)
#define cpu_idcache_wbinv_all arm9_idcache_wbinv_all
+#elif defined(CPU_ARM9E)
+#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all
#elif defined(CPU_ARM10)
#define cpu_idcache_wbinv_all arm10_idcache_wbinv_all
#elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \
==== //depot/projects/mips2-jnpr/src/sys/arm/sa11x0/assabet_machdep.c#3 (text+ko) ====
@@ -47,7 +47,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.23 2008/04/03 16:44:50 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.24 2008/04/04 18:22:16 imp Exp $");
#include "opt_md.h"
@@ -225,7 +225,7 @@
boothowto = RB_VERBOSE | RB_SINGLE;
cninit();
set_cpufuncs();
- lastaddr = fake_reload_metadata();
+ lastaddr = fake_preload_metadata();
physmem = memsize / PAGE_SIZE;
pc = &__pcpu;
pcpu_init(pc, 0, sizeof(struct pcpu));
==== //depot/projects/mips2-jnpr/src/sys/conf/Makefile.arm#4 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.36 2008/04/03 20:42:36 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.38 2008/04/04 19:33:09 imp Exp $
#
# Makefile for FreeBSD
#
@@ -40,6 +40,10 @@
CC += -mbig-endian
SYSTEM_LD += -EB
LD += -EB
+.else
+CC += -mlittle-endian
+SYSTEM_LD += -EL
+LD += -EL
.endif
@@ -71,7 +75,7 @@
$S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \
$S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \
$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
- $S/$M/$M/cpufunc_asm_xscale_c3.S
+ $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S
KERNEL_EXTRA=trampoline
KERNEL_EXTRA_INSTALL=kernel.gz.tramp
trampoline: ${KERNEL_KO}.tramp
==== //depot/projects/mips2-jnpr/src/sys/i386/i386/pmap.c#5 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.613 2008/03/29 04:29:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.614 2008/04/04 18:41:11 alc Exp $");
/*
* Manages physical address maps.
@@ -561,7 +561,9 @@
static void *
pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
{
- *flags = UMA_SLAB_PRIV;
+
+ /* Inform UMA that this allocator uses kernel_map/object. */
+ *flags = UMA_SLAB_KERNEL;
return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL,
1, 0));
}
==== //depot/projects/mips2-jnpr/src/sys/kern/kern_mbuf.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.39 2008/03/16 10:58:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.40 2008/04/04 18:41:12 alc Exp $");
#include "opt_mac.h"
#include "opt_param.h"
@@ -352,7 +352,8 @@
mbuf_jumbo_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
{
- *flags = UMA_SLAB_PRIV;
+ /* Inform UMA that this allocator uses kernel_map/object. */
+ *flags = UMA_SLAB_KERNEL;
return (contigmalloc(bytes, M_JUMBOFRAME, wait, (vm_paddr_t)0,
~(vm_paddr_t)0, 1, 0));
}
==== //depot/projects/mips2-jnpr/src/sys/vm/uma.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/vm/uma.h,v 1.31 2007/02/11 20:13:52 rwatson Exp $
+ * $FreeBSD: src/sys/vm/uma.h,v 1.32 2008/04/04 18:41:12 alc Exp $
*
*/
@@ -488,6 +488,7 @@
*/
#define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */
#define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */
+#define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kernel_map */
#define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */
#define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */
#define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */
==== //depot/projects/mips2-jnpr/src/sys/vm/uma_core.c#2 (text+ko) ====
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.148 2007/10/11 20:11:27 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/uma_core.c,v 1.149 2008/04/04 18:41:12 alc Exp $");
/* I should really use ktr.. */
/*
@@ -751,6 +751,8 @@
if (flags & UMA_SLAB_KMEM)
obj = kmem_object;
+ else if (flags & UMA_SLAB_KERNEL)
+ obj = kernel_object;
else
obj = NULL;
for (i = 0; i < keg->uk_ppera; i++)
@@ -871,6 +873,8 @@
if (flags & UMA_SLAB_KMEM)
obj = kmem_object;
+ else if (flags & UMA_SLAB_KERNEL)
+ obj = kernel_object;
else
obj = NULL;
for (i = 0; i < keg->uk_ppera; i++)
==== //depot/projects/mips2-jnpr/src/sys/vm/vm_map.c#4 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.393 2008/03/12 10:12:01 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.394 2008/04/04 19:14:58 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1459,8 +1459,8 @@
*
* Preload read-only mappings for the given object's resident pages into
* the given map. This eliminates the soft faults on process startup and
- * immediately after an mmap(2). Unless the given flags include
- * MAP_PREFAULT_MADVISE, cached pages are not reactivated and mapped.
+ * immediately after an mmap(2). Because these are speculative mappings,
+ * cached pages are not reactivated and mapped.
*/
void
vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
More information about the p4-projects
mailing list