diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2009-06-18 21:48:18 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-18 14:39:53 -0700 |
| commit | 06f5013aa8eb5895ced2c71d13f5114103605555 (patch) | |
| tree | 893dbbfc9eb6967b7a39fe51e3500338311531ee /arch/x86/include/asm/mman.h | |
| parent | 7bfd124d6dae7d394e73753300594a81a022fe7d (diff) | |
| download | linux-06f5013aa8eb5895ced2c71d13f5114103605555.tar.gz linux-06f5013aa8eb5895ced2c71d13f5114103605555.tar.xz linux-06f5013aa8eb5895ced2c71d13f5114103605555.zip | |
x86: convert almost generic headers to asm-generic version
In x86, mman.h, module.h, scatterlist.h, types.h and ucontext.h
can use the asm-generic version by just defining the x86
specific parts locally and falling back on the generic code
for the common bits.
This patch illustrates the differences between the x86 and
asm-generic versions by changing a file that is initially
identical to the x86 version to one that is identical
to the asm-generic version.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
LKML-Reference: <cover.1245354003.git.arnd@arndb.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/mman.h')
| -rw-r--r-- | arch/x86/include/asm/mman.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h index 751af2550ed9..063d8c9e4d60 100644 --- a/arch/x86/include/asm/mman.h +++ b/arch/x86/include/asm/mman.h @@ -1,20 +1,8 @@ #ifndef _ASM_X86_MMAN_H #define _ASM_X86_MMAN_H -#include <asm-generic/mman-common.h> - #define MAP_32BIT 0x40 /* only give out 32bit addresses */ -#define MAP_GROWSDOWN 0x0100 /* stack-like segment */ -#define MAP_DENYWRITE 0x0800 /* ETXTBSY */ -#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ -#define MAP_LOCKED 0x2000 /* pages are locked */ -#define MAP_NORESERVE 0x4000 /* don't check for reservations */ -#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ -#define MAP_NONBLOCK 0x10000 /* do not block on IO */ -#define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ - -#define MCL_CURRENT 1 /* lock all current mappings */ -#define MCL_FUTURE 2 /* lock all future mappings */ +#include <asm/generic-mman.h> #endif /* _ASM_X86_MMAN_H */ |