diff options
| author | Tony Luck <tony.luck@intel.com> | 2012-10-09 16:09:57 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-10-09 16:09:57 -0700 |
| commit | d536e0db2433686238ec97c517e4fc691000ee6f (patch) | |
| tree | 10d648ed6a74310c91a8c09e60b03f8328dfd677 /arch/ia64/include/asm/mman.h | |
| parent | 9e2d8656f5e8aa214e66b462680cf86b210b74a8 (diff) | |
| parent | 43e40f25d2c090392fc36cb900b42972e88cc2e2 (diff) | |
Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next
UAPI Disintegration 2012-10-09
Diffstat (limited to 'arch/ia64/include/asm/mman.h')
| -rw-r--r-- | arch/ia64/include/asm/mman.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h index 4459028e5aa..fdd5f5229f7 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 */ |