patch-2.4.21 linux-2.4.21/arch/sparc/kernel/ioport.c
Next file: linux-2.4.21/arch/sparc/kernel/irq.c
Previous file: linux-2.4.21/arch/sparc/kernel/head.S
Back to the patch index
Back to the overall index
- Lines: 39
- Date:
2003-06-13 07:51:32.000000000 -0700
- Orig file:
linux-2.4.20/arch/sparc/kernel/ioport.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.20/arch/sparc/kernel/ioport.c linux-2.4.21/arch/sparc/kernel/ioport.c
@@ -221,19 +221,7 @@
pa += PAGE_SIZE;
}
- /*
- * XXX Playing with implementation details here.
- * On sparc64 Ebus has resources with precise boundaries.
- * We share drivers with sparc64. Too clever drivers use
- * start of a resource instead of a base address.
- *
- * XXX-2 This may be not valid anymore, clean when
- * interface to sbus_ioremap() is resolved.
- */
- res->start += offset;
- res->end = res->start + sz - 1; /* not strictly necessary.. */
-
- return (void *) res->start;
+ return (void *) (res->start + offset);
}
/*
@@ -244,7 +232,7 @@
unsigned long plen;
plen = res->end - res->start + 1;
- plen = (plen + PAGE_SIZE-1) & PAGE_MASK;
+ if ((plen & (PAGE_SIZE-1)) != 0) BUG();
while (plen != 0) {
plen -= PAGE_SIZE;
(*_sparc_unmapioaddr)(res->start + plen);
@@ -515,7 +503,7 @@
mmu_inval_dma_area(va, len_total);
#if 1
-/* P3 */ printk("pci_alloc_consistent: kva %lx uncva %lx phys %lx size %x\n",
+/* P3 */ printk("pci_alloc_consistent: kva %lx uncva %lx phys %lx size %lx\n",
(long)va, (long)res->start, (long)virt_to_phys(va), len_total);
#endif
{
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)