Auto-update from upstream
This commit is contained in:
Kyle McMartin
Коммит
210cc679fa
4
Makefile
4
Makefile
|
|
@ -1,7 +1,7 @@
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <linux/highmem.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
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)
|
||||
{
|
||||
void *ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ static int map_page(unsigned long va, unsigned long pa, pgprot_t prot)
|
|||
* portions of the kernel with single large page TLB entries, and
|
||||
* still get unique uncached pages for consistent DMA.
|
||||
*/
|
||||
void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle)
|
||||
void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle)
|
||||
{
|
||||
struct vm_struct *area;
|
||||
unsigned long page, va, pa;
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ hwsw_init (void)
|
|||
}
|
||||
|
||||
void *
|
||||
hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags)
|
||||
hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)
|
||||
{
|
||||
if (use_swiotlb(dev))
|
||||
return swiotlb_alloc_coherent(dev, size, dma_handle, flags);
|
||||
|
|
|
|||
|
|
@ -1076,7 +1076,7 @@ void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir)
|
|||
* See Documentation/DMA-mapping.txt
|
||||
*/
|
||||
void *
|
||||
sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags)
|
||||
sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)
|
||||
{
|
||||
struct ioc *ioc;
|
||||
void *addr;
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
|
|||
|
||||
void *
|
||||
swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
||||
dma_addr_t *dma_handle, int flags)
|
||||
dma_addr_t *dma_handle, gfp_t flags)
|
||||
{
|
||||
unsigned long dev_addr;
|
||||
void *ret;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ EXPORT_SYMBOL(sn_dma_set_mask);
|
|||
* more information.
|
||||
*/
|
||||
void *sn_dma_alloc_coherent(struct device *dev, size_t size,
|
||||
dma_addr_t * dma_handle, int flags)
|
||||
dma_addr_t * dma_handle, gfp_t flags)
|
||||
{
|
||||
void *cpuaddr;
|
||||
unsigned long phys_addr;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <asm/io.h>
|
||||
|
||||
void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
||||
dma_addr_t * dma_handle, int gfp)
|
||||
dma_addr_t * dma_handle, gfp_t gfp)
|
||||
{
|
||||
void *ret;
|
||||
/* ignore region specifiers */
|
||||
|
|
@ -39,7 +39,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
|||
EXPORT_SYMBOL(dma_alloc_noncoherent);
|
||||
|
||||
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)
|
||||
__attribute__((alias("dma_alloc_noncoherent")));
|
||||
|
||||
EXPORT_SYMBOL(dma_alloc_coherent);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
pdev_to_baddr(to_pci_dev(dev), (addr))
|
||||
|
||||
void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
||||
dma_addr_t * dma_handle, int gfp)
|
||||
dma_addr_t * dma_handle, gfp_t gfp)
|
||||
{
|
||||
void *ret;
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
|||
EXPORT_SYMBOL(dma_alloc_noncoherent);
|
||||
|
||||
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)
|
||||
__attribute__((alias("dma_alloc_noncoherent")));
|
||||
|
||||
EXPORT_SYMBOL(dma_alloc_coherent);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#define RAM_OFFSET_MASK 0x3fffffff
|
||||
|
||||
void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
||||
dma_addr_t * dma_handle, int gfp)
|
||||
dma_addr_t * dma_handle, gfp_t gfp)
|
||||
{
|
||||
void *ret;
|
||||
/* ignore region specifiers */
|
||||
|
|
@ -61,7 +61,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
|||
EXPORT_SYMBOL(dma_alloc_noncoherent);
|
||||
|
||||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
*/
|
||||
|
||||
void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
||||
dma_addr_t * dma_handle, int gfp)
|
||||
dma_addr_t * dma_handle, gfp_t gfp)
|
||||
{
|
||||
void *ret;
|
||||
/* ignore region specifiers */
|
||||
|
|
@ -45,7 +45,7 @@ void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
|||
EXPORT_SYMBOL(dma_alloc_noncoherent);
|
||||
|
||||
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;
|
||||
|
||||
|
|
|
|||
|
|
@ -359,7 +359,7 @@ pcxl_dma_init(void)
|
|||
|
||||
__initcall(pcxl_dma_init);
|
||||
|
||||
static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flag)
|
||||
static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
|
||||
{
|
||||
unsigned long vaddr;
|
||||
unsigned long paddr;
|
||||
|
|
@ -512,13 +512,13 @@ struct hppa_dma_ops pcxl_dma_ops = {
|
|||
};
|
||||
|
||||
static void *fail_alloc_consistent(struct device *dev, size_t size,
|
||||
dma_addr_t *dma_handle, int flag)
|
||||
dma_addr_t *dma_handle, gfp_t flag)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size,
|
||||
dma_addr_t *dma_handle, int flag)
|
||||
dma_addr_t *dma_handle, gfp_t flag)
|
||||
{
|
||||
void *addr = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ typedef struct {
|
|||
const char *name2;
|
||||
void (*open)(void);
|
||||
void (*release)(void);
|
||||
void *(*dma_alloc)(unsigned int, int);
|
||||
void *(*dma_alloc)(unsigned int, gfp_t);
|
||||
void (*dma_free)(void *, unsigned int);
|
||||
int (*irqinit)(void);
|
||||
#ifdef MODULE
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ struct cs_sound_settings {
|
|||
|
||||
static struct cs_sound_settings sound;
|
||||
|
||||
static void *CS_Alloc(unsigned int size, int flags);
|
||||
static void *CS_Alloc(unsigned int size, gfp_t flags);
|
||||
static void CS_Free(void *ptr, unsigned int size);
|
||||
static int CS_IrqInit(void);
|
||||
#ifdef MODULE
|
||||
|
|
@ -959,7 +959,7 @@ static TRANS transCSNormalRead = {
|
|||
|
||||
/*** Low level stuff *********************************************************/
|
||||
|
||||
static void *CS_Alloc(unsigned int size, int flags)
|
||||
static void *CS_Alloc(unsigned int size, gfp_t flags)
|
||||
{
|
||||
int order;
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,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;
|
||||
|
|
@ -173,7 +173,7 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad
|
|||
* virtual and bus address for that space.
|
||||
*/
|
||||
void *
|
||||
__dma_alloc_coherent(size_t size, dma_addr_t *handle, int gfp)
|
||||
__dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
|
||||
{
|
||||
struct page *page;
|
||||
struct vm_region *c;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ extern void init_rts7751r2d_IRQ(void);
|
|||
extern void *rts7751r2d_ioremap(unsigned long, unsigned long);
|
||||
extern int rts7751r2d_irq_demux(int irq);
|
||||
|
||||
extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, int);
|
||||
extern void *voyagergx_consistent_alloc(struct device *, size_t, dma_addr_t *, gfp_t);
|
||||
extern int voyagergx_consistent_free(struct device *, size_t, void *, dma_addr_t);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ static LIST_HEAD(voya_alloc_list);
|
|||
#define OHCI_SRAM_SIZE 0x10000
|
||||
|
||||
void *voyagergx_consistent_alloc(struct device *dev, size_t size,
|
||||
dma_addr_t *handle, int flag)
|
||||
dma_addr_t *handle, gfp_t flag)
|
||||
{
|
||||
struct list_head *list = &voya_alloc_list;
|
||||
struct voya_alloc_entry *entry;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
static int gapspci_dma_used = 0;
|
||||
|
||||
void *dreamcast_consistent_alloc(struct device *dev, size_t size,
|
||||
dma_addr_t *dma_handle, int flag)
|
||||
dma_addr_t *dma_handle, gfp_t flag)
|
||||
{
|
||||
unsigned long buf;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include <linux/dma-mapping.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle)
|
||||
void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
|
||||
{
|
||||
struct page *page, *end, *free;
|
||||
void *ret;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ void paging_init(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
struct page *arch_validate(struct page *page, int mask, int order)
|
||||
struct page *arch_validate(struct page *page, gfp_t mask, int order)
|
||||
{
|
||||
unsigned long addr, zero = 0;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ void free_stack(unsigned long stack, int order)
|
|||
unsigned long alloc_stack(int order, int atomic)
|
||||
{
|
||||
unsigned long page;
|
||||
int flags = GFP_KERNEL;
|
||||
gfp_t flags = GFP_KERNEL;
|
||||
|
||||
if (atomic)
|
||||
flags = GFP_ATOMIC;
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ static void flush_gart(struct device *dev)
|
|||
|
||||
/* Allocate DMA memory on node near device */
|
||||
noinline
|
||||
static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)
|
||||
static void *dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
|
||||
{
|
||||
struct page *page;
|
||||
int node;
|
||||
|
|
@ -204,7 +204,7 @@ static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)
|
|||
*/
|
||||
void *
|
||||
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
||||
unsigned gfp)
|
||||
gfp_t gfp)
|
||||
{
|
||||
void *memory;
|
||||
unsigned long dma_mask = 0;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ EXPORT_SYMBOL(iommu_sac_force);
|
|||
*/
|
||||
|
||||
void *dma_alloc_coherent(struct device *hwdev, size_t size,
|
||||
dma_addr_t *dma_handle, unsigned gfp)
|
||||
dma_addr_t *dma_handle, gfp_t gfp)
|
||||
{
|
||||
void *ret;
|
||||
u64 mask;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
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)
|
||||
{
|
||||
void *ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -1807,7 +1807,7 @@ static void as_put_request(request_queue_t *q, struct request *rq)
|
|||
}
|
||||
|
||||
static int as_set_request(request_queue_t *q, struct request *rq,
|
||||
struct bio *bio, int gfp_mask)
|
||||
struct bio *bio, gfp_t gfp_mask)
|
||||
{
|
||||
struct as_data *ad = q->elevator->elevator_data;
|
||||
struct as_rq *arq = mempool_alloc(ad->arq_pool, gfp_mask);
|
||||
|
|
|
|||
|
|
@ -1422,7 +1422,7 @@ static void cfq_exit_io_context(struct cfq_io_context *cic)
|
|||
}
|
||||
|
||||
static struct cfq_io_context *
|
||||
cfq_alloc_io_context(struct cfq_data *cfqd, int gfp_mask)
|
||||
cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
|
||||
{
|
||||
struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask);
|
||||
|
||||
|
|
@ -1517,7 +1517,7 @@ static int cfq_ioc_set_ioprio(struct io_context *ioc, unsigned int ioprio)
|
|||
|
||||
static struct cfq_queue *
|
||||
cfq_get_queue(struct cfq_data *cfqd, unsigned int key, unsigned short ioprio,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
const int hashval = hash_long(key, CFQ_QHASH_SHIFT);
|
||||
struct cfq_queue *cfqq, *new_cfqq = NULL;
|
||||
|
|
@ -1578,7 +1578,7 @@ out:
|
|||
* cfqq, so we don't need to worry about it disappearing
|
||||
*/
|
||||
static struct cfq_io_context *
|
||||
cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, int gfp_mask)
|
||||
cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, gfp_t gfp_mask)
|
||||
{
|
||||
struct io_context *ioc = NULL;
|
||||
struct cfq_io_context *cic;
|
||||
|
|
@ -2075,7 +2075,7 @@ static void cfq_put_request(request_queue_t *q, struct request *rq)
|
|||
*/
|
||||
static int
|
||||
cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct cfq_data *cfqd = q->elevator->elevator_data;
|
||||
struct task_struct *tsk = current;
|
||||
|
|
|
|||
|
|
@ -756,7 +756,7 @@ static void deadline_put_request(request_queue_t *q, struct request *rq)
|
|||
|
||||
static int
|
||||
deadline_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct deadline_data *dd = q->elevator->elevator_data;
|
||||
struct deadline_rq *drq;
|
||||
|
|
|
|||
|
|
@ -487,7 +487,7 @@ struct request *elv_former_request(request_queue_t *q, struct request *rq)
|
|||
}
|
||||
|
||||
int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
elevator_t *e = q->elevator;
|
||||
|
||||
|
|
|
|||
|
|
@ -1652,13 +1652,13 @@ static int blk_init_free_list(request_queue_t *q)
|
|||
|
||||
static int __make_request(request_queue_t *, struct bio *);
|
||||
|
||||
request_queue_t *blk_alloc_queue(int gfp_mask)
|
||||
request_queue_t *blk_alloc_queue(gfp_t gfp_mask)
|
||||
{
|
||||
return blk_alloc_queue_node(gfp_mask, -1);
|
||||
}
|
||||
EXPORT_SYMBOL(blk_alloc_queue);
|
||||
|
||||
request_queue_t *blk_alloc_queue_node(int gfp_mask, int node_id)
|
||||
request_queue_t *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
|
||||
{
|
||||
request_queue_t *q;
|
||||
|
||||
|
|
@ -1787,7 +1787,7 @@ static inline void blk_free_request(request_queue_t *q, struct request *rq)
|
|||
}
|
||||
|
||||
static inline struct request *
|
||||
blk_alloc_request(request_queue_t *q, int rw, struct bio *bio, int gfp_mask)
|
||||
blk_alloc_request(request_queue_t *q, int rw, struct bio *bio, gfp_t gfp_mask)
|
||||
{
|
||||
struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask);
|
||||
|
||||
|
|
@ -1885,7 +1885,7 @@ static void freed_request(request_queue_t *q, int rw)
|
|||
* Returns !NULL on success, with queue_lock *not held*.
|
||||
*/
|
||||
static struct request *get_request(request_queue_t *q, int rw, struct bio *bio,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct request *rq = NULL;
|
||||
struct request_list *rl = &q->rq;
|
||||
|
|
@ -2019,7 +2019,7 @@ static struct request *get_request_wait(request_queue_t *q, int rw,
|
|||
return rq;
|
||||
}
|
||||
|
||||
struct request *blk_get_request(request_queue_t *q, int rw, int gfp_mask)
|
||||
struct request *blk_get_request(request_queue_t *q, int rw, gfp_t gfp_mask)
|
||||
{
|
||||
struct request *rq;
|
||||
|
||||
|
|
@ -2251,7 +2251,7 @@ EXPORT_SYMBOL(blk_rq_unmap_user);
|
|||
* @gfp_mask: memory allocation flags
|
||||
*/
|
||||
int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
|
||||
unsigned int len, unsigned int gfp_mask)
|
||||
unsigned int len, gfp_t gfp_mask)
|
||||
{
|
||||
struct bio *bio;
|
||||
|
||||
|
|
@ -3393,7 +3393,7 @@ void exit_io_context(void)
|
|||
* but since the current task itself holds a reference, the context can be
|
||||
* used in general code, so long as it stays within `current` context.
|
||||
*/
|
||||
struct io_context *current_io_context(int gfp_flags)
|
||||
struct io_context *current_io_context(gfp_t gfp_flags)
|
||||
{
|
||||
struct task_struct *tsk = current;
|
||||
struct io_context *ret;
|
||||
|
|
@ -3424,7 +3424,7 @@ EXPORT_SYMBOL(current_io_context);
|
|||
*
|
||||
* This is always called in the context of the task which submitted the I/O.
|
||||
*/
|
||||
struct io_context *get_io_context(int gfp_flags)
|
||||
struct io_context *get_io_context(gfp_t gfp_flags)
|
||||
{
|
||||
struct io_context *ret;
|
||||
ret = current_io_context(gfp_flags);
|
||||
|
|
|
|||
|
|
@ -881,7 +881,7 @@ loop_init_xfer(struct loop_device *lo, struct loop_func_table *xfer,
|
|||
static int loop_clr_fd(struct loop_device *lo, struct block_device *bdev)
|
||||
{
|
||||
struct file *filp = lo->lo_backing_file;
|
||||
int gfp = lo->old_gfp_mask;
|
||||
gfp_t gfp = lo->old_gfp_mask;
|
||||
|
||||
if (lo->lo_state != Lo_bound)
|
||||
return -ENXIO;
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ static int rd_open(struct inode *inode, struct file *filp)
|
|||
struct block_device *bdev = inode->i_bdev;
|
||||
struct address_space *mapping;
|
||||
unsigned bsize;
|
||||
int gfp_mask;
|
||||
gfp_t gfp_mask;
|
||||
|
||||
inode = igrab(bdev->bd_inode);
|
||||
rd_bdev[unit] = bdev;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
static inline unsigned char *alloc_buf(void)
|
||||
{
|
||||
unsigned int prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
|
||||
gfp_t prio = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
|
||||
|
||||
if (PAGE_SIZE != N_TTY_BUF_SIZE)
|
||||
return kmalloc(N_TTY_BUF_SIZE, prio);
|
||||
|
|
|
|||
|
|
@ -315,9 +315,9 @@ static void dbs_check_cpu(int cpu)
|
|||
policy = this_dbs_info->cur_policy;
|
||||
|
||||
if ( init_flag == 0 ) {
|
||||
for ( /* NULL */; init_flag < NR_CPUS; init_flag++ ) {
|
||||
dbs_info = &per_cpu(cpu_dbs_info, init_flag);
|
||||
requested_freq[cpu] = dbs_info->cur_policy->cur;
|
||||
for_each_online_cpu(j) {
|
||||
dbs_info = &per_cpu(cpu_dbs_info, j);
|
||||
requested_freq[j] = dbs_info->cur_policy->cur;
|
||||
}
|
||||
init_flag = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1630,7 +1630,7 @@ static void ether1394_complete_cb(void *__ptask)
|
|||
/* Transmit a packet (called by kernel) */
|
||||
static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
int kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
|
||||
gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
|
||||
struct eth1394hdr *eth;
|
||||
struct eth1394_priv *priv = netdev_priv(dev);
|
||||
int proto;
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@ void mthca_cmd_use_polling(struct mthca_dev *dev)
|
|||
}
|
||||
|
||||
struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
|
||||
unsigned int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct mthca_mailbox *mailbox;
|
||||
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ void mthca_cmd_event(struct mthca_dev *dev, u16 token,
|
|||
u8 status, u64 out_param);
|
||||
|
||||
struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
|
||||
unsigned int gfp_mask);
|
||||
gfp_t gfp_mask);
|
||||
void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox);
|
||||
|
||||
int mthca_SYS_EN(struct mthca_dev *dev, u8 *status);
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm)
|
|||
}
|
||||
|
||||
struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
|
||||
unsigned int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct mthca_icm *icm;
|
||||
struct mthca_icm_chunk *chunk = NULL;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ struct mthca_icm_iter {
|
|||
struct mthca_dev;
|
||||
|
||||
struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages,
|
||||
unsigned int gfp_mask);
|
||||
gfp_t gfp_mask);
|
||||
void mthca_free_icm(struct mthca_dev *dev, struct mthca_icm *icm);
|
||||
|
||||
struct mthca_icm_table *mthca_alloc_icm_table(struct mthca_dev *dev,
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ int bitmap_active(struct bitmap *bitmap)
|
|||
|
||||
#define WRITE_POOL_SIZE 256
|
||||
/* mempool for queueing pending writes on the bitmap file */
|
||||
static void *write_pool_alloc(unsigned int gfp_flags, void *data)
|
||||
static void *write_pool_alloc(gfp_t gfp_flags, void *data)
|
||||
{
|
||||
return kmalloc(sizeof(struct page_list), gfp_flags);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
|
|||
{
|
||||
struct bio *bio;
|
||||
unsigned int nr_iovecs = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
|
||||
int gfp_mask = GFP_NOIO | __GFP_HIGHMEM;
|
||||
gfp_t gfp_mask = GFP_NOIO | __GFP_HIGHMEM;
|
||||
unsigned int i;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -489,7 +489,7 @@ static int cas_page_free(struct cas *cp, cas_page_t *page)
|
|||
/* local page allocation routines for the receive buffers. jumbo pages
|
||||
* require at least 8K contiguous and 8K aligned buffers.
|
||||
*/
|
||||
static cas_page_t *cas_page_alloc(struct cas *cp, const int flags)
|
||||
static cas_page_t *cas_page_alloc(struct cas *cp, const gfp_t flags)
|
||||
{
|
||||
cas_page_t *page;
|
||||
|
||||
|
|
@ -561,7 +561,7 @@ static void cas_spare_free(struct cas *cp)
|
|||
}
|
||||
|
||||
/* replenish spares if needed */
|
||||
static void cas_spare_recover(struct cas *cp, const int flags)
|
||||
static void cas_spare_recover(struct cas *cp, const gfp_t flags)
|
||||
{
|
||||
struct list_head list, *elem, *tmp;
|
||||
int needed, i;
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ enum {OLD_LANCE = 0, PCNET_ISA=1, PCNET_ISAP=2, PCNET_PCI=3, PCNET_VLB=4, PCNET_
|
|||
static unsigned char lance_need_isa_bounce_buffers = 1;
|
||||
|
||||
static int lance_open(struct net_device *dev);
|
||||
static void lance_init_ring(struct net_device *dev, int mode);
|
||||
static void lance_init_ring(struct net_device *dev, gfp_t mode);
|
||||
static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||
static int lance_rx(struct net_device *dev);
|
||||
static irqreturn_t lance_interrupt(int irq, void *dev_id, struct pt_regs *regs);
|
||||
|
|
@ -846,7 +846,7 @@ lance_purge_ring(struct net_device *dev)
|
|||
|
||||
/* Initialize the LANCE Rx and Tx rings. */
|
||||
static void
|
||||
lance_init_ring(struct net_device *dev, int gfp)
|
||||
lance_init_ring(struct net_device *dev, gfp_t gfp)
|
||||
{
|
||||
struct lance_private *lp = dev->priv;
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq)
|
|||
struct recvq __iomem *rq = mp->rq;
|
||||
struct myri_rxd __iomem *rxd = &rq->myri_rxd[0];
|
||||
struct net_device *dev = mp->dev;
|
||||
int gfp_flags = GFP_KERNEL;
|
||||
gfp_t gfp_flags = GFP_KERNEL;
|
||||
int i;
|
||||
|
||||
if (from_irq || in_interrupt())
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ struct myri_eth {
|
|||
/* We use this to acquire receive skb's that we can DMA directly into. */
|
||||
#define ALIGNED_RX_SKB_ADDR(addr) \
|
||||
((((unsigned long)(addr) + (64 - 1)) & ~(64 - 1)) - (unsigned long)(addr))
|
||||
static inline struct sk_buff *myri_alloc_skb(unsigned int length, int gfp_flags)
|
||||
static inline struct sk_buff *myri_alloc_skb(unsigned int length, gfp_t gfp_flags)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
|
|
|
|||
|
|
@ -214,7 +214,8 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)
|
|||
{
|
||||
struct bmac_init_block *bb = bp->bmac_block;
|
||||
struct net_device *dev = bp->dev;
|
||||
int i, gfp_flags = GFP_KERNEL;
|
||||
int i;
|
||||
gfp_t gfp_flags = GFP_KERNEL;
|
||||
|
||||
if (from_irq || in_interrupt())
|
||||
gfp_flags = GFP_ATOMIC;
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ struct bigmac {
|
|||
#define ALIGNED_RX_SKB_ADDR(addr) \
|
||||
((((unsigned long)(addr) + (64 - 1)) & ~(64 - 1)) - (unsigned long)(addr))
|
||||
|
||||
static inline struct sk_buff *big_mac_alloc_skb(unsigned int length, int gfp_flags)
|
||||
static inline struct sk_buff *big_mac_alloc_skb(unsigned int length, gfp_t gfp_flags)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
|
|
|
|||
|
|
@ -836,7 +836,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
|
|||
* This function implements the pci_alloc_consistent function.
|
||||
*/
|
||||
static void *
|
||||
ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag)
|
||||
ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)
|
||||
{
|
||||
void *ret;
|
||||
#if 0
|
||||
|
|
|
|||
|
|
@ -1024,7 +1024,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
|
|||
* See Documentation/DMA-mapping.txt
|
||||
*/
|
||||
static void *sba_alloc_consistent(struct device *hwdev, size_t size,
|
||||
dma_addr_t *dma_handle, int gfp)
|
||||
dma_addr_t *dma_handle, gfp_t gfp)
|
||||
{
|
||||
void *ret;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ MODULE_LICENSE("GPL");
|
|||
|
||||
fsm_instance *
|
||||
init_fsm(char *name, const char **state_names, const char **event_names, int nr_states,
|
||||
int nr_events, const fsm_node *tmpl, int tmpl_len, int order)
|
||||
int nr_events, const fsm_node *tmpl, int tmpl_len, gfp_t order)
|
||||
{
|
||||
int i;
|
||||
fsm_instance *this;
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ extern fsm_instance *
|
|||
init_fsm(char *name, const char **state_names,
|
||||
const char **event_names,
|
||||
int nr_states, int nr_events, const fsm_node *tmpl,
|
||||
int tmpl_len, int order);
|
||||
int tmpl_len, gfp_t order);
|
||||
|
||||
/**
|
||||
* Releases an FSM
|
||||
|
|
|
|||
|
|
@ -1357,7 +1357,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
|
|||
|
||||
for (i = 0; i < shost->can_queue; i++) {
|
||||
size_t sz = shost->sg_tablesize *sizeof(struct sg_list);
|
||||
unsigned int gfp_mask = (shost->unchecked_isa_dma ? GFP_DMA : 0) | GFP_ATOMIC;
|
||||
gfp_t gfp_mask = (shost->unchecked_isa_dma ? GFP_DMA : 0) | GFP_ATOMIC;
|
||||
ha->cp[i].sglist = kmalloc(sz, gfp_mask);
|
||||
if (!ha->cp[i].sglist) {
|
||||
printk
|
||||
|
|
|
|||
|
|
@ -287,7 +287,8 @@ static void scsi_host_dev_release(struct device *dev)
|
|||
struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
|
||||
{
|
||||
struct Scsi_Host *shost;
|
||||
int gfp_mask = GFP_KERNEL, rval;
|
||||
gfp_t gfp_mask = GFP_KERNEL;
|
||||
int rval;
|
||||
|
||||
if (sht->unchecked_isa_dma && privsize)
|
||||
gfp_mask |= __GFP_DMA;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#define LPFC_MEM_POOL_SIZE 64 /* max elem in non-DMA safety pool */
|
||||
|
||||
static void *
|
||||
lpfc_pool_kmalloc(unsigned int gfp_flags, void *data)
|
||||
lpfc_pool_kmalloc(gfp_t gfp_flags, void *data)
|
||||
{
|
||||
return kmalloc((unsigned long)data, gfp_flags);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5146,7 +5146,8 @@ static long osst_compat_ioctl(struct file * file, unsigned int cmd_in, unsigned
|
|||
/* Try to allocate a new tape buffer skeleton. Caller must not hold os_scsi_tapes_lock */
|
||||
static struct osst_buffer * new_tape_buffer( int from_initialization, int need_dma, int max_sg )
|
||||
{
|
||||
int i, priority;
|
||||
int i;
|
||||
gfp_t priority;
|
||||
struct osst_buffer *tb;
|
||||
|
||||
if (from_initialization)
|
||||
|
|
@ -5178,7 +5179,8 @@ static struct osst_buffer * new_tape_buffer( int from_initialization, int need_d
|
|||
/* Try to allocate a temporary (while a user has the device open) enlarged tape buffer */
|
||||
static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)
|
||||
{
|
||||
int segs, nbr, max_segs, b_size, priority, order, got;
|
||||
int segs, nbr, max_segs, b_size, order, got;
|
||||
gfp_t priority;
|
||||
|
||||
if (STbuffer->buffer_size >= OS_FRAME_SIZE)
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ extern int qla2x00_load_risc(struct scsi_qla_host *, uint32_t *);
|
|||
extern int qla24xx_load_risc_flash(scsi_qla_host_t *, uint32_t *);
|
||||
extern int qla24xx_load_risc_hotplug(scsi_qla_host_t *, uint32_t *);
|
||||
|
||||
extern fc_port_t *qla2x00_alloc_fcport(scsi_qla_host_t *, int);
|
||||
extern fc_port_t *qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t);
|
||||
|
||||
extern int qla2x00_loop_resync(scsi_qla_host_t *);
|
||||
|
||||
|
|
@ -277,7 +277,7 @@ extern int qla2x00_fdmi_register(scsi_qla_host_t *);
|
|||
/*
|
||||
* Global Function Prototypes in qla_rscn.c source file.
|
||||
*/
|
||||
extern fc_port_t *qla2x00_alloc_rscn_fcport(scsi_qla_host_t *, int);
|
||||
extern fc_port_t *qla2x00_alloc_rscn_fcport(scsi_qla_host_t *, gfp_t);
|
||||
extern int qla2x00_handle_port_rscn(scsi_qla_host_t *, uint32_t, fc_port_t *,
|
||||
int);
|
||||
extern void qla2x00_process_iodesc(scsi_qla_host_t *, struct mbx_entry *);
|
||||
|
|
|
|||
|
|
@ -1685,7 +1685,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
|
|||
* Returns a pointer to the allocated fcport, or NULL, if none available.
|
||||
*/
|
||||
fc_port_t *
|
||||
qla2x00_alloc_fcport(scsi_qla_host_t *ha, int flags)
|
||||
qla2x00_alloc_fcport(scsi_qla_host_t *ha, gfp_t flags)
|
||||
{
|
||||
fc_port_t *fcport;
|
||||
|
||||
|
|
|
|||
|
|
@ -1066,7 +1066,7 @@ qla2x00_send_login_iocb_cb(scsi_qla_host_t *ha, struct io_descriptor *iodesc,
|
|||
* Returns a pointer to the allocated RSCN fcport, or NULL, if none available.
|
||||
*/
|
||||
fc_port_t *
|
||||
qla2x00_alloc_rscn_fcport(scsi_qla_host_t *ha, int flags)
|
||||
qla2x00_alloc_rscn_fcport(scsi_qla_host_t *ha, gfp_t flags)
|
||||
{
|
||||
fc_port_t *fcport;
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ EXPORT_SYMBOL(scsi_device_types);
|
|||
* Returns: Pointer to request block.
|
||||
*/
|
||||
struct scsi_request *scsi_allocate_request(struct scsi_device *sdev,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
const int offset = ALIGN(sizeof(struct scsi_request), 4);
|
||||
const int size = offset + sizeof(struct request);
|
||||
|
|
@ -196,7 +196,7 @@ struct scsi_host_cmd_pool {
|
|||
unsigned int users;
|
||||
char *name;
|
||||
unsigned int slab_flags;
|
||||
unsigned int gfp_mask;
|
||||
gfp_t gfp_mask;
|
||||
};
|
||||
|
||||
static struct scsi_host_cmd_pool scsi_cmd_pool = {
|
||||
|
|
@ -213,7 +213,7 @@ static struct scsi_host_cmd_pool scsi_cmd_dma_pool = {
|
|||
static DECLARE_MUTEX(host_cmd_pool_mutex);
|
||||
|
||||
static struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost,
|
||||
int gfp_mask)
|
||||
gfp_t gfp_mask)
|
||||
{
|
||||
struct scsi_cmnd *cmd;
|
||||
|
||||
|
|
@ -245,7 +245,7 @@ static struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost,
|
|||
*
|
||||
* Returns: The allocated scsi command structure.
|
||||
*/
|
||||
struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, int gfp_mask)
|
||||
struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask)
|
||||
{
|
||||
struct scsi_cmnd *cmd;
|
||||
|
||||
|
|
|
|||
|
|
@ -205,7 +205,8 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
|
|||
unsigned int inlen, outlen, cmdlen;
|
||||
unsigned int needed, buf_needed;
|
||||
int timeout, retries, result;
|
||||
int data_direction, gfp_mask = GFP_KERNEL;
|
||||
int data_direction;
|
||||
gfp_t gfp_mask = GFP_KERNEL;
|
||||
|
||||
if (!sic)
|
||||
return -EINVAL;
|
||||
|
|
|
|||
|
|
@ -677,7 +677,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int uptodate,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, int gfp_mask)
|
||||
static struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)
|
||||
{
|
||||
struct scsi_host_sg_pool *sgp;
|
||||
struct scatterlist *sgl;
|
||||
|
|
|
|||
|
|
@ -2644,7 +2644,7 @@ static char *
|
|||
sg_page_malloc(int rqSz, int lowDma, int *retSzp)
|
||||
{
|
||||
char *resp = NULL;
|
||||
int page_mask;
|
||||
gfp_t page_mask;
|
||||
int order, a_size;
|
||||
int resSz = rqSz;
|
||||
|
||||
|
|
|
|||
|
|
@ -3577,7 +3577,8 @@ static long st_compat_ioctl(struct file *file, unsigned int cmd, unsigned long a
|
|||
static struct st_buffer *
|
||||
new_tape_buffer(int from_initialization, int need_dma, int max_sg)
|
||||
{
|
||||
int i, priority, got = 0, segs = 0;
|
||||
int i, got = 0, segs = 0;
|
||||
gfp_t priority;
|
||||
struct st_buffer *tb;
|
||||
|
||||
if (from_initialization)
|
||||
|
|
@ -3610,7 +3611,8 @@ static struct st_buffer *
|
|||
/* Try to allocate enough space in the tape buffer */
|
||||
static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dma)
|
||||
{
|
||||
int segs, nbr, max_segs, b_size, priority, order, got;
|
||||
int segs, nbr, max_segs, b_size, order, got;
|
||||
gfp_t priority;
|
||||
|
||||
if (new_size <= STbuffer->buffer_size)
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ void hcd_buffer_destroy (struct usb_hcd *hcd)
|
|||
void *hcd_buffer_alloc (
|
||||
struct usb_bus *bus,
|
||||
size_t size,
|
||||
unsigned mem_flags,
|
||||
gfp_t mem_flags,
|
||||
dma_addr_t *dma
|
||||
)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1112,7 +1112,7 @@ static void urb_unlink (struct urb *urb)
|
|||
* expects usb_submit_urb() to have sanity checked and conditioned all
|
||||
* inputs in the urb
|
||||
*/
|
||||
static int hcd_submit_urb (struct urb *urb, unsigned mem_flags)
|
||||
static int hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
|
||||
{
|
||||
int status;
|
||||
struct usb_hcd *hcd = urb->dev->bus->hcpriv;
|
||||
|
|
|
|||
|
|
@ -142,12 +142,12 @@ struct hcd_timeout { /* timeouts we allocate */
|
|||
|
||||
struct usb_operations {
|
||||
int (*get_frame_number) (struct usb_device *usb_dev);
|
||||
int (*submit_urb) (struct urb *urb, unsigned mem_flags);
|
||||
int (*submit_urb) (struct urb *urb, gfp_t mem_flags);
|
||||
int (*unlink_urb) (struct urb *urb, int status);
|
||||
|
||||
/* allocate dma-consistent buffer for URB_DMA_NOMAPPING */
|
||||
void *(*buffer_alloc)(struct usb_bus *bus, size_t size,
|
||||
unsigned mem_flags,
|
||||
gfp_t mem_flags,
|
||||
dma_addr_t *dma);
|
||||
void (*buffer_free)(struct usb_bus *bus, size_t size,
|
||||
void *addr, dma_addr_t dma);
|
||||
|
|
@ -200,7 +200,7 @@ struct hc_driver {
|
|||
int (*urb_enqueue) (struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags);
|
||||
gfp_t mem_flags);
|
||||
int (*urb_dequeue) (struct usb_hcd *hcd, struct urb *urb);
|
||||
|
||||
/* hw synch, freeing endpoint resources that urb_dequeue can't */
|
||||
|
|
@ -247,7 +247,7 @@ int hcd_buffer_create (struct usb_hcd *hcd);
|
|||
void hcd_buffer_destroy (struct usb_hcd *hcd);
|
||||
|
||||
void *hcd_buffer_alloc (struct usb_bus *bus, size_t size,
|
||||
unsigned mem_flags, dma_addr_t *dma);
|
||||
gfp_t mem_flags, dma_addr_t *dma);
|
||||
void hcd_buffer_free (struct usb_bus *bus, size_t size,
|
||||
void *addr, dma_addr_t dma);
|
||||
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ int usb_sg_init (
|
|||
struct scatterlist *sg,
|
||||
int nents,
|
||||
size_t length,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ void usb_init_urb(struct urb *urb)
|
|||
*
|
||||
* The driver must call usb_free_urb() when it is finished with the urb.
|
||||
*/
|
||||
struct urb *usb_alloc_urb(int iso_packets, unsigned mem_flags)
|
||||
struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags)
|
||||
{
|
||||
struct urb *urb;
|
||||
|
||||
|
|
@ -224,7 +224,7 @@ struct urb * usb_get_urb(struct urb *urb)
|
|||
* GFP_NOIO, unless b) or c) apply
|
||||
*
|
||||
*/
|
||||
int usb_submit_urb(struct urb *urb, unsigned mem_flags)
|
||||
int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
|
||||
{
|
||||
int pipe, temp, max;
|
||||
struct usb_device *dev;
|
||||
|
|
|
|||
|
|
@ -1147,7 +1147,7 @@ int __usb_get_extra_descriptor(char *buffer, unsigned size,
|
|||
void *usb_buffer_alloc (
|
||||
struct usb_device *dev,
|
||||
size_t size,
|
||||
unsigned mem_flags,
|
||||
gfp_t mem_flags,
|
||||
dma_addr_t *dma
|
||||
)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -470,7 +470,7 @@ static int dummy_disable (struct usb_ep *_ep)
|
|||
}
|
||||
|
||||
static struct usb_request *
|
||||
dummy_alloc_request (struct usb_ep *_ep, unsigned mem_flags)
|
||||
dummy_alloc_request (struct usb_ep *_ep, gfp_t mem_flags)
|
||||
{
|
||||
struct dummy_ep *ep;
|
||||
struct dummy_request *req;
|
||||
|
|
@ -507,7 +507,7 @@ dummy_alloc_buffer (
|
|||
struct usb_ep *_ep,
|
||||
unsigned bytes,
|
||||
dma_addr_t *dma,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
char *retval;
|
||||
struct dummy_ep *ep;
|
||||
|
|
@ -541,7 +541,7 @@ fifo_complete (struct usb_ep *ep, struct usb_request *req)
|
|||
|
||||
static int
|
||||
dummy_queue (struct usb_ep *_ep, struct usb_request *_req,
|
||||
unsigned mem_flags)
|
||||
gfp_t mem_flags)
|
||||
{
|
||||
struct dummy_ep *ep;
|
||||
struct dummy_request *req;
|
||||
|
|
@ -999,7 +999,7 @@ static int dummy_urb_enqueue (
|
|||
struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
struct dummy *dum;
|
||||
struct urbp *urbp;
|
||||
|
|
|
|||
|
|
@ -945,11 +945,11 @@ config_buf (enum usb_device_speed speed,
|
|||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static void eth_start (struct eth_dev *dev, unsigned gfp_flags);
|
||||
static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags);
|
||||
static void eth_start (struct eth_dev *dev, gfp_t gfp_flags);
|
||||
static int alloc_requests (struct eth_dev *dev, unsigned n, gfp_t gfp_flags);
|
||||
|
||||
static int
|
||||
set_ether_config (struct eth_dev *dev, unsigned gfp_flags)
|
||||
set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)
|
||||
{
|
||||
int result = 0;
|
||||
struct usb_gadget *gadget = dev->gadget;
|
||||
|
|
@ -1081,7 +1081,7 @@ static void eth_reset_config (struct eth_dev *dev)
|
|||
* that returns config descriptors, and altsetting code.
|
||||
*/
|
||||
static int
|
||||
eth_set_config (struct eth_dev *dev, unsigned number, unsigned gfp_flags)
|
||||
eth_set_config (struct eth_dev *dev, unsigned number, gfp_t gfp_flags)
|
||||
{
|
||||
int result = 0;
|
||||
struct usb_gadget *gadget = dev->gadget;
|
||||
|
|
@ -1598,7 +1598,7 @@ static void defer_kevent (struct eth_dev *dev, int flag)
|
|||
static void rx_complete (struct usb_ep *ep, struct usb_request *req);
|
||||
|
||||
static int
|
||||
rx_submit (struct eth_dev *dev, struct usb_request *req, unsigned gfp_flags)
|
||||
rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
int retval = -ENOMEM;
|
||||
|
|
@ -1724,7 +1724,7 @@ clean:
|
|||
}
|
||||
|
||||
static int prealloc (struct list_head *list, struct usb_ep *ep,
|
||||
unsigned n, unsigned gfp_flags)
|
||||
unsigned n, gfp_t gfp_flags)
|
||||
{
|
||||
unsigned i;
|
||||
struct usb_request *req;
|
||||
|
|
@ -1763,7 +1763,7 @@ extra:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int alloc_requests (struct eth_dev *dev, unsigned n, unsigned gfp_flags)
|
||||
static int alloc_requests (struct eth_dev *dev, unsigned n, gfp_t gfp_flags)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
|
@ -1779,7 +1779,7 @@ fail:
|
|||
return status;
|
||||
}
|
||||
|
||||
static void rx_fill (struct eth_dev *dev, unsigned gfp_flags)
|
||||
static void rx_fill (struct eth_dev *dev, gfp_t gfp_flags)
|
||||
{
|
||||
struct usb_request *req;
|
||||
unsigned long flags;
|
||||
|
|
@ -1962,7 +1962,7 @@ drop:
|
|||
* normally just one notification will be queued.
|
||||
*/
|
||||
|
||||
static struct usb_request *eth_req_alloc (struct usb_ep *, unsigned, unsigned);
|
||||
static struct usb_request *eth_req_alloc (struct usb_ep *, unsigned, gfp_t);
|
||||
static void eth_req_free (struct usb_ep *ep, struct usb_request *req);
|
||||
|
||||
static void
|
||||
|
|
@ -2024,7 +2024,7 @@ static int rndis_control_ack (struct net_device *net)
|
|||
|
||||
#endif /* RNDIS */
|
||||
|
||||
static void eth_start (struct eth_dev *dev, unsigned gfp_flags)
|
||||
static void eth_start (struct eth_dev *dev, gfp_t gfp_flags)
|
||||
{
|
||||
DEBUG (dev, "%s\n", __FUNCTION__);
|
||||
|
||||
|
|
@ -2092,7 +2092,7 @@ static int eth_stop (struct net_device *net)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static struct usb_request *
|
||||
eth_req_alloc (struct usb_ep *ep, unsigned size, unsigned gfp_flags)
|
||||
eth_req_alloc (struct usb_ep *ep, unsigned size, gfp_t gfp_flags)
|
||||
{
|
||||
struct usb_request *req;
|
||||
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ static int goku_ep_disable(struct usb_ep *_ep)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static struct usb_request *
|
||||
goku_alloc_request(struct usb_ep *_ep, unsigned gfp_flags)
|
||||
goku_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
|
||||
{
|
||||
struct goku_request *req;
|
||||
|
||||
|
|
@ -327,7 +327,7 @@ goku_free_request(struct usb_ep *_ep, struct usb_request *_req)
|
|||
*/
|
||||
static void *
|
||||
goku_alloc_buffer(struct usb_ep *_ep, unsigned bytes,
|
||||
dma_addr_t *dma, unsigned gfp_flags)
|
||||
dma_addr_t *dma, gfp_t gfp_flags)
|
||||
{
|
||||
void *retval;
|
||||
struct goku_ep *ep;
|
||||
|
|
@ -789,7 +789,7 @@ finished:
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static int
|
||||
goku_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags)
|
||||
goku_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
|
||||
{
|
||||
struct goku_request *req;
|
||||
struct goku_ep *ep;
|
||||
|
|
|
|||
|
|
@ -71,13 +71,13 @@ static char *state_names[] = {
|
|||
static int lh7a40x_ep_enable(struct usb_ep *ep,
|
||||
const struct usb_endpoint_descriptor *);
|
||||
static int lh7a40x_ep_disable(struct usb_ep *ep);
|
||||
static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, int);
|
||||
static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep, gfp_t);
|
||||
static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *);
|
||||
static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned, dma_addr_t *,
|
||||
int);
|
||||
gfp_t);
|
||||
static void lh7a40x_free_buffer(struct usb_ep *ep, void *, dma_addr_t,
|
||||
unsigned);
|
||||
static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, int);
|
||||
static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, gfp_t);
|
||||
static int lh7a40x_dequeue(struct usb_ep *ep, struct usb_request *);
|
||||
static int lh7a40x_set_halt(struct usb_ep *ep, int);
|
||||
static int lh7a40x_fifo_status(struct usb_ep *ep);
|
||||
|
|
@ -1106,7 +1106,7 @@ static int lh7a40x_ep_disable(struct usb_ep *_ep)
|
|||
}
|
||||
|
||||
static struct usb_request *lh7a40x_alloc_request(struct usb_ep *ep,
|
||||
unsigned gfp_flags)
|
||||
gfp_t gfp_flags)
|
||||
{
|
||||
struct lh7a40x_request *req;
|
||||
|
||||
|
|
@ -1134,7 +1134,7 @@ static void lh7a40x_free_request(struct usb_ep *ep, struct usb_request *_req)
|
|||
}
|
||||
|
||||
static void *lh7a40x_alloc_buffer(struct usb_ep *ep, unsigned bytes,
|
||||
dma_addr_t * dma, unsigned gfp_flags)
|
||||
dma_addr_t * dma, gfp_t gfp_flags)
|
||||
{
|
||||
char *retval;
|
||||
|
||||
|
|
@ -1158,7 +1158,7 @@ static void lh7a40x_free_buffer(struct usb_ep *ep, void *buf, dma_addr_t dma,
|
|||
* NOTE: Sets INDEX register
|
||||
*/
|
||||
static int lh7a40x_queue(struct usb_ep *_ep, struct usb_request *_req,
|
||||
unsigned gfp_flags)
|
||||
gfp_t gfp_flags)
|
||||
{
|
||||
struct lh7a40x_request *req;
|
||||
struct lh7a40x_ep *ep;
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ static int net2280_disable (struct usb_ep *_ep)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static struct usb_request *
|
||||
net2280_alloc_request (struct usb_ep *_ep, unsigned gfp_flags)
|
||||
net2280_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
|
||||
{
|
||||
struct net2280_ep *ep;
|
||||
struct net2280_request *req;
|
||||
|
|
@ -463,7 +463,7 @@ net2280_alloc_buffer (
|
|||
struct usb_ep *_ep,
|
||||
unsigned bytes,
|
||||
dma_addr_t *dma,
|
||||
unsigned gfp_flags
|
||||
gfp_t gfp_flags
|
||||
)
|
||||
{
|
||||
void *retval;
|
||||
|
|
@ -897,7 +897,7 @@ done (struct net2280_ep *ep, struct net2280_request *req, int status)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static int
|
||||
net2280_queue (struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags)
|
||||
net2280_queue (struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
|
||||
{
|
||||
struct net2280_request *req;
|
||||
struct net2280_ep *ep;
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ static int omap_ep_disable(struct usb_ep *_ep)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static struct usb_request *
|
||||
omap_alloc_request(struct usb_ep *ep, unsigned gfp_flags)
|
||||
omap_alloc_request(struct usb_ep *ep, gfp_t gfp_flags)
|
||||
{
|
||||
struct omap_req *req;
|
||||
|
||||
|
|
@ -298,7 +298,7 @@ omap_alloc_buffer(
|
|||
struct usb_ep *_ep,
|
||||
unsigned bytes,
|
||||
dma_addr_t *dma,
|
||||
unsigned gfp_flags
|
||||
gfp_t gfp_flags
|
||||
)
|
||||
{
|
||||
void *retval;
|
||||
|
|
@ -937,7 +937,7 @@ static void dma_channel_release(struct omap_ep *ep)
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static int
|
||||
omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags)
|
||||
omap_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
|
||||
{
|
||||
struct omap_ep *ep = container_of(_ep, struct omap_ep, ep);
|
||||
struct omap_req *req = container_of(_req, struct omap_req, req);
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@ static int pxa2xx_ep_disable (struct usb_ep *_ep)
|
|||
* pxa2xx_ep_alloc_request - allocate a request data structure
|
||||
*/
|
||||
static struct usb_request *
|
||||
pxa2xx_ep_alloc_request (struct usb_ep *_ep, unsigned gfp_flags)
|
||||
pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags)
|
||||
{
|
||||
struct pxa2xx_request *req;
|
||||
|
||||
|
|
@ -367,7 +367,7 @@ pxa2xx_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
|
|||
*/
|
||||
static void *
|
||||
pxa2xx_ep_alloc_buffer(struct usb_ep *_ep, unsigned bytes,
|
||||
dma_addr_t *dma, unsigned gfp_flags)
|
||||
dma_addr_t *dma, gfp_t gfp_flags)
|
||||
{
|
||||
char *retval;
|
||||
|
||||
|
|
@ -874,7 +874,7 @@ done:
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static int
|
||||
pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, unsigned gfp_flags)
|
||||
pxa2xx_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
|
||||
{
|
||||
struct pxa2xx_request *req;
|
||||
struct pxa2xx_ep *ep;
|
||||
|
|
|
|||
|
|
@ -300,18 +300,18 @@ static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed,
|
|||
u8 type, unsigned int index, int is_otg);
|
||||
|
||||
static struct usb_request *gs_alloc_req(struct usb_ep *ep, unsigned int len,
|
||||
unsigned kmalloc_flags);
|
||||
gfp_t kmalloc_flags);
|
||||
static void gs_free_req(struct usb_ep *ep, struct usb_request *req);
|
||||
|
||||
static struct gs_req_entry *gs_alloc_req_entry(struct usb_ep *ep, unsigned len,
|
||||
unsigned kmalloc_flags);
|
||||
gfp_t kmalloc_flags);
|
||||
static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req);
|
||||
|
||||
static int gs_alloc_ports(struct gs_dev *dev, unsigned kmalloc_flags);
|
||||
static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags);
|
||||
static void gs_free_ports(struct gs_dev *dev);
|
||||
|
||||
/* circular buffer */
|
||||
static struct gs_buf *gs_buf_alloc(unsigned int size, unsigned kmalloc_flags);
|
||||
static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags);
|
||||
static void gs_buf_free(struct gs_buf *gb);
|
||||
static void gs_buf_clear(struct gs_buf *gb);
|
||||
static unsigned int gs_buf_data_avail(struct gs_buf *gb);
|
||||
|
|
@ -2091,7 +2091,7 @@ static int gs_build_config_buf(u8 *buf, enum usb_device_speed speed,
|
|||
* usb_request or NULL if there is an error.
|
||||
*/
|
||||
static struct usb_request *
|
||||
gs_alloc_req(struct usb_ep *ep, unsigned int len, unsigned kmalloc_flags)
|
||||
gs_alloc_req(struct usb_ep *ep, unsigned int len, gfp_t kmalloc_flags)
|
||||
{
|
||||
struct usb_request *req;
|
||||
|
||||
|
|
@ -2132,7 +2132,7 @@ static void gs_free_req(struct usb_ep *ep, struct usb_request *req)
|
|||
* endpoint, buffer len, and kmalloc flags.
|
||||
*/
|
||||
static struct gs_req_entry *
|
||||
gs_alloc_req_entry(struct usb_ep *ep, unsigned len, unsigned kmalloc_flags)
|
||||
gs_alloc_req_entry(struct usb_ep *ep, unsigned len, gfp_t kmalloc_flags)
|
||||
{
|
||||
struct gs_req_entry *req;
|
||||
|
||||
|
|
@ -2173,7 +2173,7 @@ static void gs_free_req_entry(struct usb_ep *ep, struct gs_req_entry *req)
|
|||
*
|
||||
* The device lock is normally held when calling this function.
|
||||
*/
|
||||
static int gs_alloc_ports(struct gs_dev *dev, unsigned kmalloc_flags)
|
||||
static int gs_alloc_ports(struct gs_dev *dev, gfp_t kmalloc_flags)
|
||||
{
|
||||
int i;
|
||||
struct gs_port *port;
|
||||
|
|
@ -2255,7 +2255,7 @@ static void gs_free_ports(struct gs_dev *dev)
|
|||
*
|
||||
* Allocate a circular buffer and all associated memory.
|
||||
*/
|
||||
static struct gs_buf *gs_buf_alloc(unsigned int size, unsigned kmalloc_flags)
|
||||
static struct gs_buf *gs_buf_alloc(unsigned int size, gfp_t kmalloc_flags)
|
||||
{
|
||||
struct gs_buf *gb;
|
||||
|
||||
|
|
|
|||
|
|
@ -612,7 +612,7 @@ static void source_sink_complete (struct usb_ep *ep, struct usb_request *req)
|
|||
}
|
||||
|
||||
static struct usb_request *
|
||||
source_sink_start_ep (struct usb_ep *ep, unsigned gfp_flags)
|
||||
source_sink_start_ep (struct usb_ep *ep, gfp_t gfp_flags)
|
||||
{
|
||||
struct usb_request *req;
|
||||
int status;
|
||||
|
|
@ -640,7 +640,7 @@ source_sink_start_ep (struct usb_ep *ep, unsigned gfp_flags)
|
|||
}
|
||||
|
||||
static int
|
||||
set_source_sink_config (struct zero_dev *dev, unsigned gfp_flags)
|
||||
set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
|
||||
{
|
||||
int result = 0;
|
||||
struct usb_ep *ep;
|
||||
|
|
@ -744,7 +744,7 @@ static void loopback_complete (struct usb_ep *ep, struct usb_request *req)
|
|||
}
|
||||
|
||||
static int
|
||||
set_loopback_config (struct zero_dev *dev, unsigned gfp_flags)
|
||||
set_loopback_config (struct zero_dev *dev, gfp_t gfp_flags)
|
||||
{
|
||||
int result = 0;
|
||||
struct usb_ep *ep;
|
||||
|
|
@ -845,7 +845,7 @@ static void zero_reset_config (struct zero_dev *dev)
|
|||
* by limiting configuration choices (like the pxa2xx).
|
||||
*/
|
||||
static int
|
||||
zero_set_config (struct zero_dev *dev, unsigned number, unsigned gfp_flags)
|
||||
zero_set_config (struct zero_dev *dev, unsigned number, gfp_t gfp_flags)
|
||||
{
|
||||
int result = 0;
|
||||
struct usb_gadget *gadget = dev->gadget;
|
||||
|
|
|
|||
|
|
@ -983,7 +983,7 @@ static int ehci_urb_enqueue (
|
|||
struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
struct ehci_hcd *ehci = hcd_to_ehci (hcd);
|
||||
struct list_head qtd_list;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ static inline void ehci_qtd_init (struct ehci_qtd *qtd, dma_addr_t dma)
|
|||
INIT_LIST_HEAD (&qtd->qtd_list);
|
||||
}
|
||||
|
||||
static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci, int flags)
|
||||
static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci, gfp_t flags)
|
||||
{
|
||||
struct ehci_qtd *qtd;
|
||||
dma_addr_t dma;
|
||||
|
|
@ -79,7 +79,7 @@ static void qh_destroy (struct kref *kref)
|
|||
dma_pool_free (ehci->qh_pool, qh, qh->qh_dma);
|
||||
}
|
||||
|
||||
static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, int flags)
|
||||
static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
|
||||
{
|
||||
struct ehci_qh *qh;
|
||||
dma_addr_t dma;
|
||||
|
|
@ -161,7 +161,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
|
|||
}
|
||||
|
||||
/* remember to add cleanup code (above) if you add anything here */
|
||||
static int ehci_mem_init (struct ehci_hcd *ehci, int flags)
|
||||
static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ qh_urb_transaction (
|
|||
struct ehci_hcd *ehci,
|
||||
struct urb *urb,
|
||||
struct list_head *head,
|
||||
int flags
|
||||
gfp_t flags
|
||||
) {
|
||||
struct ehci_qtd *qtd, *qtd_prev;
|
||||
dma_addr_t buf;
|
||||
|
|
@ -629,7 +629,7 @@ static struct ehci_qh *
|
|||
qh_make (
|
||||
struct ehci_hcd *ehci,
|
||||
struct urb *urb,
|
||||
int flags
|
||||
gfp_t flags
|
||||
) {
|
||||
struct ehci_qh *qh = ehci_qh_alloc (ehci, flags);
|
||||
u32 info1 = 0, info2 = 0;
|
||||
|
|
@ -906,7 +906,7 @@ submit_async (
|
|||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb,
|
||||
struct list_head *qtd_list,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
struct ehci_qtd *qtd;
|
||||
int epnum;
|
||||
|
|
|
|||
|
|
@ -589,7 +589,7 @@ static int intr_submit (
|
|||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb,
|
||||
struct list_head *qtd_list,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
unsigned epnum;
|
||||
unsigned long flags;
|
||||
|
|
@ -634,7 +634,7 @@ done:
|
|||
/* ehci_iso_stream ops work with both ITD and SITD */
|
||||
|
||||
static struct ehci_iso_stream *
|
||||
iso_stream_alloc (unsigned mem_flags)
|
||||
iso_stream_alloc (gfp_t mem_flags)
|
||||
{
|
||||
struct ehci_iso_stream *stream;
|
||||
|
||||
|
|
@ -851,7 +851,7 @@ iso_stream_find (struct ehci_hcd *ehci, struct urb *urb)
|
|||
/* ehci_iso_sched ops can be ITD-only or SITD-only */
|
||||
|
||||
static struct ehci_iso_sched *
|
||||
iso_sched_alloc (unsigned packets, unsigned mem_flags)
|
||||
iso_sched_alloc (unsigned packets, gfp_t mem_flags)
|
||||
{
|
||||
struct ehci_iso_sched *iso_sched;
|
||||
int size = sizeof *iso_sched;
|
||||
|
|
@ -924,7 +924,7 @@ itd_urb_transaction (
|
|||
struct ehci_iso_stream *stream,
|
||||
struct ehci_hcd *ehci,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
)
|
||||
{
|
||||
struct ehci_itd *itd;
|
||||
|
|
@ -1418,7 +1418,7 @@ itd_complete (
|
|||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static int itd_submit (struct ehci_hcd *ehci, struct urb *urb,
|
||||
unsigned mem_flags)
|
||||
gfp_t mem_flags)
|
||||
{
|
||||
int status = -EINVAL;
|
||||
unsigned long flags;
|
||||
|
|
@ -1529,7 +1529,7 @@ sitd_urb_transaction (
|
|||
struct ehci_iso_stream *stream,
|
||||
struct ehci_hcd *ehci,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
)
|
||||
{
|
||||
struct ehci_sitd *sitd;
|
||||
|
|
@ -1779,7 +1779,7 @@ sitd_complete (
|
|||
|
||||
|
||||
static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb,
|
||||
unsigned mem_flags)
|
||||
gfp_t mem_flags)
|
||||
{
|
||||
int status = -EINVAL;
|
||||
unsigned long flags;
|
||||
|
|
|
|||
|
|
@ -694,7 +694,7 @@ static int balance(struct isp116x *isp116x, u16 period, u16 load)
|
|||
|
||||
static int isp116x_urb_enqueue(struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *hep, struct urb *urb,
|
||||
unsigned mem_flags)
|
||||
gfp_t mem_flags)
|
||||
{
|
||||
struct isp116x *isp116x = hcd_to_isp116x(hcd);
|
||||
struct usb_device *udev = urb->dev;
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ static int ohci_urb_enqueue (
|
|||
struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
|
||||
struct ed *ed;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ dma_to_td (struct ohci_hcd *hc, dma_addr_t td_dma)
|
|||
|
||||
/* TDs ... */
|
||||
static struct td *
|
||||
td_alloc (struct ohci_hcd *hc, unsigned mem_flags)
|
||||
td_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
|
||||
{
|
||||
dma_addr_t dma;
|
||||
struct td *td;
|
||||
|
|
@ -118,7 +118,7 @@ td_free (struct ohci_hcd *hc, struct td *td)
|
|||
|
||||
/* EDs ... */
|
||||
static struct ed *
|
||||
ed_alloc (struct ohci_hcd *hc, unsigned mem_flags)
|
||||
ed_alloc (struct ohci_hcd *hc, gfp_t mem_flags)
|
||||
{
|
||||
dma_addr_t dma;
|
||||
struct ed *ed;
|
||||
|
|
|
|||
|
|
@ -818,7 +818,7 @@ static int sl811h_urb_enqueue(
|
|||
struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *hep,
|
||||
struct urb *urb,
|
||||
unsigned mem_flags
|
||||
gfp_t mem_flags
|
||||
) {
|
||||
struct sl811 *sl811 = hcd_to_sl811(hcd);
|
||||
struct usb_device *udev = urb->dev;
|
||||
|
|
|
|||
|
|
@ -1164,7 +1164,7 @@ static struct urb *uhci_find_urb_ep(struct uhci_hcd *uhci, struct urb *urb)
|
|||
|
||||
static int uhci_urb_enqueue(struct usb_hcd *hcd,
|
||||
struct usb_host_endpoint *ep,
|
||||
struct urb *urb, unsigned mem_flags)
|
||||
struct urb *urb, gfp_t mem_flags)
|
||||
{
|
||||
int ret;
|
||||
struct uhci_hcd *uhci = hcd_to_uhci(hcd);
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ static void async_complete(struct urb *urb, struct pt_regs *ptregs)
|
|||
|
||||
static struct uss720_async_request *submit_async_request(struct parport_uss720_private *priv,
|
||||
__u8 request, __u8 requesttype, __u16 value, __u16 index,
|
||||
unsigned int mem_flags)
|
||||
gfp_t mem_flags)
|
||||
{
|
||||
struct usb_device *usbdev;
|
||||
struct uss720_async_request *rq;
|
||||
|
|
@ -204,7 +204,7 @@ static unsigned int kill_all_async_requests_priv(struct parport_uss720_private *
|
|||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
static int get_1284_register(struct parport *pp, unsigned char reg, unsigned char *val, unsigned int mem_flags)
|
||||
static int get_1284_register(struct parport *pp, unsigned char reg, unsigned char *val, gfp_t mem_flags)
|
||||
{
|
||||
struct parport_uss720_private *priv;
|
||||
struct uss720_async_request *rq;
|
||||
|
|
@ -238,7 +238,7 @@ static int get_1284_register(struct parport *pp, unsigned char reg, unsigned cha
|
|||
return -EIO;
|
||||
}
|
||||
|
||||
static int set_1284_register(struct parport *pp, unsigned char reg, unsigned char val, unsigned int mem_flags)
|
||||
static int set_1284_register(struct parport *pp, unsigned char reg, unsigned char val, gfp_t mem_flags)
|
||||
{
|
||||
struct parport_uss720_private *priv;
|
||||
struct uss720_async_request *rq;
|
||||
|
|
|
|||
|
|
@ -753,7 +753,7 @@ static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
|
||||
unsigned flags)
|
||||
gfp_t flags)
|
||||
{
|
||||
int padlen;
|
||||
int headroom = skb_headroom(skb);
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static struct sk_buff *
|
||||
genelink_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags)
|
||||
genelink_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
|
||||
{
|
||||
int padlen;
|
||||
int length = skb->len;
|
||||
|
|
|
|||
|
|
@ -477,13 +477,13 @@ static int kaweth_reset(struct kaweth_device *kaweth)
|
|||
}
|
||||
|
||||
static void kaweth_usb_receive(struct urb *, struct pt_regs *regs);
|
||||
static int kaweth_resubmit_rx_urb(struct kaweth_device *, unsigned);
|
||||
static int kaweth_resubmit_rx_urb(struct kaweth_device *, gfp_t);
|
||||
|
||||
/****************************************************************
|
||||
int_callback
|
||||
*****************************************************************/
|
||||
|
||||
static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, int mf)
|
||||
static void kaweth_resubmit_int_urb(struct kaweth_device *kaweth, gfp_t mf)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
|
@ -550,7 +550,7 @@ static void kaweth_resubmit_tl(void *d)
|
|||
* kaweth_resubmit_rx_urb
|
||||
****************************************************************/
|
||||
static int kaweth_resubmit_rx_urb(struct kaweth_device *kaweth,
|
||||
unsigned mem_flags)
|
||||
gfp_t mem_flags)
|
||||
{
|
||||
int result;
|
||||
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static struct sk_buff *
|
||||
net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags)
|
||||
net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
|
||||
{
|
||||
int padlen;
|
||||
struct sk_buff *skb2;
|
||||
|
|
|
|||
|
|
@ -517,7 +517,7 @@ static int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
|
|||
}
|
||||
|
||||
static struct sk_buff *
|
||||
rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags)
|
||||
rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
|
||||
{
|
||||
struct rndis_data_hdr *hdr;
|
||||
struct sk_buff *skb2;
|
||||
|
|
|
|||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче