diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-22 16:03:36 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-22 16:03:36 -0400 |
commit | 40fd3533c93f0062b6d1d8540961ef70fc8ab750 (patch) | |
tree | 89df38fa456ba31551cc7a803677da556ab1e912 /arch/sparc64 | |
parent | 2bdb3cb265830aee823444d115a8a84eca2b934e (diff) |
[SPARC64]: Kill readjust_prom_translations()
Testing shows that the prom_unmap() calls do absolutely
nothing.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/mm/init.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 92d095802958..ec47de494c1f 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -619,39 +619,6 @@ static void remap_kernel(void) | |||
619 | } | 619 | } |
620 | } | 620 | } |
621 | 621 | ||
622 | static void readjust_prom_translations(void) | ||
623 | { | ||
624 | int nents, i; | ||
625 | |||
626 | nents = read_obp_translations(); | ||
627 | for (i = 0; i < nents; i++) { | ||
628 | unsigned long vaddr = prom_trans[i].virt; | ||
629 | unsigned long size = prom_trans[i].size; | ||
630 | |||
631 | if (vaddr < 0xf0000000UL) { | ||
632 | unsigned long avoid_start = (unsigned long) KERNBASE; | ||
633 | unsigned long avoid_end = avoid_start + (4 * 1024 * 1024); | ||
634 | |||
635 | if (bigkernel) | ||
636 | avoid_end += (4 * 1024 * 1024); | ||
637 | if (vaddr < avoid_start) { | ||
638 | unsigned long top = vaddr + size; | ||
639 | |||
640 | if (top > avoid_start) | ||
641 | top = avoid_start; | ||
642 | prom_unmap(top - vaddr, vaddr); | ||
643 | } | ||
644 | if ((vaddr + size) > avoid_end) { | ||
645 | unsigned long bottom = vaddr; | ||
646 | |||
647 | if (bottom < avoid_end) | ||
648 | bottom = avoid_end; | ||
649 | prom_unmap((vaddr + size) - bottom, bottom); | ||
650 | } | ||
651 | } | ||
652 | } | ||
653 | } | ||
654 | |||
655 | static void inherit_prom_mappings(void) | 622 | static void inherit_prom_mappings(void) |
656 | { | 623 | { |
657 | int n; | 624 | int n; |
@@ -663,8 +630,6 @@ static void inherit_prom_mappings(void) | |||
663 | prom_printf("Remapping the kernel... "); | 630 | prom_printf("Remapping the kernel... "); |
664 | remap_kernel(); | 631 | remap_kernel(); |
665 | 632 | ||
666 | readjust_prom_translations(); | ||
667 | |||
668 | prom_printf("done.\n"); | 633 | prom_printf("done.\n"); |
669 | 634 | ||
670 | register_prom_callbacks(); | 635 | register_prom_callbacks(); |