From owner-svn-src-all@FreeBSD.ORG Wed Jul 2 22:19:59 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA07221B; Wed, 2 Jul 2014 22:19:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6B3A287F; Wed, 2 Jul 2014 22:19:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62MJxFQ028768; Wed, 2 Jul 2014 22:19:59 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62MJxX9028767; Wed, 2 Jul 2014 22:19:59 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201407022219.s62MJxX9028767@svn.freebsd.org> From: Marcel Moolenaar Date: Wed, 2 Jul 2014 22:19:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268189 - stable/10/sys/ia64/ia64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2014 22:19:59 -0000 Author: marcel Date: Wed Jul 2 22:19:59 2014 New Revision: 268189 URL: http://svnweb.freebsd.org/changeset/base/268189 Log: MFC r257484: Change PAL_PTCE_INFO related variables. Modified: stable/10/sys/ia64/ia64/pmap.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/ia64/ia64/pmap.c ============================================================================== --- stable/10/sys/ia64/ia64/pmap.c Wed Jul 2 22:17:27 2014 (r268188) +++ stable/10/sys/ia64/ia64/pmap.c Wed Jul 2 22:19:59 2014 (r268189) @@ -195,12 +195,12 @@ extern struct ia64_lpte ***ia64_kptdir; vm_offset_t kernel_vm_end; -/* Values for ptc.e. XXX values for SKI. */ -static uint64_t pmap_ptc_e_base = 0x100000000; -static uint64_t pmap_ptc_e_count1 = 3; -static uint64_t pmap_ptc_e_count2 = 2; -static uint64_t pmap_ptc_e_stride1 = 0x2000; -static uint64_t pmap_ptc_e_stride2 = 0x100000000; +/* Defaults for ptc.e. */ +static uint64_t pmap_ptc_e_base = 0; +static uint32_t pmap_ptc_e_count1 = 1; +static uint32_t pmap_ptc_e_count2 = 1; +static uint32_t pmap_ptc_e_stride1 = 0; +static uint32_t pmap_ptc_e_stride2 = 0; struct mtx pmap_ptc_mutex; @@ -324,12 +324,12 @@ pmap_bootstrap() panic("Can't configure ptc.e parameters"); pmap_ptc_e_base = res.pal_result[0]; pmap_ptc_e_count1 = res.pal_result[1] >> 32; - pmap_ptc_e_count2 = res.pal_result[1] & ((1L<<32) - 1); + pmap_ptc_e_count2 = res.pal_result[1]; pmap_ptc_e_stride1 = res.pal_result[2] >> 32; - pmap_ptc_e_stride2 = res.pal_result[2] & ((1L<<32) - 1); + pmap_ptc_e_stride2 = res.pal_result[2]; if (bootverbose) - printf("ptc.e base=0x%lx, count1=%ld, count2=%ld, " - "stride1=0x%lx, stride2=0x%lx\n", + printf("ptc.e base=0x%lx, count1=%u, count2=%u, " + "stride1=0x%x, stride2=0x%x\n", pmap_ptc_e_base, pmap_ptc_e_count1, pmap_ptc_e_count2,