lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC64]: Minor bug fix to obp_read_memory().

Browse Source 
If we end up zero'ing out the size of one of the entries,
pop it out of the array completely because some code that
examines these things cannot handle a zero length element
properly.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2006-06-22 00:00:00 -07:00
parent 07f8e5f358
commit 486ad10a7e
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/sparc64/mm/init.c
View File

@@ -102,8 +102,6 @@ static void __init read_obp_memory(const char *property,
prom_halt(); prom_halt();
} }
*num_ents = ents;
/* Sanitize what we got from the firmware, by page aligning /* Sanitize what we got from the firmware, by page aligning
* everything. * everything.
*/ */
@@ -125,6 +123,25 @@ static void __init read_obp_memory(const char *property,
regs[i].phys_addr = base; regs[i].phys_addr = base;
regs[i].reg_size = size; regs[i].reg_size = size;
} }
for (i = 0; i < ents; i++) {
if (regs[i].reg_size == 0UL) {
int j;
for (j = i; j < ents - 1; j++) {
regs[j].phys_addr =
regs[j+1].phys_addr;
regs[j].reg_size =
regs[j+1].reg_size;
}
ents--;
i--;
}
}
*num_ents = ents;
sort(regs, ents, sizeof(struct linux_prom64_registers), sort(regs, ents, sizeof(struct linux_prom64_registers),
cmp_p64, NULL); cmp_p64, NULL);
} }