diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 05:03:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-03 05:03:10 -0400 |
| commit | c222dce48cb2adf5ed68201fb2a59d00544b9a74 (patch) | |
| tree | 2c63efb72cd9c3337637d53a1aece56d62b8ea77 /lib | |
| parent | f6faac71d502be1c29c81b2f45657662c3b84470 (diff) | |
| parent | b0a5b83ee0fce9dbf8ff5fe1f8c9ae7dfafe458c (diff) | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 3b93129a968c..c9187fed0b93 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
| @@ -716,7 +716,7 @@ void dma_debug_init(u32 num_entries) | |||
| 716 | 716 | ||
| 717 | for (i = 0; i < HASH_SIZE; ++i) { | 717 | for (i = 0; i < HASH_SIZE; ++i) { |
| 718 | INIT_LIST_HEAD(&dma_entry_hash[i].list); | 718 | INIT_LIST_HEAD(&dma_entry_hash[i].list); |
| 719 | dma_entry_hash[i].lock = SPIN_LOCK_UNLOCKED; | 719 | spin_lock_init(&dma_entry_hash[i].lock); |
| 720 | } | 720 | } |
| 721 | 721 | ||
| 722 | if (dma_debug_fs_init() != 0) { | 722 | if (dma_debug_fs_init() != 0) { |
| @@ -862,7 +862,7 @@ static inline bool overlap(void *addr, u64 size, void *start, void *end) | |||
| 862 | 862 | ||
| 863 | return ((addr >= start && addr < end) || | 863 | return ((addr >= start && addr < end) || |
| 864 | (addr2 >= start && addr2 < end) || | 864 | (addr2 >= start && addr2 < end) || |
| 865 | ((addr < start) && (addr2 >= end))); | 865 | ((addr < start) && (addr2 > end))); |
| 866 | } | 866 | } |
| 867 | 867 | ||
| 868 | static void check_for_illegal_area(struct device *dev, void *addr, u64 size) | 868 | static void check_for_illegal_area(struct device *dev, void *addr, u64 size) |