diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
| commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
| tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /include/asm-sparc/mman.h | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-sparc/mman.h')
| -rw-r--r-- | include/asm-sparc/mman.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h index 88d1886abf3b..b7dc40bc68f4 100644 --- a/include/asm-sparc/mman.h +++ b/include/asm-sparc/mman.h | |||
| @@ -35,4 +35,12 @@ | |||
| 35 | 35 | ||
| 36 | #define MADV_FREE 0x5 /* (Solaris) contents can be freed */ | 36 | #define MADV_FREE 0x5 /* (Solaris) contents can be freed */ |
| 37 | 37 | ||
| 38 | #ifdef __KERNEL__ | ||
| 39 | #ifndef __ASSEMBLY__ | ||
| 40 | #define arch_mmap_check sparc_mmap_check | ||
| 41 | int sparc_mmap_check(unsigned long addr, unsigned long len, | ||
| 42 | unsigned long flags); | ||
| 43 | #endif | ||
| 44 | #endif | ||
| 45 | |||
| 38 | #endif /* __SPARC_MMAN_H__ */ | 46 | #endif /* __SPARC_MMAN_H__ */ |