diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-13 16:23:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-13 16:23:16 -0400 |
commit | 679bea5e438df70b5d4348fd2da4501aaeacebe0 (patch) | |
tree | 476c87af4c16b665d0f6bd8c3067f10b47507746 /arch/sparc/mm | |
parent | f613914efcc566245cd605bde6943fb5c2cd4ba3 (diff) |
sparc: Kill mmu_{un,}lockarea().
These were used on sun4c during floppy data transfers since on that
chip we had to lock the cpu mappings into the TLB because we cannot
take a TLB miss during the assembler floppy interrupt handler that
does the data transfer.
That is no longer necessary since we've removed sun4c support, thus
this stuff can disappear completely.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
-rw-r--r-- | arch/sparc/mm/io-unit.c | 14 | ||||
-rw-r--r-- | arch/sparc/mm/iommu.c | 11 |
2 files changed, 0 insertions, 25 deletions
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index fc58c3e917df..d175c0ae5e4d 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
@@ -242,22 +242,8 @@ static void iounit_unmap_dma_area(struct device *dev, unsigned long addr, int le | |||
242 | } | 242 | } |
243 | #endif | 243 | #endif |
244 | 244 | ||
245 | static char *iounit_lockarea(char *vaddr, unsigned long len) | ||
246 | { | ||
247 | /* FIXME: Write this */ | ||
248 | return vaddr; | ||
249 | } | ||
250 | |||
251 | static void iounit_unlockarea(char *vaddr, unsigned long len) | ||
252 | { | ||
253 | /* FIXME: Write this */ | ||
254 | } | ||
255 | |||
256 | void __init ld_mmu_iounit(void) | 245 | void __init ld_mmu_iounit(void) |
257 | { | 246 | { |
258 | BTFIXUPSET_CALL(mmu_lockarea, iounit_lockarea, BTFIXUPCALL_RETO0); | ||
259 | BTFIXUPSET_CALL(mmu_unlockarea, iounit_unlockarea, BTFIXUPCALL_NOP); | ||
260 | |||
261 | BTFIXUPSET_CALL(mmu_get_scsi_one, iounit_get_scsi_one, BTFIXUPCALL_NORM); | 247 | BTFIXUPSET_CALL(mmu_get_scsi_one, iounit_get_scsi_one, BTFIXUPCALL_NORM); |
262 | BTFIXUPSET_CALL(mmu_get_scsi_sgl, iounit_get_scsi_sgl, BTFIXUPCALL_NORM); | 248 | BTFIXUPSET_CALL(mmu_get_scsi_sgl, iounit_get_scsi_sgl, BTFIXUPCALL_NORM); |
263 | BTFIXUPSET_CALL(mmu_release_scsi_one, iounit_release_scsi_one, BTFIXUPCALL_NORM); | 249 | BTFIXUPSET_CALL(mmu_release_scsi_one, iounit_release_scsi_one, BTFIXUPCALL_NORM); |
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index 07fc6a65d9b6..349ba83f1789 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c | |||
@@ -426,20 +426,9 @@ static void iommu_unmap_dma_area(struct device *dev, unsigned long busa, int len | |||
426 | } | 426 | } |
427 | #endif | 427 | #endif |
428 | 428 | ||
429 | static char *iommu_lockarea(char *vaddr, unsigned long len) | ||
430 | { | ||
431 | return vaddr; | ||
432 | } | ||
433 | |||
434 | static void iommu_unlockarea(char *vaddr, unsigned long len) | ||
435 | { | ||
436 | } | ||
437 | |||
438 | void __init ld_mmu_iommu(void) | 429 | void __init ld_mmu_iommu(void) |
439 | { | 430 | { |
440 | viking_flush = (BTFIXUPVAL_CALL(flush_page_for_dma) == (unsigned long)viking_flush_page); | 431 | viking_flush = (BTFIXUPVAL_CALL(flush_page_for_dma) == (unsigned long)viking_flush_page); |
441 | BTFIXUPSET_CALL(mmu_lockarea, iommu_lockarea, BTFIXUPCALL_RETO0); | ||
442 | BTFIXUPSET_CALL(mmu_unlockarea, iommu_unlockarea, BTFIXUPCALL_NOP); | ||
443 | 432 | ||
444 | if (!BTFIXUPVAL_CALL(flush_page_for_dma)) { | 433 | if (!BTFIXUPVAL_CALL(flush_page_for_dma)) { |
445 | /* IO coherent chip */ | 434 | /* IO coherent chip */ |