lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto-update from upstream

Browse Source
This commit is contained in:
Kyle McMartin
2005-10-28 12:18:07 -04:00
parent e0f998930e 260b23674f
commit 210cc679fa
268 changed files with 4957 additions and 2840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/parisc/kernel/pci-dma.c
View File

@ -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;