aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-07-03 11:03:10 +0200
committerIngo Molnar <mingo@elte.hu>2009-07-03 11:03:10 +0200
commitc222dce48cb2adf5ed68201fb2a59d00544b9a74 (patch)
tree2c63efb72cd9c3337637d53a1aece56d62b8ea77 /lib
parentf6faac71d502be1c29c81b2f45657662c3b84470 (diff)
parentb0a5b83ee0fce9dbf8ff5fe1f8c9ae7dfafe458c (diff)
downloadvexpress-lsk-c222dce48cb2adf5ed68201fb2a59d00544b9a74.tar.gz
Merge branch 'dma-debug/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/urgent
Diffstat (limited to 'lib')
-rw-r--r--lib/dma-debug.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 3b93129a968..c9187fed0b9 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -716,7 +716,7 @@ void dma_debug_init(u32 num_entries)
for (i = 0; i < HASH_SIZE; ++i) {
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) {
@@ -862,7 +862,7 @@ static inline bool overlap(void *addr, u64 size, void *start, void *end)
return ((addr >= start && addr < 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)