git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-sparc
/
mman.h
diff --git
a/include/asm-sparc/mman.h
b/include/asm-sparc/mman.h
index
95ecab5
..
b7dc40b
100644
(file)
--- a/
include/asm-sparc/mman.h
+++ b/
include/asm-sparc/mman.h
@@
-2,12
+2,6
@@
#ifndef __SPARC_MMAN_H__
#define __SPARC_MMAN_H__
#ifndef __SPARC_MMAN_H__
#define __SPARC_MMAN_H__
-#ifdef __KERNEL__
-#define arch_mmap_check sparc_mmap_check
-int sparc_mmap_check(unsigned long addr, unsigned long len,
- unsigned long flags);
-#endif
-
#include <asm-generic/mman.h>
/* SunOS'ified... */
#include <asm-generic/mman.h>
/* SunOS'ified... */
@@
-41,4
+35,12
@@
int sparc_mmap_check(unsigned long addr, unsigned long len,
#define MADV_FREE 0x5 /* (Solaris) contents can be freed */
#define MADV_FREE 0x5 /* (Solaris) contents can be freed */
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+#define arch_mmap_check sparc_mmap_check
+int sparc_mmap_check(unsigned long addr, unsigned long len,
+ unsigned long flags);
+#endif
+#endif
+
#endif /* __SPARC_MMAN_H__ */
#endif /* __SPARC_MMAN_H__ */