diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 11:12:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 11:12:24 -0400 |
| commit | 538f0fd0f210c2ce5c585799f18d0e5c7cf6155e (patch) | |
| tree | e9fa2b10ce5d92ac6bcd8ac55af1cd97bda3ec5d /include/asm-sparc/mman.h | |
| parent | 3bb6fbf9969a8bbe4892968659239273d092e78a (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'include/asm-sparc/mman.h')
| -rw-r--r-- | include/asm-sparc/mman.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h index e18be984c01d..3d16b40bb8ef 100644 --- a/include/asm-sparc/mman.h +++ b/include/asm-sparc/mman.h | |||
| @@ -24,9 +24,8 @@ | |||
| 24 | 24 | ||
| 25 | #ifdef __KERNEL__ | 25 | #ifdef __KERNEL__ |
| 26 | #ifndef __ASSEMBLY__ | 26 | #ifndef __ASSEMBLY__ |
| 27 | #define arch_mmap_check sparc_mmap_check | 27 | #define arch_mmap_check(addr,len,flags) sparc_mmap_check(addr,len) |
| 28 | int sparc_mmap_check(unsigned long addr, unsigned long len, | 28 | int sparc_mmap_check(unsigned long addr, unsigned long len); |
| 29 | unsigned long flags); | ||
| 30 | #endif | 29 | #endif |
| 31 | #endif | 30 | #endif |
| 32 | 31 | ||