diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /include/asm-sparc64/mman.h | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc64/mman.h')
| -rw-r--r-- | include/asm-sparc64/mman.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h index e584563b56eb..d2ae67cd1bdc 100644 --- a/include/asm-sparc64/mman.h +++ b/include/asm-sparc64/mman.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: mman.h,v 1.2 2000/03/15 02:44:26 davem Exp $ */ | ||
| 2 | #ifndef __SPARC64_MMAN_H__ | 1 | #ifndef __SPARC64_MMAN_H__ |
| 3 | #define __SPARC64_MMAN_H__ | 2 | #define __SPARC64_MMAN_H__ |
| 4 | 3 | ||
| @@ -24,9 +23,8 @@ | |||
| 24 | 23 | ||
| 25 | #ifdef __KERNEL__ | 24 | #ifdef __KERNEL__ |
| 26 | #ifndef __ASSEMBLY__ | 25 | #ifndef __ASSEMBLY__ |
| 27 | #define arch_mmap_check sparc64_mmap_check | 26 | #define arch_mmap_check(addr,len,flags) sparc64_mmap_check(addr,len) |
| 28 | int sparc64_mmap_check(unsigned long addr, unsigned long len, | 27 | int sparc64_mmap_check(unsigned long addr, unsigned long len); |
| 29 | unsigned long flags); | ||
| 30 | #endif | 28 | #endif |
| 31 | #endif | 29 | #endif |
| 32 | 30 | ||