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

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

x86: Deinline dma_free_attrs() 



Reduces kernel size by 76720 bytes on allyesconfig build:

    text     data      bss       dec     hex filename
82594029 22255352 20627456 125476837 77a9fe5 vmlinux1
82517277 22255384 20627456 125400117 7797435 vmlinux2

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-3-git-send-email-dvlasenk@redhat.com


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

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

+3 −15
Original line number Diff line number Diff line
@@ -133,20 +133,8 @@ dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, 


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



static inline void dma_free_attrs(struct device *dev, size_t size,

void dma_free_attrs(struct device *dev, size_t size,

		    void *vaddr, dma_addr_t bus,

				  struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	WARN_ON(irqs_disabled());       /* for portability */



	if (dma_release_from_coherent(dev, get_order(size), vaddr))

		return;



	debug_dma_free_coherent(dev, size, vaddr, bus);

	if (ops->free)

		ops->free(dev, size, vaddr, bus, attrs);

}

		    struct dma_attrs *attrs);



#endif

arch/x86/kernel/pci-dma.c

+17 −0
Original line number Diff line number Diff line
@@ -168,6 +168,23 @@ void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, 
}

EXPORT_SYMBOL(dma_alloc_attrs);



void dma_free_attrs(struct device *dev, size_t size,

		    void *vaddr, dma_addr_t bus,

		    struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);



	WARN_ON(irqs_disabled());       /* for portability */



	if (dma_release_from_coherent(dev, get_order(size), vaddr))

		return;



	debug_dma_free_coherent(dev, size, vaddr, bus);

	if (ops->free)

		ops->free(dev, size, vaddr, bus, attrs);

}

EXPORT_SYMBOL(dma_free_attrs);



/*

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

 * parameter documentation.