diff options
| author | andrew <andrew@FreeBSD.org> | 2012-09-22 22:41:38 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2012-09-22 22:41:38 +0000 |
| commit | 32eb506f225e2b85e47ea826ddccfaf600657810 (patch) | |
| tree | 80ef4f90009db9525d5d1ae87fe67e96ca55131e /sys/arm/mv/mv_machdep.c | |
| parent | ec17dd03e0b43e9e9f9b96fc7e6ed1072b7a9154 (diff) | |
| download | FreeBSD-src-32eb506f225e2b85e47ea826ddccfaf600657810.zip FreeBSD-src-32eb506f225e2b85e47ea826ddccfaf600657810.tar.gz | |
Reduce the diff between the FDT implementations of initarm.
This only touches whitespace and comments.
Diffstat (limited to 'sys/arm/mv/mv_machdep.c')
| -rw-r--r-- | sys/arm/mv/mv_machdep.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c index 737868a..80d841b 100644 --- a/sys/arm/mv/mv_machdep.c +++ b/sys/arm/mv/mv_machdep.c @@ -301,19 +301,18 @@ initarm(struct arm_boot_params *abp) u_int l1pagetable; int i = 0, j = 0, err_devmap = 0; - lastaddr = parse_boot_param(abp); + lastaddr = parse_boot_param(abp); memsize = 0; set_cpufuncs(); /* * Find the dtb passed in by the boot loader. */ - kmdp = preload_search_by_type("elf kernel"); - if (kmdp != NULL) + kmdp = preload_search_by_type("elf kernel"); + if (kmdp != NULL) dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t); else dtbp = (vm_offset_t)NULL; - #if defined(FDT_DTB_STATIC) /* @@ -429,7 +428,7 @@ initarm(struct arm_boot_params *abp) &kernel_pt_table[i]); pmap_curmaxkvaddr = l2_start + (l2size - 1) * L1_S_SIZE; - + /* Map kernel code and data */ pmap_map_chunk(l1pagetable, KERNVIRTADDR, KERNPHYSADDR, (((uint32_t)(lastaddr) - KERNVIRTADDR) + PAGE_MASK) & ~PAGE_MASK, @@ -493,7 +492,7 @@ initarm(struct arm_boot_params *abp) if (err_devmap != 0) printf("WARNING: could not fully configure devmap, error=%d\n", - err_devmap); + err_devmap); /* * Re-initialise decode windows @@ -554,6 +553,7 @@ initarm(struct arm_boot_params *abp) /* Do basic tuning, hz etc */ init_param2(physmem); kdb_init(); + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } |
