From owner-p4-projects Sun Jan 12 2:49:13 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6510237B405; Sun, 12 Jan 2003 02:49:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE13137B401 for ; Sun, 12 Jan 2003 02:49:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97A5543F3F for ; Sun, 12 Jan 2003 02:49:08 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0CAn8fh095172 for ; Sun, 12 Jan 2003 02:49:08 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0CAn8vo095169 for perforce@freebsd.org; Sun, 12 Jan 2003 02:49:08 -0800 (PST) Date: Sun, 12 Jan 2003 02:49:08 -0800 (PST) Message-Id: <200301121049.h0CAn8vo095169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 23625 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=23625 Change 23625 by tzukanov@tzukanov_antares on 2003/01/12 02:48:47 Usual post-IFC updates. Affected files ... .. //depot/projects/s390/sys/kern/kern_sysctl.c#5 edit .. //depot/projects/s390/sys/s390/include/limits.h#2 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#7 edit .. //depot/projects/s390/sys/s390x/include/limits.h#2 edit Differences ... ==== //depot/projects/s390/sys/kern/kern_sysctl.c#5 (text+ko) ==== @@ -1390,7 +1390,7 @@ case KINFO_METER: name[0] = CTL_VM; - name[1] = VM_METER; + name[1] = VM_TOTAL; error = userland_sysctl(td, name, 2, uap->where, uap->size, 0, 0, 0, &size); break; ==== //depot/projects/s390/sys/s390/include/limits.h#2 (text+ko) ==== @@ -38,7 +38,6 @@ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by @@ -93,11 +92,11 @@ #if !defined(_POSIX_SOURCE) #define SIZE_T_MAX UINT_MAX /* max value for a size_t */ -#define OFF_MAX LLONG_MAX /* max value for a off_t */ -#define OFF_MIN LLONG_MIN /* min value for a off_t */ +#define OFF_MAX LLONG_MAX /* max value for an off_t */ +#define OFF_MIN LLONG_MIN /* min value for an off_t */ /* Quads and long longs are the same size. Ensure they stay in sync. */ -#define UQUAD_MAX ULLONG_MAX /* max value for a uquad_t */ +#define UQUAD_MAX ULLONG_MAX /* max value for an uquad_t */ #define QUAD_MAX LLONG_MAX /* max value for a quad_t */ #define QUAD_MIN LLONG_MIN /* min value for a quad_t */ #endif /* !_POSIX_SOURCE */ ==== //depot/projects/s390/sys/s390/s390/pmap.c#7 (text+ko) ==== @@ -609,9 +609,11 @@ /* Set the page table page hint. */ pmap->pm_ptphint = mpte; + vm_page_lock_queues(); mpte->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(mpte, PG_ZERO); vm_page_wakeup(mpte); + vm_page_unlock_queues(); return mpte; } @@ -1168,9 +1170,11 @@ pmap_kenter(ks + ptoa(i), VM_PAGE_TO_PHYS(m)); + vm_page_lock_queues(); vm_page_wakeup(m); vm_page_flag_clear(m, PG_ZERO); m->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); } } @@ -1247,8 +1251,10 @@ stpg = vm_page_grab(pmap->pm_pteobj, NPTP, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); + vm_page_lock_queues(); vm_page_flag_clear(stpg, PG_BUSY); stpg->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); pmap_kenter((vm_offset_t)pmap->pm_sto, VM_PAGE_TO_PHYS(stpg)); for (i = 0; i < 4*NPTP; i++) ==== //depot/projects/s390/sys/s390x/include/limits.h#2 (text+ko) ==== @@ -31,7 +31,6 @@ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by @@ -74,11 +73,11 @@ #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) #define SIZE_T_MAX ULONG_MAX /* max value for a size_t */ -#define OFF_MAX LONG_MAX /* max value for a off_t */ -#define OFF_MIN LONG_MIN /* min value for a off_t */ +#define OFF_MAX LONG_MAX /* max value for an off_t */ +#define OFF_MIN LONG_MIN /* min value for an off_t */ /* Quads and longs are the same on the alpha. Ensure they stay in sync. */ -#define UQUAD_MAX (ULONG_MAX) /* max value for a uquad_t */ +#define UQUAD_MAX (ULONG_MAX) /* max value for an uquad_t */ #define QUAD_MAX (LONG_MAX) /* max value for a quad_t */ #define QUAD_MIN (LONG_MIN) /* min value for a quad_t */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message