From owner-svn-src-head@freebsd.org Tue Mar 1 09:51:38 2016 Return-Path: Delivered-To: svn-src-head@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 5BF79ABDA05; Tue, 1 Mar 2016 09:51:38 +0000 (UTC) (envelope-from andrew@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 139BD19A2; Tue, 1 Mar 2016 09:51:38 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u219pbbe021633; Tue, 1 Mar 2016 09:51:37 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u219pbSX021632; Tue, 1 Mar 2016 09:51:37 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201603010951.u219pbSX021632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 1 Mar 2016 09:51:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296258 - head/sys/arm/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2016 09:51:38 -0000 Author: andrew Date: Tue Mar 1 09:51:36 2016 New Revision: 296258 URL: https://svnweb.freebsd.org/changeset/base/296258 Log: Stop setting the memory size in the arm EFI and FDT code, we don't use it. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/arm/machdep.c Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Tue Mar 1 09:45:27 2016 (r296257) +++ head/sys/arm/arm/machdep.c Tue Mar 1 09:51:36 2016 (r296258) @@ -1305,7 +1305,7 @@ set_stackptrs(int cpu) static void add_efi_map_entries(struct efi_map_header *efihdr, struct mem_region *mr, - int *mrcnt, uint32_t *memsize) + int *mrcnt) { struct efi_md *map, *p; const char *type; @@ -1330,7 +1330,6 @@ add_efi_map_entries(struct efi_map_heade }; *mrcnt = 0; - *memsize = 0; /* * Memory map data provided by UEFI via the GetMemoryMap @@ -1402,7 +1401,6 @@ add_efi_map_entries(struct efi_map_heade } *mrcnt = j; - *memsize = memory_size; } #endif /* EFI */ @@ -1715,7 +1713,6 @@ initarm(struct arm_boot_params *abp) struct mem_region mem_regions[FDT_MEM_REGIONS]; vm_paddr_t lastaddr; vm_offset_t dtbp, kernelstack, dpcpu; - u_long memsize; char *env; void *kmdp; int err_devmap, mem_regions_sz; @@ -1727,7 +1724,6 @@ initarm(struct arm_boot_params *abp) arm_physmem_kernaddr = abp->abp_physaddr; lastaddr = parse_boot_param(abp) - KERNVIRTADDR + arm_physmem_kernaddr; - memsize = 0; set_cpufuncs(); cpuinfo_init(); @@ -1755,14 +1751,12 @@ initarm(struct arm_boot_params *abp) efihdr = (struct efi_map_header *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP); if (efihdr != NULL) { - add_efi_map_entries(efihdr, mem_regions, &mem_regions_sz, - &memsize); + add_efi_map_entries(efihdr, mem_regions, &mem_regions_sz); } else #endif { /* Grab physical memory regions information from device tree. */ - if (fdt_get_mem_regions(mem_regions, &mem_regions_sz, - &memsize) != 0) + if (fdt_get_mem_regions(mem_regions, &mem_regions_sz,NULL) != 0) panic("Cannot get physical memory regions"); } arm_physmem_hardware_regions(mem_regions, mem_regions_sz);