diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/parisc | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/parisc')
| -rw-r--r-- | drivers/parisc/ccio-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index a6b4a5a53d40..f511e70d454c 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
| @@ -650,7 +650,7 @@ ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt) | |||
| 650 | * Mark the I/O Pdir entries invalid and blow away the corresponding I/O | 650 | * Mark the I/O Pdir entries invalid and blow away the corresponding I/O |
| 651 | * TLB entries. | 651 | * TLB entries. |
| 652 | * | 652 | * |
| 653 | * FIXME: at some threshhold it might be "cheaper" to just blow | 653 | * FIXME: at some threshold it might be "cheaper" to just blow |
| 654 | * away the entire I/O TLB instead of individual entries. | 654 | * away the entire I/O TLB instead of individual entries. |
| 655 | * | 655 | * |
| 656 | * FIXME: Uturn has 256 TLB entries. We don't need to purge every | 656 | * FIXME: Uturn has 256 TLB entries. We don't need to purge every |