git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Have x86_64 use add_active_range() and free_area_init_nodes
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
pci-gart.c
diff --git
a/arch/x86_64/kernel/pci-gart.c
b/arch/x86_64/kernel/pci-gart.c
index 6d3e61baf7a0159c015f4b439d88fe404dcb129a..16261a8a3303ed044fba4b31eb612a9f9c3454aa 100644
(file)
--- a/
arch/x86_64/kernel/pci-gart.c
+++ b/
arch/x86_64/kernel/pci-gart.c
@@
-239,8
+239,6
@@
dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir)
{
unsigned long phys_mem, bus;
- BUG_ON(dir == DMA_NONE);
-
if (!dev)
dev = &fallback_dev;
@@
-383,7
+381,6
@@
int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir)
unsigned long pages = 0;
int need = 0, nextneed;
- BUG_ON(dir == DMA_NONE);
if (nents == 0)
return 0;