Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / include / asm-alpha / mman.h

diff --git a/include/asm-alpha/mman.h b/include/asm-alpha/mman.h
index a21515c16a431b861ab37ce8e71df8b79d6d93b6..90d7c35d286703a86a4f1c59061b2212b2de367d 100644 (file)
--- a/include/asm-alpha/mman.h
+++ b/include/asm-alpha/mman.h
@@ -42,12 +42,13 @@
 #define MADV_WILLNEED  3               /* will need these pages */
 #define        MADV_SPACEAVAIL 5               /* ensure resources are available */
 #define MADV_DONTNEED  6               /* don't need these pages */
-#define MADV_REMOVE    7               /* remove these pages & resources */
-#define MADV_DONTFORK  0x30            /* dont inherit across fork */
-#define MADV_DOFORK    0x31            /* do inherit across fork */
+
+/* common/generic parameters */
+#define MADV_REMOVE    9               /* remove these pages & resources */
+#define MADV_DONTFORK  10              /* don't inherit across fork */
+#define MADV_DOFORK    11              /* do inherit across fork */
 
 /* compatibility flags */
-#define MAP_ANON       MAP_ANONYMOUS
 #define MAP_FILE       0
 
 #endif /* __ALPHA_MMAN_H__ */