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

Commit 53f9fc93 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: remaining bits of arch/* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1ef64e67

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/ia64/sn/kernel/xpc.h

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ xpc_map_bte_errors(bte_result_t error) 




static inline void *

xpc_kmalloc_cacheline_aligned(size_t size, int flags, void **base)

xpc_kmalloc_cacheline_aligned(size_t size, gfp_t flags, void **base)

{

	/* see if kmalloc will give us cachline aligned memory by default */

	*base = kmalloc(size, flags);

arch/ppc/mm/pgtable.c

+2 −2
Original line number Diff line number Diff line
@@ -114,9 +114,9 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 
	struct page *ptepage;



#ifdef CONFIG_HIGHPTE

	int flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT;

	gfp_t flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT;

#else

	int flags = GFP_KERNEL | __GFP_REPEAT;

	gfp_t flags = GFP_KERNEL | __GFP_REPEAT;

#endif



	ptepage = alloc_pages(flags, 0);

arch/sparc64/solaris/socksys.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ IPPROTO_EGP, IPPROTO_PUP, IPPROTO_UDP, IPPROTO_IDP, IPPROTO_RAW, 


#else



extern void * mykmalloc(size_t s, int gfp);

extern void * mykmalloc(size_t s, gfp_t gfp);

extern void mykfree(void *);



#endif

arch/sparc64/solaris/timod.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static char * page = NULL ; 


#else



void * mykmalloc(size_t s, int gfp)

void * mykmalloc(size_t s, gfp_t gfp)

{

	static char * page;

	static size_t free;