From owner-svn-src-all@freebsd.org Sat Dec 24 13:28:40 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 758BBC8F2C6; Sat, 24 Dec 2016 13:28:40 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 44A441E59; Sat, 24 Dec 2016 13:28:40 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBODSdlP038492; Sat, 24 Dec 2016 13:28:39 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBODSd0D038490; Sat, 24 Dec 2016 13:28:39 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201612241328.uBODSd0D038490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Sat, 24 Dec 2016 13:28:39 +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: r310508 - in stable/10/sys/ia64: ia64 include 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.23 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: Sat, 24 Dec 2016 13:28:40 -0000 Author: avg Date: Sat Dec 24 13:28:39 2016 New Revision: 310508 URL: https://svnweb.freebsd.org/changeset/base/310508 Log: define Maxmem for ia64, the only platform that didn't have it This is a direct commit to stable/10 as the platform was removed in the newer branches. Maxmem is required for compiling fwohci(4) on ia64 since commit r310081, MFC of r277511. It was easier to add Maxmem than to make a special case for ia64 in fwohci. Reported by: jhb, gjb Discussed with: kib, jhb Modified: stable/10/sys/ia64/ia64/physmem.c stable/10/sys/ia64/include/md_var.h Modified: stable/10/sys/ia64/ia64/physmem.c ============================================================================== --- stable/10/sys/ia64/ia64/physmem.c Sat Dec 24 13:00:19 2016 (r310507) +++ stable/10/sys/ia64/ia64/physmem.c Sat Dec 24 13:28:39 2016 (r310508) @@ -38,7 +38,7 @@ static u_int phys_avail_segs; vm_paddr_t phys_avail[2 * VM_PHYSSEG_MAX + 2]; vm_paddr_t paddr_max; - +long Maxmem; long realmem; static u_int @@ -168,6 +168,12 @@ ia64_physmem_fini(void) size = 1U << 27; realmem = (realmem + size - 1) & ~(size - 1); realmem = atop(realmem); + + /* + * Maxmem isn't the "maximum memory", it's one larger than the + * highest page of the physical address space. + */ + Maxmem = atop(paddr_max); return (0); } Modified: stable/10/sys/ia64/include/md_var.h ============================================================================== --- stable/10/sys/ia64/include/md_var.h Sat Dec 24 13:00:19 2016 (r310507) +++ stable/10/sys/ia64/include/md_var.h Sat Dec 24 13:28:39 2016 (r310508) @@ -75,6 +75,7 @@ struct ia64_init_return { extern uint64_t ia64_lapic_addr; extern vm_paddr_t paddr_max; +extern long Maxmem; extern u_int busdma_swi_pending; void *acpi_find_table(const char *sig);