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

Commit 0c7965ff authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Thomas Gleixner
Browse files

x86: Deinline dma_alloc_attrs() 



Reduces kernel size by 68739 bytes on allyesconfig build:

    text     data      bss       dec     hex filename
82662736 22255384 20627456 125545576 77bac68 vmlinux0
82594029 22255352 20627456 125476837 77a9fe5 vmlinux1

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Don Dutile <ddutile@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/1428926075-28796-2-git-send-email-dvlasenk@redhat.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c07e5a54

arch/x86/include/asm/dma-mapping.h

+2 −26
Original line number Diff line number Diff line
@@ -127,33 +127,9 @@ static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp) 


#define dma_alloc_coherent(d,s,h,f)	dma_alloc_attrs(d,s,h,f,NULL)



static inline void *

void *

dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t gfp, struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *memory;



	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);



	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))

		return memory;



	if (!dev)

		dev = &x86_dma_fallback_dev;



	if (!is_device_dma_capable(dev))

		return NULL;



	if (!ops->alloc)

		return NULL;



	memory = ops->alloc(dev, size, dma_handle,

			    dma_alloc_coherent_gfp_flags(dev, gfp), attrs);

	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);



	return memory;

}

		gfp_t gfp, struct dma_attrs *attrs);



#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)

arch/x86/kernel/pci-dma.c

+28 −0
Original line number Diff line number Diff line
@@ -140,6 +140,34 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, 
		free_pages((unsigned long)vaddr, get_order(size));

}



void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,

		      gfp_t gfp, struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *memory;



	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);



	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))

		return memory;



	if (!dev)

		dev = &x86_dma_fallback_dev;



	if (!is_device_dma_capable(dev))

		return NULL;



	if (!ops->alloc)

		return NULL;



	memory = ops->alloc(dev, size, dma_handle,

			    dma_alloc_coherent_gfp_flags(dev, gfp), attrs);

	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);



	return memory;

}

EXPORT_SYMBOL(dma_alloc_attrs);



/*

 * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel

 * parameter documentation.