git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rcu: make dead code really dead
[safe/jmp/linux-2.6]
/
lib
/
swiotlb.c
diff --git
a/lib/swiotlb.c
b/lib/swiotlb.c
index
e6755a0
..
5fddf72
100644
(file)
--- a/
lib/swiotlb.c
+++ b/
lib/swiotlb.c
@@
-28,6
+28,7
@@
#include <linux/types.h>
#include <linux/ctype.h>
#include <linux/highmem.h>
#include <linux/types.h>
#include <linux/ctype.h>
#include <linux/highmem.h>
+#include <linux/gfp.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/io.h>
#include <asm/dma.h>
@@
-109,10
+110,9
@@
setup_io_tlb_npages(char *str)
}
if (*str == ',')
++str;
}
if (*str == ',')
++str;
- if (!strcmp(str, "force"))
{
+ if (!strcmp(str, "force"))
swiotlb_force = 1;
swiotlb_force = 1;
- swiotlb = 1;
- }
+
return 1;
}
__setup("swiotlb=", setup_io_tlb_npages);
return 1;
}
__setup("swiotlb=", setup_io_tlb_npages);
@@
-486,7
+486,7
@@
do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
/*
* Return the buffer to the free list by setting the corresponding
/*
* Return the buffer to the free list by setting the corresponding
- * entries to indicate the number of contigous entries available.
+ * entries to indicate the number of contig
u
ous entries available.
* While returning the entries to the free list, we merge the entries
* with slots below and above the pool being returned.
*/
* While returning the entries to the free list, we merge the entries
* with slots below and above the pool being returned.
*/
@@
-550,7
+550,7
@@
swiotlb_alloc_coherent(struct device *hwdev, size_t size,
dma_mask = hwdev->coherent_dma_mask;
ret = (void *)__get_free_pages(flags, order);
dma_mask = hwdev->coherent_dma_mask;
ret = (void *)__get_free_pages(flags, order);
- if (ret && swiotlb_virt_to_bus(hwdev, ret) + size > dma_mask) {
+ if (ret && swiotlb_virt_to_bus(hwdev, ret) + size
- 1
> dma_mask) {
/*
* The allocated memory isn't reachable by the device.
*/
/*
* The allocated memory isn't reachable by the device.
*/
@@
-572,7
+572,7
@@
swiotlb_alloc_coherent(struct device *hwdev, size_t size,
dev_addr = swiotlb_virt_to_bus(hwdev, ret);
/* Confirm address can be DMA'd by device */
dev_addr = swiotlb_virt_to_bus(hwdev, ret);
/* Confirm address can be DMA'd by device */
- if (dev_addr + size > dma_mask) {
+ if (dev_addr + size
- 1
> dma_mask) {
printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
(unsigned long long)dma_mask,
(unsigned long long)dev_addr);
printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
(unsigned long long)dma_mask,
(unsigned long long)dev_addr);