summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/mman.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-09 10:47:00 +0200
committerDavid Howells <dhowells@redhat.com>2012-10-09 10:47:00 +0200
commit43e40f25d2c090392fc36cb900b42972e88cc2e2 (patch)
tree10d648ed6a74310c91a8c09e60b03f8328dfd677 /arch/ia64/include/asm/mman.h
parentMerge branch 'akpm' (Andrew's patch-bomb) (diff)
downloadlinux-43e40f25d2c090392fc36cb900b42972e88cc2e2.tar.xz
linux-43e40f25d2c090392fc36cb900b42972e88cc2e2.zip
UAPI: (Scripted) Disintegrate arch/ia64/include/asm
Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/ia64/include/asm/mman.h')
-rw-r--r--arch/ia64/include/asm/mman.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h
index 4459028e5aa8..fdd5f5229f78 100644
--- a/arch/ia64/include/asm/mman.h
+++ b/arch/ia64/include/asm/mman.h
@@ -1,23 +1,17 @@
-#ifndef _ASM_IA64_MMAN_H
-#define _ASM_IA64_MMAN_H
-
/*
* Based on <asm-i386/mman.h>.
*
* Modified 1998-2000, 2002
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
*/
+#ifndef _ASM_IA64_MMAN_H
+#define _ASM_IA64_MMAN_H
-#include <asm-generic/mman.h>
-
-#define MAP_GROWSUP 0x0200 /* register stack-like segment */
+#include <uapi/asm/mman.h>
-#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#define arch_mmap_check ia64_mmap_check
int ia64_mmap_check(unsigned long addr, unsigned long len,
unsigned long flags);
#endif
-#endif
-
#endif /* _ASM_IA64_MMAN_H */