Date: Thu, 5 Dec 2013 21:35:53 +0000 (UTC) From: Andreas Tobler <andreast@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259008 - head/sys/powerpc/pseries Message-ID: <201312052135.rB5LZr12078738@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312052135.rB5LZr12078738>