evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dma-debug/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/urgent

Browse source
This commit is contained in:
Ingo Molnar 2009-07-03 11:03:10 +02:00
commit c222dce48c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/dma-debug.c
View file

@ -716,7 +716,7 @@ void dma_debug_init(u32 num_entries)
for (i = 0; i < HASH_SIZE; ++i) { for (i = 0; i < HASH_SIZE; ++i) {
INIT_LIST_HEAD(&dma_entry_hash[i].list); INIT_LIST_HEAD(&dma_entry_hash[i].list);
dma_entry_hash[i].lock = SPIN_LOCK_UNLOCKED; spin_lock_init(&dma_entry_hash[i].lock);
} }
if (dma_debug_fs_init() != 0) { if (dma_debug_fs_init() != 0) {
@ -862,7 +862,7 @@ static inline bool overlap(void *addr, u64 size, void *start, void *end)
return ((addr >= start && addr < end) || return ((addr >= start && addr < end) ||
(addr2 >= start && addr2 < end) || (addr2 >= start && addr2 < end) ||
((addr < start) && (addr2 >= end))); ((addr < start) && (addr2 > end)));
} }
static void check_for_illegal_area(struct device *dev, void *addr, u64 size) static void check_for_illegal_area(struct device *dev, void *addr, u64 size)