The patch titled
     sparc64: add missing dma_get_cache_alignment()
has been added to the -mm tree.  Its filename is
     sparc64-add-missing-dma_get_cache_alignment.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: sparc64: add missing dma_get_cache_alignment()
From: Andrew Morton <[EMAIL PROTECTED]>

drivers/infiniband/hw/mthca/mthca_main.c: In function `mthca_init_icm':
drivers/infiniband/hw/mthca/mthca_main.c:468: error: implicit declaration of 
function `dma_get_cache_alignment'

Pinch the one from asm-generic/dma-mapping.h

Cc: "David S. Miller" <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/asm-sparc64/dma-mapping.h |    7 +++++++
 1 file changed, 7 insertions(+)

diff -puN 
include/asm-sparc64/dma-mapping.h~sparc64-add-missing-dma_get_cache_alignment 
include/asm-sparc64/dma-mapping.h
--- 
a/include/asm-sparc64/dma-mapping.h~sparc64-add-missing-dma_get_cache_alignment
+++ a/include/asm-sparc64/dma-mapping.h
@@ -127,6 +127,13 @@ static inline int dma_mapping_error(dma_
        return (dma_addr == DMA_ERROR_CODE);
 }
 
+static inline int dma_get_cache_alignment(void)
+{
+       /* no easy way to get cache size on all processors, so return
+        * the maximum possible, to be safe */
+       return (1 << INTERNODE_CACHE_SHIFT);
+}
+
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 #define dma_is_consistent(d, h)        (1)
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
parport_pc-locking-fix.patch
revert-x86-serial-convert-legacy-com-ports-to-platform-devices.patch
kdebugh-forward-declare-struct-struct-notifier_block.patch
fs-9p-convc-error-path-fix.patch
ip2main-warning-fix.patch
sparc64-add-missing-dma_get_cache_alignment.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

Reply via email to