Commit 03d6c5b2 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Jeff Garzik

[PATCH] CONFIG_REGPARM breaks non-asmlinkage syscalls

With CONFIG_REGPARM=y, syscalls must be declared asmlinkage or else
calling them will fail.

This fix adds a few missing declarations for sys_fadvise64_64() and
sys_remap_file_pages().
parent 15680951
......@@ -2990,7 +2990,7 @@ sys32_timer_create(u32 clock, struct sigevent32 *se32, timer_t *timer_id)
return err;
}
extern long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice);
asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice);
long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high,
__u32 len_low, __u32 len_high, int advice)
......
......@@ -1895,7 +1895,7 @@ sys32_timer_create(u32 clock, struct sigevent32 *se32, timer_t *timer_id)
return err;
}
extern long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice);
asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice);
long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high,
__u32 len_low, __u32 len_high, int advice)
......
......@@ -455,8 +455,8 @@ extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, un
extern int handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access);
extern int make_pages_present(unsigned long addr, unsigned long end);
extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
extern long sys_remap_file_pages(unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long nonblock);
extern long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice);
asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size, unsigned long prot, unsigned long pgoff, unsigned long nonblock);
asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice);
void put_dirty_page(struct task_struct *tsk, struct page *page,
unsigned long address, pgprot_t prot);
......
......@@ -155,7 +155,7 @@ int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma,
* protection is used. Arbitrary protections might be implemented in the
* future.
*/
long sys_remap_file_pages(unsigned long start, unsigned long size,
asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
unsigned long __prot, unsigned long pgoff, unsigned long flags)
{
struct mm_struct *mm = current->mm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment