The patch titled
FRV: move DMA macros to scatterlist.h for consistency.
has been removed from the -mm tree. Its filename was
frv-move-dma-macros-to-scatterlisth-for-consistency.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: FRV: move DMA macros to scatterlist.h for consistency.
From: "Robert P. J. Day" <[EMAIL PROTECTED]>
To be consistent with other architectures, these two DMA macros should
be defined in scatterlist.h as opposed to dma-mapping.h
Signed-off-by: Robert P. J. Day <[EMAIL PROTECTED]>
Acked-by: David Howells <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
include/asm-frv/dma-mapping.h | 10 ----------
include/asm-frv/scatterlist.h | 10 ++++++++++
2 files changed, 10 insertions(+), 10 deletions(-)
diff -puN
include/asm-frv/dma-mapping.h~frv-move-dma-macros-to-scatterlisth-for-consistency
include/asm-frv/dma-mapping.h
---
a/include/asm-frv/dma-mapping.h~frv-move-dma-macros-to-scatterlisth-for-consistency
+++ a/include/asm-frv/dma-mapping.h
@@ -17,16 +17,6 @@ void *dma_alloc_coherent(struct device *
void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle);
/*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg) ((sg)->dma_address)
-#define sg_dma_len(sg) ((sg)->length)
-
-/*
* Map a single buffer of the indicated size for DMA in streaming mode.
* The 32-bit bus address to use is returned.
*
diff -puN
include/asm-frv/scatterlist.h~frv-move-dma-macros-to-scatterlisth-for-consistency
include/asm-frv/scatterlist.h
---
a/include/asm-frv/scatterlist.h~frv-move-dma-macros-to-scatterlisth-for-consistency
+++ a/include/asm-frv/scatterlist.h
@@ -31,6 +31,16 @@ struct scatterlist {
unsigned int length;
};
+/*
+ * These macros should be used after a pci_map_sg call has been done
+ * to get bus addresses of each of the SG entries and their lengths.
+ * You should only work with the number of sg entries pci_map_sg
+ * returns, or alternatively stop on the first sg_dma_len(sg) which
+ * is 0.
+ */
+#define sg_dma_address(sg) ((sg)->dma_address)
+#define sg_dma_len(sg) ((sg)->length)
+
#define ISA_DMA_THRESHOLD (0xffffffffUL)
#endif /* !_ASM_SCATTERLIST_H */
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
git-hwmon.patch
git-xfs.patch
rd-use-is_power_of_2-in-drivers-block-rdc.patch
log2h-define-order_base_2-macro-for-convenience.patch
ncpfs-update-diagnostic-strings-to-match-routine-names.patch
hfs-update-comment-to-reflect-actual-init-and-exit-routines.patch
synclink-standardize-format-of-linux-header-file-includes-with.patch
remove-superfluous-checks-for-config_blk_dev_initrd-from-initramfsc.patch
rtc-s3c-use-is_power_of_2-macro-for-simplicity.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
