Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9366
b: refs/heads/master
c: 40fd353
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Sep 22, 2005
1 parent feba9dd commit 75429ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 36 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2bdb3cb265830aee823444d115a8a84eca2b934e
refs/heads/master: 40fd3533c93f0062b6d1d8540961ef70fc8ab750
35 changes: 0 additions & 35 deletions trunk/arch/sparc64/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -619,39 +619,6 @@ static void remap_kernel(void)
}
}

static void readjust_prom_translations(void)
{
int nents, i;

nents = read_obp_translations();
for (i = 0; i < nents; i++) {
unsigned long vaddr = prom_trans[i].virt;
unsigned long size = prom_trans[i].size;

if (vaddr < 0xf0000000UL) {
unsigned long avoid_start = (unsigned long) KERNBASE;
unsigned long avoid_end = avoid_start + (4 * 1024 * 1024);

if (bigkernel)
avoid_end += (4 * 1024 * 1024);
if (vaddr < avoid_start) {
unsigned long top = vaddr + size;

if (top > avoid_start)
top = avoid_start;
prom_unmap(top - vaddr, vaddr);
}
if ((vaddr + size) > avoid_end) {
unsigned long bottom = vaddr;

if (bottom < avoid_end)
bottom = avoid_end;
prom_unmap((vaddr + size) - bottom, bottom);
}
}
}
}

static void inherit_prom_mappings(void)
{
int n;
Expand All @@ -663,8 +630,6 @@ static void inherit_prom_mappings(void)
prom_printf("Remapping the kernel... ");
remap_kernel();

readjust_prom_translations();

prom_printf("done.\n");

register_prom_callbacks();
Expand Down

0 comments on commit 75429ea

Please sign in to comment.