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

Commit 210cc679 authored by Kyle McMartin's avatar Kyle McMartin
Browse files

Auto-update from upstream

parents e0f99893 260b2367

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 14

EXTRAVERSION =-rc5

EXTRAVERSION =

NAME=Affluent Albatross



# *DOCUMENTATION*
@@ -334,7 +334,7 @@ KALLSYMS = scripts/kallsyms 
PERL		= perl

CHECK		= sparse



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ $(CF)

CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)

MODFLAGS	= -DMODULE

CFLAGS_MODULE   = $(MODFLAGS)

AFLAGS_MODULE   = $(MODFLAGS)

arch/alpha/kernel/pci-noop.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask) 


void *

dma_alloc_coherent(struct device *dev, size_t size,

		   dma_addr_t *dma_handle, int gfp)

		   dma_addr_t *dma_handle, gfp_t gfp)

{

	void *ret;

arch/alpha/kernel/pci_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp) 
{

	void *cpu_addr;

	long order = get_order(size);

	int gfp = GFP_ATOMIC;

	gfp_t gfp = GFP_ATOMIC;



try_again:

	cpu_addr = (void *)__get_free_pages(gfp, order);

arch/arm/mm/consistent.c

+4 −4
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static struct vm_region consistent_head = { 
};



static struct vm_region *

vm_region_alloc(struct vm_region *head, size_t size, int gfp)

vm_region_alloc(struct vm_region *head, size_t size, gfp_t gfp)

{

	unsigned long addr = head->vm_start, end = head->vm_end - size;

	unsigned long flags;
@@ -133,7 +133,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad 
#endif



static void *

__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp,

__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp,

	    pgprot_t prot)

{

	struct page *page;
@@ -251,7 +251,7 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp, 
 * virtual and bus address for that space.

 */

void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp)

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)

{

	return __dma_alloc(dev, size, handle, gfp,

			   pgprot_noncached(pgprot_kernel));
@@ -263,7 +263,7 @@ EXPORT_SYMBOL(dma_alloc_coherent); 
 * dma_alloc_coherent above.

 */

void *

dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, int gfp)

dma_alloc_writecombine(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)

{

	return __dma_alloc(dev, size, handle, gfp,

			   pgprot_writecombine(pgprot_kernel));

arch/frv/mb93090-mb00/pci-dma-nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct dma_alloc_record { 
static DEFINE_SPINLOCK(dma_alloc_lock);

static LIST_HEAD(dma_alloc_list);



void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp)

void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp)

{

	struct dma_alloc_record *new;

	struct list_head *this = &dma_alloc_list;