diff for duplicates of <20060510000211.GI22385@us.ibm.com> diff --git a/a/1.txt b/N1/1.txt index f234c98..60b68a2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -184,9 +184,9 @@ diff -r c3a828849dd4 -r ae6b9f9e155e lib/swiotlb.c + "device %s\n", size, dev ? dev->bus_id : "?"); + + if (size > io_tlb_overflow && do_panic) { -+ if (dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL) ++ if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) + panic("DMA: Memory would be corrupted\n"); -+ if (dir = DMA_TO_DEVICE || dir = DMA_BIDIRECTIONAL) ++ if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) + panic("DMA: Random memory would be DMAed\n"); + } +} @@ -260,10 +260,10 @@ diff -r c3a828849dd4 -r ae6b9f9e155e lib/swiotlb.c - found: + index = find_next_zero_string(io_tlb_list, io_tlb_index, + io_tlb_nslabs, nslots); -+ if (index = ~0U) { ++ if (index == ~0U) { + index = find_next_zero_string(io_tlb_list, 0, + io_tlb_nslabs, nslots); -+ if (index = ~0U) ++ if (index == ~0U) + return NULL; + } + @@ -350,9 +350,9 @@ diff -r c3a828849dd4 -r ae6b9f9e155e lib/swiotlb.c - "device %s\n", size, dev ? dev->bus_id : "?"); - - if (size > io_tlb_overflow && do_panic) { -- if (dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL) +- if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) - panic("DMA: Memory would be corrupted\n"); -- if (dir = DMA_TO_DEVICE || dir = DMA_BIDIRECTIONAL) +- if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL) - panic("DMA: Random memory would be DMAed\n"); - } } @@ -375,7 +375,7 @@ diff -r c3a828849dd4 -r ae6b9f9e155e arch/ia64/lib/bitstr.c + + again: + n = find_next_zero_bit(bitmap, nbits, start); -+ if (n = -1) ++ if (n == -1) + return -1; + + /* could test bitsliced, but it's hardly worth it */ diff --git a/a/content_digest b/N1/content_digest index 94f4d05..06077e6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Jon Mason <jdmason@us.ibm.com>\0" "Subject\0[PATCH 5/5] swiotlb: replace free array with bitmap\0" - "Date\0Wed, 10 May 2006 00:02:11 +0000\0" + "Date\0Tue, 9 May 2006 19:02:11 -0500\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0ak@suse.de" Luck @@ -195,9 +195,9 @@ "+\t \"device %s\\n\", size, dev ? dev->bus_id : \"?\");\n" "+\n" "+\tif (size > io_tlb_overflow && do_panic) {\n" - "+\t\tif (dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL)\n" + "+\t\tif (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)\n" "+\t\t\tpanic(\"DMA: Memory would be corrupted\\n\");\n" - "+\t\tif (dir = DMA_TO_DEVICE || dir = DMA_BIDIRECTIONAL)\n" + "+\t\tif (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)\n" "+\t\t\tpanic(\"DMA: Random memory would be DMAed\\n\");\n" "+\t}\n" "+}\n" @@ -271,10 +271,10 @@ "- found:\n" "+\t\tindex = find_next_zero_string(io_tlb_list, io_tlb_index,\n" "+\t\t\t\tio_tlb_nslabs, nslots);\n" - "+\t\tif (index = ~0U) {\n" + "+\t\tif (index == ~0U) {\n" "+\t\t\tindex = find_next_zero_string(io_tlb_list, 0,\n" "+\t\t\t\t\tio_tlb_nslabs, nslots);\n" - "+\t\t\tif (index = ~0U)\n" + "+\t\t\tif (index == ~0U)\n" "+\t\t\t\treturn NULL;\n" "+\t\t}\n" "+\n" @@ -361,9 +361,9 @@ "-\t \"device %s\\n\", size, dev ? dev->bus_id : \"?\");\n" "-\n" "-\tif (size > io_tlb_overflow && do_panic) {\n" - "-\t\tif (dir = DMA_FROM_DEVICE || dir = DMA_BIDIRECTIONAL)\n" + "-\t\tif (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)\n" "-\t\t\tpanic(\"DMA: Memory would be corrupted\\n\");\n" - "-\t\tif (dir = DMA_TO_DEVICE || dir = DMA_BIDIRECTIONAL)\n" + "-\t\tif (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)\n" "-\t\t\tpanic(\"DMA: Random memory would be DMAed\\n\");\n" "-\t}\n" " }\n" @@ -386,7 +386,7 @@ "+\n" "+ again:\n" "+\tn = find_next_zero_bit(bitmap, nbits, start);\n" - "+\tif (n = -1) \n" + "+\tif (n == -1) \n" "+\t\treturn -1;\n" "+\n" "+\t/* could test bitsliced, but it's hardly worth it */\n" @@ -404,4 +404,4 @@ "+\n" +EXPORT_SYMBOL(find_next_zero_string); -6fc3d74a5c1771bbdd2842aae606c5c8fb377b6bc6754e08c8e13df7096a7f72 +1a30d571b3b523bbbfe894a128ce8760beb0458ee6d38c524169b77436b6b942
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.