Date: Wed, 13 Jun 2012 16:12:31 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r237010 - in head/sys/arm/xscale: i80321 i8134x ixp425 pxa Message-ID: <201206131612.q5DGCVBU034644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Jun 13 16:12:30 2012 New Revision: 237010 URL: http://svn.freebsd.org/changeset/base/237010 Log: Remove leakage of other patches into last commit. Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c head/sys/arm/xscale/i80321/iq31244_machdep.c head/sys/arm/xscale/i8134x/crb_machdep.c head/sys/arm/xscale/ixp425/avila_machdep.c head/sys/arm/xscale/pxa/pxa_machdep.c Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c ============================================================================== --- head/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jun 13 15:25:52 2012 (r237009) +++ head/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jun 13 16:12:30 2012 (r237010) @@ -192,8 +192,8 @@ initarm(struct arm_boot_params *abp) vm_offset_t lastaddr; uint32_t memsize, memstart; - lastaddr = parse_boot_param(abp); set_cpufuncs(); + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); Modified: head/sys/arm/xscale/i80321/iq31244_machdep.c ============================================================================== --- head/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jun 13 15:25:52 2012 (r237009) +++ head/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jun 13 16:12:30 2012 (r237010) @@ -193,8 +193,8 @@ initarm(struct arm_boot_params *abp) vm_offset_t lastaddr; uint32_t memsize, memstart; - lastaddr = parse_boot_param(abp); set_cpufuncs(); + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); Modified: head/sys/arm/xscale/i8134x/crb_machdep.c ============================================================================== --- head/sys/arm/xscale/i8134x/crb_machdep.c Wed Jun 13 15:25:52 2012 (r237009) +++ head/sys/arm/xscale/i8134x/crb_machdep.c Wed Jun 13 16:12:30 2012 (r237010) @@ -189,8 +189,8 @@ initarm(struct arm_boot_params *abp) vm_offset_t lastaddr; uint32_t memsize, memstart; - lastaddr = parse_boot_param(abp); set_cpufuncs(); + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); Modified: head/sys/arm/xscale/ixp425/avila_machdep.c ============================================================================== --- head/sys/arm/xscale/ixp425/avila_machdep.c Wed Jun 13 15:25:52 2012 (r237009) +++ head/sys/arm/xscale/ixp425/avila_machdep.c Wed Jun 13 16:12:30 2012 (r237010) @@ -238,8 +238,8 @@ initarm(struct arm_boot_params *abp) vm_offset_t lastaddr; uint32_t memsize; - lastaddr = parse_boot_param(abp); set_cpufuncs(); /* NB: sets cputype */ + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); Modified: head/sys/arm/xscale/pxa/pxa_machdep.c ============================================================================== --- head/sys/arm/xscale/pxa/pxa_machdep.c Wed Jun 13 15:25:52 2012 (r237009) +++ head/sys/arm/xscale/pxa/pxa_machdep.c Wed Jun 13 16:12:30 2012 (r237010) @@ -174,8 +174,8 @@ initarm(struct arm_boot_params *abp) int i, j; uint32_t memsize[PXA2X0_SDRAM_BANKS], memstart[PXA2X0_SDRAM_BANKS]; - lastaddr = parse_boot_param(abp); set_cpufuncs(); + lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206131612.q5DGCVBU034644>