diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 17:28:21 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:26:15 -0400 |
commit | 5c8eec501968cf9b608bba22748d7ca1a91dadf1 (patch) | |
tree | d0c627a731fe08529b689fd7aeb8f38876983424 /include/asm-x86 | |
parent | c4ac82a8818c6decd0fa57cdb55d4225f43d923a (diff) |
x86: unify include/asm/mman_32/64.h
Same file, except for the extra 64bit MAP_32BIT define, which does not hurt
for 32 bit compiles.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/Kbuild | 2 | ||||
-rw-r--r-- | include/asm-x86/mman.h | 32 | ||||
-rw-r--r-- | include/asm-x86/mman_32.h | 17 | ||||
-rw-r--r-- | include/asm-x86/mman_64.h | 19 |
4 files changed, 19 insertions, 51 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index a617f752ea6e..966a1176a7ce 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild | |||
@@ -19,8 +19,6 @@ unifdef-y += byteorder_64.h | |||
19 | unifdef-y += elf_32.h | 19 | unifdef-y += elf_32.h |
20 | unifdef-y += elf_64.h | 20 | unifdef-y += elf_64.h |
21 | unifdef-y += mce.h | 21 | unifdef-y += mce.h |
22 | unifdef-y += mman_32.h | ||
23 | unifdef-y += mman_64.h | ||
24 | unifdef-y += msgbuf_32.h | 22 | unifdef-y += msgbuf_32.h |
25 | unifdef-y += msgbuf_64.h | 23 | unifdef-y += msgbuf_64.h |
26 | unifdef-y += msr_32.h | 24 | unifdef-y += msr_32.h |
diff --git a/include/asm-x86/mman.h b/include/asm-x86/mman.h index 322db07e82c3..c1682b542daf 100644 --- a/include/asm-x86/mman.h +++ b/include/asm-x86/mman.h | |||
@@ -1,13 +1,19 @@ | |||
1 | #ifdef __KERNEL__ | 1 | #ifndef _ASM_X86_MMAN_H |
2 | # ifdef CONFIG_X86_32 | 2 | #define _ASM_X86_MMAN_H |
3 | # include "mman_32.h" | 3 | |
4 | # else | 4 | #include <asm-generic/mman.h> |
5 | # include "mman_64.h" | 5 | |
6 | # endif | 6 | #define MAP_32BIT 0x40 /* only give out 32bit addresses */ |
7 | #else | 7 | |
8 | # ifdef __i386__ | 8 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ |
9 | # include "mman_32.h" | 9 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |
10 | # else | 10 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ |
11 | # include "mman_64.h" | 11 | #define MAP_LOCKED 0x2000 /* pages are locked */ |
12 | # endif | 12 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ |
13 | #endif | 13 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ |
14 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | ||
15 | |||
16 | #define MCL_CURRENT 1 /* lock all current mappings */ | ||
17 | #define MCL_FUTURE 2 /* lock all future mappings */ | ||
18 | |||
19 | #endif /* _ASM_X86_MMAN_H */ | ||
diff --git a/include/asm-x86/mman_32.h b/include/asm-x86/mman_32.h deleted file mode 100644 index 8fd9d7ab7faf..000000000000 --- a/include/asm-x86/mman_32.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef __I386_MMAN_H__ | ||
2 | #define __I386_MMAN_H__ | ||
3 | |||
4 | #include <asm-generic/mman.h> | ||
5 | |||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | ||
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | ||
8 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ | ||
9 | #define MAP_LOCKED 0x2000 /* pages are locked */ | ||
10 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ | ||
11 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ | ||
12 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | ||
13 | |||
14 | #define MCL_CURRENT 1 /* lock all current mappings */ | ||
15 | #define MCL_FUTURE 2 /* lock all future mappings */ | ||
16 | |||
17 | #endif /* __I386_MMAN_H__ */ | ||
diff --git a/include/asm-x86/mman_64.h b/include/asm-x86/mman_64.h deleted file mode 100644 index dd5cb0534d37..000000000000 --- a/include/asm-x86/mman_64.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | #ifndef __X8664_MMAN_H__ | ||
2 | #define __X8664_MMAN_H__ | ||
3 | |||
4 | #include <asm-generic/mman.h> | ||
5 | |||
6 | #define MAP_32BIT 0x40 /* only give out 32bit addresses */ | ||
7 | |||
8 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | ||
9 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | ||
10 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ | ||
11 | #define MAP_LOCKED 0x2000 /* pages are locked */ | ||
12 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ | ||
13 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ | ||
14 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | ||
15 | |||
16 | #define MCL_CURRENT 1 /* lock all current mappings */ | ||
17 | #define MCL_FUTURE 2 /* lock all future mappings */ | ||
18 | |||
19 | #endif | ||