From owner-p4-projects@FreeBSD.ORG Tue Apr 8 02:00:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F72837B404; Tue, 8 Apr 2003 02:00:02 -0700 (PDT) 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 E977537B401 for ; Tue, 8 Apr 2003 02:00:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D30F43F3F for ; Tue, 8 Apr 2003 02:00:01 -0700 (PDT) (envelope-from peter@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 h389010U012348 for ; Tue, 8 Apr 2003 02:00:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h38901f6012345 for perforce@freebsd.org; Tue, 8 Apr 2003 02:00:01 -0700 (PDT) Date: Tue, 8 Apr 2003 02:00:01 -0700 (PDT) Message-Id: <200304080900.h38901f6012345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 28512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2003 09:00:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=28512 Change 28512 by peter@peter_daintree on 2003/04/08 01:59:46 I'm not using zones for the pdp and pml4 Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#19 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#19 (text+ko) ==== @@ -186,9 +186,6 @@ static int nkpt; vm_offset_t kernel_vm_end; -static uma_zone_t pdpzone; -static uma_zone_t pml4zone; - /* * Data for the pv entry allocation mechanism */ @@ -238,8 +235,6 @@ static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); static vm_offset_t pmap_kmem_choose(vm_offset_t addr); static void *pmap_pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); -static void *pmap_pdp_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); -static void *pmap_pml4_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); CTASSERT(1 << PDESHIFT == sizeof(pd_entry_t)); CTASSERT(1 << PTESHIFT == sizeof(pt_entry_t)); @@ -383,20 +378,6 @@ return (void *)kmem_alloc(kernel_map, bytes); } -static void * -pmap_pdp_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - *flags = UMA_SLAB_PRIV; - return (void *)kmem_alloc(kernel_map, bytes); -} - -static void * -pmap_pml4_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - *flags = UMA_SLAB_PRIV; - return (void *)kmem_alloc(kernel_map, bytes); -} - /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -435,14 +416,6 @@ uma_zone_set_allocf(pvzone, pmap_pv_allocf); uma_prealloc(pvzone, initial_pvs); - pdpzone = uma_zcreate("PDPT", NPGPTD * sizeof(pdp_entry_t), NULL, - NULL, NULL, NULL, (NPGPTD * sizeof(pdp_entry_t)) - 1, 0); - uma_zone_set_allocf(pdpzone, pmap_pdp_allocf); - - pml4zone = uma_zcreate("PML4", sizeof(pml4_entry_t), NULL, - NULL, NULL, NULL, sizeof(pml4_entry_t) - 1, 0); - uma_zone_set_allocf(pml4zone, pmap_pml4_allocf); - /* * Now it is safe to enable pv_table recording. */