diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 19:11:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 19:11:36 -0700 |
| commit | 8978a318837d7acefca82645017c0534aeba5a36 (patch) | |
| tree | f69f5bc9a11d1a3a5c6391a9b48c9bcae4615a5a /include/asm-sparc64/mman.h | |
| parent | f7fd63c0b5e170efc20e7b9a0aad7f69dff62c64 (diff) | |
| parent | 9a28dbf8af11d127bf1c644143e7882cb91515dd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Use a TS_RESTORE_SIGMASK
lmb: Make lmb debugging more useful.
lmb: Fix inconsistent alignment of size argument.
sparc: Fix mremap address range validation.
Diffstat (limited to 'include/asm-sparc64/mman.h')
| -rw-r--r-- | include/asm-sparc64/mman.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h index e584563b56eb..625be4d61baf 100644 --- a/include/asm-sparc64/mman.h +++ b/include/asm-sparc64/mman.h @@ -24,9 +24,8 @@ #ifdef __KERNEL__ #ifndef __ASSEMBLY__ -#define arch_mmap_check sparc64_mmap_check -int sparc64_mmap_check(unsigned long addr, unsigned long len, - unsigned long flags); +#define arch_mmap_check(addr,len,flags) sparc64_mmap_check(addr,len) +int sparc64_mmap_check(unsigned long addr, unsigned long len); #endif #endif |