From owner-svn-src-head@FreeBSD.ORG Thu Dec 5 21:35:53 2013 Return-Path: Delivered-To: svn-src-head@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 3D7BFBC0; Thu, 5 Dec 2013 21:35:53 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 29A961E22; Thu, 5 Dec 2013 21:35:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5LZrl0078741; Thu, 5 Dec 2013 21:35:53 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5LZr12078738; Thu, 5 Dec 2013 21:35:53 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201312052135.rB5LZr12078738@svn.freebsd.org> From: Andreas Tobler Date: Thu, 5 Dec 2013 21:35:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259008 - head/sys/powerpc/pseries 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.17 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: Thu, 05 Dec 2013 21:35:53 -0000 Author: andreast Date: Thu Dec 5 21:35:52 2013 New Revision: 259008 URL: http://svnweb.freebsd.org/changeset/base/259008 Log: Do some cosmetic fixes. Modified: head/sys/powerpc/pseries/platform_chrp.c Modified: head/sys/powerpc/pseries/platform_chrp.c ============================================================================== --- head/sys/powerpc/pseries/platform_chrp.c Thu Dec 5 21:34:33 2013 (r259007) +++ head/sys/powerpc/pseries/platform_chrp.c Thu Dec 5 21:35:52 2013 (r259008) @@ -158,14 +158,14 @@ chrp_attach(platform_t plat) } static int -parse_drconf_memory(int *msz, int *asz, struct mem_region *ofmem, - struct mem_region *ofavail) +parse_drconf_memory(struct mem_region *ofmem, int *msz, + struct mem_region *ofavail, int *asz) { phandle_t phandle; vm_offset_t base; int i, idx, len, lasz, lmsz, res; - uint32_t lmb_size[2]; - unsigned long *dmem, flags; + uint32_t flags, lmb_size[2]; + uint64_t *dmem; lmsz = *msz; lasz = *asz; @@ -208,8 +208,8 @@ parse_drconf_memory(int *msz, int *asz, /* Number of elements */ idx = arr[0]; - /* First address. */ - dmem = (void*)&arr[1]; + /* First address, in arr[1], arr[2]*/ + dmem = (uint64_t*)&arr[1]; for (i = 0; i < idx; i++) { base = *dmem; @@ -242,7 +242,7 @@ chrp_mem_regions(platform_t plat, struct int i; ofw_mem_regions(phys, physsz, avail, availsz); - parse_drconf_memory(physsz, availsz, phys, avail); + parse_drconf_memory(phys, physsz, avail, availsz); /* * On some firmwares (SLOF), some memory may be marked available that