diff options
| author | Nick Piggin <npiggin@suse.de> | 2007-12-13 15:58:27 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-12-18 16:55:46 -0800 |
| commit | 3cdc7fc7fd5bd1ead75758dfadef609a6e9fd3de (patch) | |
| tree | 8fa0c9fb7a4419055fac6a780c854e7f244ad9b0 /arch | |
| parent | 2018df76d276bb4fe97b175bd5db0cdd128dfeb4 (diff) | |
| download | linux-3.10-3cdc7fc7fd5bd1ead75758dfadef609a6e9fd3de.tar.gz linux-3.10-3cdc7fc7fd5bd1ead75758dfadef609a6e9fd3de.tar.bz2 linux-3.10-3cdc7fc7fd5bd1ead75758dfadef609a6e9fd3de.zip | |
[IA64] ia32 nopage
Convert ia64's ia32 support from nopage to fault.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index f6ae3ec9381..3e35987af45 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c @@ -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; + vmf->page = ia32_shared_page[smp_processor_id()]; + get_page(vmf->page); + return 0; } -struct page * -ia32_install_gate_page (struct vm_area_struct *vma, unsigned long address, int *type) +int +ia32_install_gate_page (struct vm_area_struct *vma, struct vm_fault *vmf) { - struct page *pg = ia32_gate_page; - get_page(pg); - if (type) - *type = VM_FAULT_MINOR; - return pg; + 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 |