mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
agp: alpha nopage
Convert AGP alpha driver from nopage to fault. NULL is NOPAGE_SIGBUS, so we aren't changing behaviour there. Signed-off-by: Nick Piggin <npiggin@suse.de> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2f78dcfd30
commit
6d6f8d52fd
1 changed files with 8 additions and 9 deletions
|
@ -11,29 +11,28 @@
|
|||
|
||||
#include "agp.h"
|
||||
|
||||
static struct page *alpha_core_agp_vm_nopage(struct vm_area_struct *vma,
|
||||
unsigned long address,
|
||||
int *type)
|
||||
static int alpha_core_agp_vm_fault(struct vm_area_struct *vma,
|
||||
struct vm_fault *vmf)
|
||||
{
|
||||
alpha_agp_info *agp = agp_bridge->dev_private_data;
|
||||
dma_addr_t dma_addr;
|
||||
unsigned long pa;
|
||||
struct page *page;
|
||||
|
||||
dma_addr = address - vma->vm_start + agp->aperture.bus_base;
|
||||
dma_addr = (unsigned long)vmf->virtual_address - vma->vm_start
|
||||
+ agp->aperture.bus_base;
|
||||
pa = agp->ops->translate(agp, dma_addr);
|
||||
|
||||
if (pa == (unsigned long)-EINVAL)
|
||||
return NULL; /* no translation */
|
||||
return VM_FAULT_SIGBUS; /* no translation */
|
||||
|
||||
/*
|
||||
* Get the page, inc the use count, and return it
|
||||
*/
|
||||
page = virt_to_page(__va(pa));
|
||||
get_page(page);
|
||||
if (type)
|
||||
*type = VM_FAULT_MINOR;
|
||||
return page;
|
||||
vmf->page = page;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct aper_size_info_fixed alpha_core_agp_sizes[] =
|
||||
|
@ -42,7 +41,7 @@ static struct aper_size_info_fixed alpha_core_agp_sizes[] =
|
|||
};
|
||||
|
||||
struct vm_operations_struct alpha_core_agp_vm_ops = {
|
||||
.nopage = alpha_core_agp_vm_nopage,
|
||||
.fault = alpha_core_agp_vm_fault,
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue