Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c183416 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: provide a bad_dma_address symbol for i386 



It's initially 0, since we don't expect any DMA there.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b48ee713

arch/x86/kernel/pci-dma_32.c

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#include <linux/module.h>

#include <asm/io.h>



/* For i386, we make it point to the NULL address */

dma_addr_t bad_dma_address __read_mostly = 0x0;

EXPORT_SYMBOL(bad_dma_address);



struct dma_coherent_mem {

	void		*virt_base;

	u32		device_base;

include/asm-x86/dma-mapping.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include <asm/io.h>

#include <asm/swiotlb.h>



extern dma_addr_t bad_dma_address;



struct dma_mapping_ops {

	int             (*mapping_error)(dma_addr_t dma_addr);

	void*           (*alloc_coherent)(struct device *dev, size_t size,

include/asm-x86/dma-mapping_64.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _X8664_DMA_MAPPING_H

#define _X8664_DMA_MAPPING_H 1



extern dma_addr_t bad_dma_address;

extern int iommu_merge;



static inline int dma_mapping_error(dma_addr_t dma_addr)