From: Andrew Morton <akpm@linux-foundation.org>

In file included from include/linux/dma-mapping.h:52,
                 from include/linux/dmaengine.h:29,
                 from include/linux/skbuff.h:29,
                 from include/linux/netlink.h:155,
                 from include/linux/genetlink.h:4,
                 from include/net/genetlink.h:4,
                 from include/linux/taskstats_kern.h:12,
                 from include/linux/delayacct.h:21,
                 from fs/proc/array.c:80:
include/asm/dma-mapping.h: In function 'dma_mapping_error':
include/asm/dma-mapping.h:78: warning: unused variable 'ops'

Cc: Andi Kleen <andi@firstfloor.org>
Cc: Avi Kivity <avi@qumranet.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-x86/dma-mapping.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN include/asm-x86/dma-mapping.h~dma-mapping-x86-per-device-dma_mapping_ops-support-fix include/asm-x86/dma-mapping.h
--- a/include/asm-x86/dma-mapping.h~dma-mapping-x86-per-device-dma_mapping_ops-support-fix
+++ a/include/asm-x86/dma-mapping.h
@@ -75,11 +75,10 @@ static inline struct dma_mapping_ops *ge
 /* Make sure we keep the same behaviour */
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
-	struct dma_mapping_ops *ops = get_dma_ops(dev);
-
 #ifdef CONFIG_X86_32
 	return 0;
 #else
+	struct dma_mapping_ops *ops = get_dma_ops(dev);
 	if (ops->mapping_error)
 		return ops->mapping_error(dev, dma_addr);
 
_