Commit 5c8eec50 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parent c4ac82a8
...@@ -19,8 +19,6 @@ unifdef-y += byteorder_64.h ...@@ -19,8 +19,6 @@ unifdef-y += byteorder_64.h
unifdef-y += elf_32.h unifdef-y += elf_32.h
unifdef-y += elf_64.h unifdef-y += elf_64.h
unifdef-y += mce.h unifdef-y += mce.h
unifdef-y += mman_32.h
unifdef-y += mman_64.h
unifdef-y += msgbuf_32.h unifdef-y += msgbuf_32.h
unifdef-y += msgbuf_64.h unifdef-y += msgbuf_64.h
unifdef-y += msr_32.h unifdef-y += msr_32.h
......
#ifdef __KERNEL__ #ifndef _ASM_X86_MMAN_H
# ifdef CONFIG_X86_32 #define _ASM_X86_MMAN_H
# include "mman_32.h"
# else #include <asm-generic/mman.h>
# include "mman_64.h"
# endif #define MAP_32BIT 0x40 /* only give out 32bit addresses */
#else
# ifdef __i386__ #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
# include "mman_32.h" #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
# else #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
# include "mman_64.h" #define MAP_LOCKED 0x2000 /* pages are locked */
# endif #define MAP_NORESERVE 0x4000 /* don't check for reservations */
#endif #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
#define MAP_NONBLOCK 0x10000 /* do not block on IO */
#define MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */
#endif /* _ASM_X86_MMAN_H */
#ifndef __I386_MMAN_H__
#define __I386_MMAN_H__
#include <asm-generic/mman.h>
#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 MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */
#endif /* __I386_MMAN_H__ */
#ifndef __X8664_MMAN_H__
#define __X8664_MMAN_H__
#include <asm-generic/mman.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 MCL_CURRENT 1 /* lock all current mappings */
#define MCL_FUTURE 2 /* lock all future mappings */
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment