ia64: ia32 nopage
PATCH 3/3 ia64: ia32 nopage
From: Nick Piggin <[email protected]>
Convert ia64's ia32 support from nopage to fault.
Signed-off-by Nick Piggin <[email protected]>
Cc "Luck, Tony" <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/ia64/ia32/binfmt_elf32.c | 34 ++++++++++++++------------------ 1 file changed, 15 insertions(+), 19 deletions(-)
arch/ia64/ia32/binfmt_elf32.c renamed from arch/ia64/ia32/binfmt_elf32.c~ia64-ia32-nopage +15 -19
@@ -52,33 +52,29 @@ extern struct page *ia32_shared_page[];extern unsigned long *ia32_gdt;extern struct page *ia32_gate_page; -struct page * -ia32_install_shared_page (struct vm_area_struct *vma,unsigned long address,int *type) +int +ia32_install_shared_page (struct vm_area_struct *vma,struct vm_fault *vmf) { -struct page *pg = ia32_shared_page[smp_processor_id ()]; -get_page (pg); -if (type) - *type =VM_FAULT_MINOR ; -return pg; -} - -struct page * -ia32_install_gate_page (struct vm_area_struct *vma,unsigned long address,int *type) -{ -struct page *pg = ia32_gate_page; -get_page (pg); -if (type) - *type =VM_FAULT_MINOR ; -return pg; + vmf->page = ia32_shared_page[smp_processor_id ()]; +get_page (vmf->page); +return 0 ; +} + +int +ia32_install_gate_page (struct vm_area_struct *vma,struct vm_fault *vmf) +{ + vmf->page = ia32_gate_page; +get_page (vmf->page); +return 0 ; }static struct vm_operations_struct ia32_shared_page_vm_ops = { - .nopage = ia32_install_shared_page + .fault = ia32_install_shared_page };static struct vm_operations_struct ia32_gate_page_vm_ops = { - .nopage = ia32_install_gate_page + .fault = ia32_install_gate_page };void
_